Skip to content

Commit c70b94e

Browse files
jc21jc21
committed
Moved docker repo back to jc21, as docker is sunsetting free teams and this open source project isn't prepared to pay 00 for a nicer image url
1 parent 5c89a5b commit c70b94e

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

‎.jenkins/Jenkinsfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ pipeline {
3030
steps {
3131
script {
3232
env.BASE_TAG = 'latest'
33-
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
34-
env.BUILDX_PUSH_TAGS_ACMESH = "-t docker.io/nginxproxymanager/${IMAGE}:acmesh"
35-
env.BUILDX_PUSH_TAGS_CERTBOT = "-t docker.io/nginxproxymanager/${IMAGE}:certbot"
36-
env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:acmesh-golang"
37-
env.BUILDX_PUSH_TAGS_CERTBOT_NODE = "-t docker.io/nginxproxymanager/${IMAGE}:certbot-node"
33+
env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
34+
env.BUILDX_PUSH_TAGS_ACMESH = "-t docker.io/jc21/${IMAGE}:acmesh"
35+
env.BUILDX_PUSH_TAGS_CERTBOT = "-t docker.io/jc21/${IMAGE}:certbot"
36+
env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t docker.io/jc21/${IMAGE}:acmesh-golang"
37+
env.BUILDX_PUSH_TAGS_CERTBOT_NODE = "-t docker.io/jc21/${IMAGE}:certbot-node"
3838
}
3939
sh 'env'
4040
}
@@ -51,7 +51,7 @@ pipeline {
5151
env.BASE_TAG = "github-${BRANCH_LOWER}"
5252
env.ACMESH_BASE_TAG = "github-${BRANCH_LOWER}-acmesh"
5353
env.CERTBOT_BASE_TAG = "github-${BRANCH_LOWER}-certbot"
54-
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
54+
env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
5555
env.BUILDX_PUSH_TAGS_ACMESH = "${BUILDX_PUSH_TAGS}-acmesh"
5656
env.BUILDX_PUSH_TAGS_CERTBOT = "${BUILDX_PUSH_TAGS}-certbot"
5757
env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "${BUILDX_PUSH_TAGS}-acmesh-golang"
@@ -107,13 +107,13 @@ pipeline {
107107
}
108108
steps {
109109
script {
110-
def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}) as:
110+
def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as:
111111
112-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
113-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-certbot`
114-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
115-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
116-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
112+
- `jc21/${IMAGE}:github-${BRANCH_LOWER}`
113+
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot`
114+
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-certbot-node`
115+
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh`
116+
- `jc21/${IMAGE}:github-${BRANCH_LOWER}-acmesh-golang`
117117
""")
118118
}
119119
}

‎README.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
<img src="https://img.shields.io/badge/openresty-1.21.4.1-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/nginxproxymanager/nginx-full">
8-
<img src="https://img.shields.io/docker/stars/nginxproxymanager/nginx-full.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">
99
</a>
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">
12-
</a>
13-
<a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/docker-nginx-full/branches/">
14-
<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">
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">
1512
</a>
1613
</p>
1714

@@ -49,7 +46,7 @@ The following architectures are supported for all images:
4946
### Usage:
5047

5148
```
52-
FROM nginxproxymanager/nginx-full:latest
49+
FROM jc21/nginx-full:latest
5350
5451
...
5552
```
@@ -59,6 +56,7 @@ FROM nginxproxymanager/nginx-full:latest
5956
```
6057
docker run \
6158
-v /path/to/local/acme-data:/data/.acme.sh \
62-
nginxproxymanager/nginx-full:acmesh \
59+
jc21/nginx-full:acmesh \
6360
acme.sh -h
6461
```
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 nginxproxymanager/nginx-full:latest"
104+
org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:latest"

‎docker/Dockerfile.acmesh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
1+
FROM jc21/nginx-full:${BASE_TAG:-latest}
22
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
33

44
ARG TARGETPLATFORM
5-
RUN echo "Acme.sh: nginxproxymanager/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
5+
RUN echo "Acme.sh: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
66

77
ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
88

@@ -24,4 +24,5 @@ COPY ./files/acme.sh-wrapper /bin/acme.sh
2424
# Test that the wrapper script is working
2525
RUN /bin/acme.sh -h
2626

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

‎docker/Dockerfile.acmesh-golang‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM golang:1.19.6 as go
2-
FROM nginxproxymanager/nginx-full:${ACMESH_BASE_TAG:-acmesh}
2+
FROM jc21/nginx-full:${ACMESH_BASE_TAG:-acmesh}
33
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
44

55
ARG TARGETPLATFORM
6-
RUN echo "Golang: nginxproxymanager/nginx-full:${BASE_TAG:-acmesh}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
6+
RUN echo "Golang: jc21/nginx-full:${BASE_TAG:-acmesh}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
77

88
RUN apt-get update \
99
&& apt-get install -y wget gcc g++ make git sqlite3 jq \
@@ -36,5 +36,5 @@ RUN go install github.com/kyoh86/richgo@latest \
3636
&& go install github.com/mfridman/tparse@latest \
3737
&& rm -rf /root/.cache/go-build
3838

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

‎docker/Dockerfile.certbot‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ RUN pip install cryptography==2.8 \
4545
# Final Image
4646
#############
4747

48-
FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
48+
FROM jc21/nginx-full:${BASE_TAG:-latest}
4949
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
5050

5151
ARG TARGETPLATFORM
52-
RUN echo "Certbot: nginxproxymanager/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
52+
RUN echo "Certbot: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
5353

5454
COPY scripts/install-cert-prune /tmp/install-cert-prune
5555
RUN /tmp/install-cert-prune "${TARGETPLATFORM:-linux/amd64}" && rm -f /tmp/install-cert-prune
@@ -71,4 +71,4 @@ RUN curl -L 'https://bootstrap.pypa.io/get-pip.py' | python3 \
7171
&& python3 -m venv /opt/certbot/ \
7272
&& ln -s /opt/certbot/bin/certbot /usr/bin/certbot
7373

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

‎docker/Dockerfile.certbot-node‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM nginxproxymanager/nginx-full:${CERTBOT_BASE_TAG:-certbot}
1+
FROM jc21/nginx-full:${CERTBOT_BASE_TAG:-certbot}
22
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
33

44
ARG TARGETPLATFORM
5-
RUN echo "Node: nginxproxymanager/nginx-full:${BASE_TAG:-certbot}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
5+
RUN echo "Node: jc21/nginx-full:${BASE_TAG:-certbot}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
66

77
ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
88

@@ -21,4 +21,5 @@ COPY ./files/test.js /tmp/test.js
2121
RUN node /tmp/test.js \
2222
&& rm -f /tmp/test.js
2323

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

‎local-build.sh‎

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

9-
DOCKER_IMAGE=nginxproxymanager/nginx-full
9+
DOCKER_IMAGE=jc21/nginx-full
1010

1111
export OPENRESTY_VERSION=1.21.4.1
1212
export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7

0 commit comments

Comments
 (0)