Skip to content

Commit a0139ca

Browse files
jc21jc21
committed
Change dockerhub namespace from jc21 back to nginxproxymanager
1 parent dee837c commit a0139ca

8 files changed

+35
-35
lines changed

‎.jenkins/Jenkinsfile

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ pipeline {
1111
ansiColor('xterm')
1212
}
1313
environment {
14-
IMAGE = 'nginx-full'
15-
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}"
16-
BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
14+
DOCKERHUB_NAMESPACE = 'nginxproxymanager'
15+
IMAGE = 'nginx-full'
16+
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}"
17+
BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
1718
// Software versions; OpenResty does not support Lua >= 5.2
18-
OPENRESTY_VERSION = '1.21.4.3'
19+
OPENRESTY_VERSION = '1.21.4.3'
1920
CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.7'
20-
LUA_VERSION = '5.1.5'
21-
LUAROCKS_VERSION = '3.3.1'
21+
LUA_VERSION = '5.1.5'
22+
LUAROCKS_VERSION = '3.3.1'
2223
}
2324
stages {
2425
stage('Environment') {
@@ -29,12 +30,12 @@ pipeline {
2930
}
3031
steps {
3132
script {
32-
env.BASE_IMAGE = "jc21/${IMAGE}:latest"
33+
env.BASE_IMAGE = "${DOCKERHUB_NAMESPACE}/${IMAGE}:latest"
3334
env.BUILDX_PUSH_TAGS = "-t ${BASE_IMAGE}"
34-
env.BUILDX_PUSH_TAGS_ACMESH = "-t jc21/${IMAGE}:acmesh"
35-
env.BUILDX_PUSH_TAGS_CERTBOT = "-t jc21/${IMAGE}:certbot"
36-
env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t jc21/${IMAGE}:acmesh-golang"
37-
env.BUILDX_PUSH_TAGS_CERTBOT_NODE = "-t jc21/${IMAGE}:certbot-node"
35+
env.BUILDX_PUSH_TAGS_ACMESH = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:acmesh"
36+
env.BUILDX_PUSH_TAGS_CERTBOT = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:certbot"
37+
env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:acmesh-golang"
38+
env.BUILDX_PUSH_TAGS_CERTBOT_NODE = "-t ${DOCKERHUB_NAMESPACE}/${IMAGE}:certbot-node"
3839
}
3940
}
4041
}
@@ -47,7 +48,7 @@ pipeline {
4748
steps {
4849
script {
4950
// Defaults to the Branch name, which is applies to all branches AND pr's
50-
env.BASE_IMAGE = "jc21/${IMAGE}:github-${BRANCH_LOWER}"
51+
env.BASE_IMAGE = "${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}"
5152
env.ACMESH_IMAGE = "${BASE_IMAGE}-acmesh"
5253
env.CERTBOT_IMAGE = "${BASE_IMAGE}-certbot"
5354
env.BUILDX_PUSH_TAGS = "-t ${BASE_IMAGE}"
@@ -106,13 +107,13 @@ pipeline {
106107
}
107108
steps {
108109
script {
109-
def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as:
110+
def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/${DOCKERHUB_NAMESPACE}/${IMAGE}) as:
110111
111-
- `jc21/${IMAGE}:github-${BRANCH_LOWER}`
112-
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot`
113-
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
114-
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
115-
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
112+
- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}`
113+
- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-certbot`
114+
- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
115+
- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
116+
- `${DOCKERHUB_NAMESPACE}/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
116117
""")
117118
}
118119
}

‎README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<img src="https://img.shields.io/badge/openresty-1.21.4.3-green.svg?style=for-the-badge">
55
<img src="https://img.shields.io/badge/lua-5.1.5-green.svg?style=for-the-badge">
66
<img src="https://img.shields.io/badge/luarocks-3.3.1-green.svg?style=for-the-badge">
7-
<a href="https://hub.docker.com/repository/docker/jc21/nginx-full">
8-
<img src="https://img.shields.io/docker/stars/jc21/nginx-full.svg?style=for-the-badge">
7+
<a href="https://hub.docker.com/repository/docker/nginxproxymanager/nginx-full">
8+
<img src="https://img.shields.io/docker/stars/nginxproxymanager/nginx-full.svg?style=for-the-badge">
99
</a>
10-
<a href="https://hub.docker.com/repository/docker/jc21/nginx-full">
11-
<img src="https://img.shields.io/docker/pulls/jc21/nginx-full.svg?style=for-the-badge">
10+
<a href="https://hub.docker.com/repository/docker/nginxproxymanager/nginx-full">
11+
<img src="https://img.shields.io/docker/pulls/nginxproxymanager/nginx-full.svg?style=for-the-badge">
1212
</a>
1313
</p>
1414

@@ -46,7 +46,7 @@ The following architectures are supported for all images:
4646
### Usage:
4747

4848
```
49-
FROM jc21/nginx-full:latest
49+
FROM nginxproxymanager/nginx-full:latest
5050
5151
...
5252
```
@@ -56,7 +56,6 @@ FROM jc21/nginx-full:latest
5656
```
5757
docker run \
5858
-v /path/to/local/acme-data:/data/.acme.sh \
59-
jc21/nginx-full:acmesh \
59+
nginxproxymanager/nginx-full:acmesh \
6060
acme.sh -h
6161
```
62-

‎docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ LABEL org.label-schema.schema-version="1.0" \
101101
org.label-schema.description="A base image for use by Nginx Proxy Manager" \
102102
org.label-schema.url="https://github.com/nginxproxymanager/docker-nginx-full" \
103103
org.label-schema.vcs-url="https://github.com/nginxproxymanager/docker-nginx-full.git" \
104-
org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:latest"
104+
org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:latest"

‎docker/Dockerfile.acmesh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=jc21/nginx-full:latest
1+
ARG BASE_IMAGE=nginxproxymanager/nginx-full:latest
22
FROM $BASE_IMAGE as final
33
ARG BASE_IMAGE
44
ARG TARGETPLATFORM
@@ -27,5 +27,5 @@ COPY ./files/acme.sh-wrapper /bin/acme.sh
2727
# Test that the wrapper script is working
2828
RUN /bin/acme.sh -h
2929

30-
LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:acmesh"
30+
LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh"
3131

‎docker/Dockerfile.acmesh-golang

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ACMESH_IMAGE=jc21/nginx-full:acmesh
1+
ARG ACMESH_IMAGE=nginxproxymanager/nginx-full:acmesh
22
FROM golang:1.21 as go
33
FROM $ACMESH_IMAGE as final
44
ARG ACMESH_IMAGE
@@ -39,5 +39,5 @@ RUN go install github.com/kyoh86/richgo@latest \
3939
&& go install golang.org/x/vuln/cmd/govulncheck@latest \
4040
&& rm -rf /root/.cache/go-build
4141

42-
LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:acmesh-golang"
42+
LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh-golang"
4343

‎docker/Dockerfile.certbot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=jc21/nginx-full:latest
1+
ARG BASE_IMAGE=nginxproxymanager/nginx-full:latest
22

33
#############
44
# Certbot Builder
@@ -73,4 +73,4 @@ RUN python3 -m venv /opt/certbot/ \
7373
&& sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' -i /opt/certbot/pyvenv.cfg \
7474
&& ln -s /opt/certbot/bin/certbot /usr/bin/certbot
7575

76-
LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:certbot"
76+
LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot"

‎docker/Dockerfile.certbot-node

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG CERTBOT_IMAGE=jc21/nginx-full:certbot
1+
ARG CERTBOT_IMAGE=nginxproxymanager/nginx-full:certbot
22
FROM $CERTBOT_IMAGE as final
33
ARG CERTBOT_IMAGE
44
ARG TARGETPLATFORM
@@ -24,4 +24,4 @@ COPY ./files/test.js /tmp/test.js
2424
RUN node /tmp/test.js \
2525
&& rm -f /tmp/test.js
2626

27-
LABEL org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:certbot-node"
27+
LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:certbot-node"

‎local-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GREEN='\E[1;32m'
77
RESET='\E[0m'
88

99
REGISTRY=${REGISTRY:-}
10-
DOCKER_IMAGE="${REGISTRY}jc21/nginx-full"
10+
DOCKER_IMAGE="${REGISTRY}nginxproxymanager/nginx-full"
1111

1212
export OPENRESTY_VERSION=1.21.4.3
1313
export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7

0 commit comments

Comments
 (0)