Moved v3 code from NginxProxyManager/nginx-proxy-manager-3 to NginxProxyManager/nginx-proxy-manager

docker/dev/Dockerfile

@@ -1,15 +1,34 @@
-FROM nginxproxymanager/nginx-full:certbot-node
+FROM nginxproxymanager/testca as testca
+FROM letsencrypt/pebble as pebbleca
+FROM nginxproxymanager/nginx-full:acmesh-golang
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
-ENV S6_LOGGING=0 \
-	SUPPRESS_NO_CONFIG_WARNING=1 \
-	S6_FIX_ATTRS_HIDDEN=1
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
+ARG GOPROXY
+ARG GOPRIVATE
+
+ENV GOPROXY=$GOPROXY \
+	GOPRIVATE=$GOPRIVATE \
+	S6_LOGGING=0 \
+	SUPPRESS_NO_CONFIG_WARNING=1 \
+	S6_FIX_ATTRS_HIDDEN=1 \
+	ACMESH_CONFIG_HOME=/data/.acme.sh/config \
+	ACMESH_HOME=/data/.acme.sh \
+	CERT_HOME=/data/.acme.sh/certs \
+	LE_CONFIG_HOME=/data/.acme.sh/config \
+	LE_WORKING_DIR=/data/.acme.sh
+
+RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
+
+# usql and node
+RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
 	&& apt-get update \
-	&& apt-get install -y certbot jq python3-pip logrotate \
+	&& apt-get install -y --no-install-recommends nodejs vim dnsutils \
+	&& npm install -g yarn \
 	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/* \
+	&& go install github.com/xo/usql@master
 
 # Task
 RUN cd /usr \
@@ -18,12 +37,29 @@ RUN cd /usr \
 
 COPY rootfs /
 RUN rm -f /etc/nginx/conf.d/production.conf
-RUN chmod 644 /etc/logrotate.d/nginx-proxy-manager
 
 # s6 overlay
 RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \
 	&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
 
-EXPOSE 80 81 443
-ENTRYPOINT [ "/init" ]
+# Fix for golang dev:
+RUN chown -R 1000:1000 /opt/go
 
+COPY --from=pebbleca /test/certs/pebble.minica.pem /etc/ssl/certs/pebble.minica.pem
+COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/certs/NginxProxyManager.crt
+
+# Dummy cert
+RUN openssl req \
+	-new \
+	-newkey rsa:2048 \
+	-days 3650 \
+	-nodes \
+	-x509 \
+	-subj '/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost' \
+	-keyout /etc/ssl/certs/dummykey.pem \
+	-out /etc/ssl/certs/dummycert.pem \
+	&& chmod +r /etc/ssl/certs/dummykey.pem /etc/ssl/certs/dummycert.pem
+
+EXPOSE 80
+CMD [ "/init" ]
+HEALTHCHECK --interval=15s --timeout=3s CMD curl -f http://127.0.0.1:81/api || exit 1