Merge branch 'NginxProxyManager:master' into master

Author: LePresidente

.jenkins/Jenkinsfile

@@ -1,6 +1,6 @@
 pipeline {
 	triggers {
-		cron( env.BRANCH_NAME.equals('master') ? 'H 3 * * *' : '')
+		cron( env.BRANCH_NAME.equals('master') ? 'H 1 * * *' : '')
 	}
 	agent {
 		label 'docker-multiarch'
@@ -31,11 +31,11 @@ pipeline {
 					steps {
 						script {
 							env.BASE_TAG                       = 'latest'
-							env.BUILDX_PUSH_TAGS               = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
-							env.BUILDX_PUSH_TAGS_ACMESH        = "-t docker.io/nginxproxymanager/${IMAGE}:acmesh"
-							env.BUILDX_PUSH_TAGS_CERTBOT       = "-t docker.io/nginxproxymanager/${IMAGE}:certbot"
-							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:acmesh-golang"
-							env.BUILDX_PUSH_TAGS_CERTBOT_NODE  = "-t docker.io/nginxproxymanager/${IMAGE}:certbot-node"
+							env.BUILDX_PUSH_TAGS               = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
+							env.BUILDX_PUSH_TAGS_ACMESH        = "-t docker.io/jc21/${IMAGE}:acmesh"
+							env.BUILDX_PUSH_TAGS_CERTBOT       = "-t docker.io/jc21/${IMAGE}:certbot"
+							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'
 					}
@@ -52,7 +52,7 @@ pipeline {
 							env.BASE_TAG                       = "github-${BRANCH_LOWER}"
 							env.ACMESH_BASE_TAG                = "github-${BRANCH_LOWER}-acmesh"
 							env.CERTBOT_BASE_TAG               = "github-${BRANCH_LOWER}-certbot"
-							env.BUILDX_PUSH_TAGS               = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
+							env.BUILDX_PUSH_TAGS               = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
 							env.BUILDX_PUSH_TAGS_ACMESH        = "${BUILDX_PUSH_TAGS}-acmesh"
 							env.BUILDX_PUSH_TAGS_CERTBOT       = "${BUILDX_PUSH_TAGS}-certbot"
 							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "${BUILDX_PUSH_TAGS}-acmesh-golang"
@@ -108,13 +108,13 @@ pipeline {
 			}
 			steps {
 				script {
-					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}) as:
+					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as:
 
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-certbot`
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
 """)
 				}
 			}

README.md

@@ -4,14 +4,11 @@
   <img src="https://img.shields.io/badge/openresty-1.21.4.1-green.svg?style=for-the-badge">
   <img src="https://img.shields.io/badge/lua-5.1.5-green.svg?style=for-the-badge">
   <img src="https://img.shields.io/badge/luarocks-3.3.1-green.svg?style=for-the-badge">
-  <a href="https://hub.docker.com/repository/docker/nginxproxymanager/nginx-full">
-    <img src="https://img.shields.io/docker/stars/nginxproxymanager/nginx-full.svg?style=for-the-badge">
+  <a href="https://hub.docker.com/repository/docker/jc21/nginx-full">
+    <img src="https://img.shields.io/docker/stars/jc21/nginx-full.svg?style=for-the-badge">
   </a>
-  <a href="https://hub.docker.com/repository/docker/nginxproxymanager/nginx-full">
-    <img src="https://img.shields.io/docker/pulls/nginxproxymanager/nginx-full.svg?style=for-the-badge">
-  </a>
-  <a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/docker-nginx-full/branches/">
-    <img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fdocker-nginx-full%2Fjob%2Fmaster&style=for-the-badge">
+  <a href="https://hub.docker.com/repository/docker/jc21/nginx-full">
+    <img src="https://img.shields.io/docker/pulls/jc21/nginx-full.svg?style=for-the-badge">
   </a>
 </p>
 
@@ -49,7 +46,7 @@ The following architectures are supported for all images:
 ### Usage:
 
 ```
-FROM nginxproxymanager/nginx-full:latest
+FROM jc21/nginx-full:latest
 
 ...
 ```
@@ -59,6 +56,7 @@ FROM nginxproxymanager/nginx-full:latest
 ```
 docker run \
   -v /path/to/local/acme-data:/data/.acme.sh \
-  nginxproxymanager/nginx-full:acmesh \
+  jc21/nginx-full:acmesh \
   acme.sh -h
 ```
+

docker/Dockerfile

@@ -59,6 +59,7 @@ RUN apt-get update \
 	zlib1g \
 	gettext \
 	wget \
+	xz-utils \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/cache/* /var/log/* /tmp/* /var/lib/dpkg/status-old
@@ -101,4 +102,4 @@ LABEL org.label-schema.schema-version="1.0" \
 	org.label-schema.description="A base image for use by Nginx Proxy Manager" \
 	org.label-schema.url="https://github.com/nginxproxymanager/docker-nginx-full" \
 	org.label-schema.vcs-url="https://github.com/nginxproxymanager/docker-nginx-full.git" \
-	org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:latest"
+	org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:latest"

docker/Dockerfile.acmesh

@@ -1,8 +1,8 @@
-FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
+FROM jc21/nginx-full:${BASE_TAG:-latest}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ARG TARGETPLATFORM
-RUN echo "Acme.sh: nginxproxymanager/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
+RUN echo "Acme.sh: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
 
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
@@ -24,4 +24,5 @@ COPY ./files/acme.sh-wrapper /bin/acme.sh
 # Test that the wrapper script is working
 RUN /bin/acme.sh -h
 
-LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh"
+LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:acmesh"
+

docker/Dockerfile.acmesh-golang

@@ -1,9 +1,9 @@
-FROM golang:latest as go
-FROM nginxproxymanager/nginx-full:${ACMESH_BASE_TAG:-acmesh}
+FROM golang:1.19.6 as go
+FROM jc21/nginx-full:${ACMESH_BASE_TAG:-acmesh}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ARG TARGETPLATFORM
-RUN echo "Golang: nginxproxymanager/nginx-full:${BASE_TAG:-acmesh}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
+RUN echo "Golang: jc21/nginx-full:${BASE_TAG:-acmesh}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
 
 RUN apt-get update \
 	&& apt-get install -y wget gcc g++ make git sqlite3 jq \
@@ -36,5 +36,5 @@ RUN go install github.com/kyoh86/richgo@latest \
 	&& go install github.com/mfridman/tparse@latest \
 	&& rm -rf /root/.cache/go-build
 
-LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh-golang"
+LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:acmesh-golang"
 

docker/Dockerfile.certbot

@@ -45,11 +45,14 @@ RUN pip install cryptography==2.8 \
 # Final Image
 #############
 
-FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
+FROM jc21/nginx-full:${BASE_TAG:-latest}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ARG TARGETPLATFORM
-RUN echo "Certbot: nginxproxymanager/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
+RUN echo "Certbot: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
+
+COPY scripts/install-cert-prune /tmp/install-cert-prune
+RUN /tmp/install-cert-prune "${TARGETPLATFORM:-linux/amd64}" && rm -f /tmp/install-cert-prune
 
 # OpenResty uses LuaJIT which has a dependency on GCC
 RUN apt-get update \
@@ -68,4 +71,4 @@ RUN curl -L 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& python3 -m venv /opt/certbot/ \
 	&& ln -s /opt/certbot/bin/certbot /usr/bin/certbot
 
-LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot"
+LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:certbot"

docker/Dockerfile.certbot-node

@@ -1,8 +1,8 @@
-FROM nginxproxymanager/nginx-full:${CERTBOT_BASE_TAG:-certbot}
+FROM jc21/nginx-full:${CERTBOT_BASE_TAG:-certbot}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ARG TARGETPLATFORM
-RUN echo "Node: nginxproxymanager/nginx-full:${BASE_TAG:-certbot}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
+RUN echo "Node: jc21/nginx-full:${BASE_TAG:-certbot}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
 
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
@@ -21,4 +21,5 @@ COPY ./files/test.js /tmp/test.js
 RUN node /tmp/test.js \
 	&& rm -f /tmp/test.js
 
-LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot-node"
+LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:certbot-node"
+

local-build.sh

@@ -6,7 +6,7 @@ YELLOW='\E[1;33m'
 GREEN='\E[1;32m'
 RESET='\E[0m'
 
-DOCKER_IMAGE=nginxproxymanager/nginx-full
+DOCKER_IMAGE=jc21/nginx-full
 
 export OPENRESTY_VERSION=1.21.4.1
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.11

scripts/install-cert-prune

@@ -0,0 +1,38 @@
+#!/bin/bash -e
+
+# Note: This script is designed to be run inside a Docker Build for a container
+
+CYAN='\E[1;36m'
+YELLOW='\E[1;33m'
+BLUE='\E[1;34m'
+GREEN='\E[1;32m'
+RESET='\E[0m'
+
+CERT_PRUNE_VERSION=0.0.1
+TARGETPLATFORM=$1
+
+# Determine the correct binary file for the architecture given
+case $TARGETPLATFORM in
+	linux/arm64)
+		ARCH=arm64
+		;;
+
+	linux/arm/v7)
+		ARCH=arm
+		;;
+
+	*)
+		ARCH=amd64
+		;;
+esac
+
+echo -e "${BLUE}❯ ${CYAN}Installing cert-prune v${CERT_PRUNE_VERSION} for ${YELLOW}${TARGETPLATFORM} (${ARCH})${RESET}"
+
+mkdir -p /tmp/cert-prune
+cd /tmp/cert-prune
+curl -L -o 'cert-prune.tar.gz' "https://github.com/axllent/cert-prune/releases/download/${CERT_PRUNE_VERSION}/cert-prune-linux-${ARCH}.tar.gz"
+tar -xzf 'cert-prune.tar.gz'
+mv cert-prune /bin/
+rm -rf /tmp/cert-prune
+
+echo -e "${BLUE}❯ ${GREEN}cert-prune install Complete${RESET}"