Change dockerhub namespace from jc21 back to nginxproxymanager

Author: jc21

.jenkins/Jenkinsfile

@@ -11,14 +11,15 @@ pipeline {
 		ansiColor('xterm')
 	}
 	environment {
-		IMAGE        = 'nginx-full'
-		BUILDX_NAME  = "${IMAGE}_${GIT_BRANCH}"
-		BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
+		DOCKERHUB_NAMESPACE = 'nginxproxymanager'
+		IMAGE               = 'nginx-full'
+		BUILDX_NAME         = "${IMAGE}_${GIT_BRANCH}"
+		BRANCH_LOWER        = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
 		// Software versions; OpenResty does not support Lua >= 5.2
-		OPENRESTY_VERSION = '1.21.4.3'
+		OPENRESTY_VERSION                  = '1.21.4.3'
 		CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.7'
-		LUA_VERSION       = '5.1.5'
-		LUAROCKS_VERSION  = '3.3.1'
+		LUA_VERSION                        = '5.1.5'
+		LUAROCKS_VERSION                   = '3.3.1'
 	}
 	stages {
 		stage('Environment') {
@@ -29,12 +30,12 @@ pipeline {
 					}
 					steps {
 						script {
-							env.BASE_IMAGE                     = "jc21/${IMAGE}:latest"
+							env.BASE_IMAGE                     = "${DOCKERHUB_NAMESPACE}/${IMAGE}:latest"
 							env.BUILDX_PUSH_TAGS               = "-t ${BASE_IMAGE}"
-							env.BUILDX_PUSH_TAGS_ACMESH        = "-t jc21/${IMAGE}:acmesh"
-							env.BUILDX_PUSH_TAGS_CERTBOT       = "-t jc21/${IMAGE}:certbot"
-							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t jc21/${IMAGE}:acmesh-golang"
-							env.BUILDX_PUSH_TAGS_CERTBOT_NODE  = "-t jc21/${IMAGE}:certbot-node"
+							env.BUILDX_PUSH_TAGS_ACMESH        = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:acmesh"
+							env.BUILDX_PUSH_TAGS_CERTBOT       = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:certbot"
+							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:acmesh-golang"
+							env.BUILDX_PUSH_TAGS_CERTBOT_NODE  = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:certbot-node"
 						}
 					}
 				}
@@ -47,7 +48,7 @@ pipeline {
 					steps {
 						script {
 							// Defaults to the Branch name, which is applies to all branches AND pr's
-							env.BASE_IMAGE                     = "jc21/${IMAGE}:github-${BRANCH_LOWER}"
+							env.BASE_IMAGE                     = "${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}"
 							env.ACMESH_IMAGE                   = "${BASE_IMAGE}-acmesh"
 							env.CERTBOT_IMAGE                  = "${BASE_IMAGE}-certbot"
 							env.BUILDX_PUSH_TAGS               = "-t ${BASE_IMAGE}"
@@ -106,13 +107,13 @@ pipeline {
 			}
 			steps {
 				script {
-					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as:
+					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/${DOCKERHUB_NAMESPACE}/${IMAGE}) as:
 
-- `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`
+- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}`
+- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-certbot`
+- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
+- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
+- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
 """)
 				}
 			}

README.md

@@ -4,11 +4,11 @@
   <img src="https://img.shields.io/badge/openresty-1.21.4.3-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/jc21/nginx-full">
-    <img src="https://img.shields.io/docker/stars/jc21/nginx-full.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>
-  <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 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>
 </p>
 
@@ -46,7 +46,7 @@ The following architectures are supported for all images:
 ### Usage:
 
 ```
-FROM jc21/nginx-full:latest
+FROM nginxproxymanager/nginx-full:latest
 
 ...
 ```
@@ -56,7 +56,6 @@ FROM jc21/nginx-full:latest
 ```
 docker run \
   -v /path/to/local/acme-data:/data/.acme.sh \
-  jc21/nginx-full:acmesh \
+  nginxproxymanager/nginx-full:acmesh \
   acme.sh -h
 ```
-

docker/Dockerfile

@@ -101,4 +101,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 jc21/nginx-full:latest"
+	org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:latest"

docker/Dockerfile.acmesh

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jc21/nginx-full:latest
+ARG BASE_IMAGE=nginxproxymanager/nginx-full:latest
 FROM $BASE_IMAGE as final
 ARG BASE_IMAGE
 ARG TARGETPLATFORM
@@ -27,5 +27,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 jc21/nginx-full:acmesh"
+LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh"
 

docker/Dockerfile.acmesh-golang

@@ -1,4 +1,4 @@
-ARG ACMESH_IMAGE=jc21/nginx-full:acmesh
+ARG ACMESH_IMAGE=nginxproxymanager/nginx-full:acmesh
 FROM golang:1.21 as go
 FROM $ACMESH_IMAGE as final
 ARG ACMESH_IMAGE
@@ -39,5 +39,5 @@ RUN go install github.com/kyoh86/richgo@latest \
 	&& go install golang.org/x/vuln/cmd/govulncheck@latest \
 	&& rm -rf /root/.cache/go-build
 
-LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:acmesh-golang"
+LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh-golang"
 

docker/Dockerfile.certbot

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jc21/nginx-full:latest
+ARG BASE_IMAGE=nginxproxymanager/nginx-full:latest
 
 #############
 # Certbot Builder
@@ -73,4 +73,4 @@ RUN 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"
+LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot"

docker/Dockerfile.certbot-node

@@ -1,4 +1,4 @@
-ARG CERTBOT_IMAGE=jc21/nginx-full:certbot
+ARG CERTBOT_IMAGE=nginxproxymanager/nginx-full:certbot
 FROM $CERTBOT_IMAGE as final
 ARG CERTBOT_IMAGE
 ARG TARGETPLATFORM
@@ -24,4 +24,4 @@ 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 jc21/nginx-full:certbot-node"
+LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot-node"

local-build.sh

@@ -7,7 +7,7 @@ GREEN='\E[1;32m'
 RESET='\E[0m'
 
 REGISTRY=${REGISTRY:-}
-DOCKER_IMAGE="${REGISTRY}jc21/nginx-full"
+DOCKER_IMAGE="${REGISTRY}nginxproxymanager/nginx-full"
 
 export OPENRESTY_VERSION=1.21.4.3
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7