Merge branch 'NginxProxyManager:master' into master

Author: LePresidente

.jenkins/Jenkinsfile

@@ -37,7 +37,6 @@ pipeline {
 							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t docker.io/jc21/${IMAGE}:acmesh-golang"
 							env.BUILDX_PUSH_TAGS_CERTBOT_NODE  = "-t docker.io/jc21/${IMAGE}:certbot-node"
 						}
-						sh 'env'
 					}
 				}
 				stage('Other') {

docker/Dockerfile.acmesh-golang

@@ -1,4 +1,4 @@
-FROM golang:1.19.6 as go
+FROM golang:1.20 as go
 FROM jc21/nginx-full:${ACMESH_BASE_TAG:-acmesh}
 LABEL maintainer="Jamie Curnow <[email protected]>"
 
@@ -30,7 +30,7 @@ WORKDIR /root
 COPY ./files/.bashrc.acmesh-golang /root/.bashrc
 
 # Gotools
-RUN cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1
+RUN cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
 RUN go install github.com/kyoh86/richgo@latest \
 	&& go install github.com/sonatype-nexus-community/nancy@latest \
 	&& go install github.com/mfridman/tparse@latest \

docker/Dockerfile.certbot

@@ -69,6 +69,7 @@ COPY ./files/.bashrc.certbot /root/.bashrc
 COPY --from=certbotbuilder /opt/certbot /opt/certbot
 RUN curl -L 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& python3 -m venv /opt/certbot/ \
+	&& sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' -i /opt/certbot/pyvenv.cfg \
 	&& ln -s /opt/certbot/bin/certbot /usr/bin/certbot
 
 LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:certbot"