From c70b94e43897aadfa39286ca5c3151aefcc06853 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 15 Mar 2023 14:57:07 +1000 Subject: [PATCH] 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 --- .jenkins/Jenkinsfile | 24 ++++++++++++------------ README.md | 16 +++++++--------- docker/Dockerfile | 2 +- docker/Dockerfile.acmesh | 7 ++++--- docker/Dockerfile.acmesh-golang | 6 +++--- docker/Dockerfile.certbot | 6 +++--- docker/Dockerfile.certbot-node | 7 ++++--- local-build.sh | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index bf0c55f..3454994 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -30,11 +30,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' } @@ -51,7 +51,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" @@ -107,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/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` """) } } diff --git a/README.md b/README.md index 2164366..7512b12 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,11 @@ - - + + - - - - - + +

@@ -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 ``` + diff --git a/docker/Dockerfile b/docker/Dockerfile index ac8af5e..bdbc213 100644 --- a/docker/Dockerfile +++ b/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 nginxproxymanager/nginx-full:latest" + org.label-schema.cmd="docker run --rm -ti jc21/nginx-full:latest" diff --git a/docker/Dockerfile.acmesh b/docker/Dockerfile.acmesh index d52a4dd..96fea97 100644 --- a/docker/Dockerfile.acmesh +++ b/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 " 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" + diff --git a/docker/Dockerfile.acmesh-golang b/docker/Dockerfile.acmesh-golang index 53af4fe..ed222e7 100644 --- a/docker/Dockerfile.acmesh-golang +++ b/docker/Dockerfile.acmesh-golang @@ -1,9 +1,9 @@ FROM golang:1.19.6 as go -FROM nginxproxymanager/nginx-full:${ACMESH_BASE_TAG:-acmesh} +FROM jc21/nginx-full:${ACMESH_BASE_TAG:-acmesh} LABEL maintainer="Jamie Curnow " 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" diff --git a/docker/Dockerfile.certbot b/docker/Dockerfile.certbot index aa3e510..68f11b0 100644 --- a/docker/Dockerfile.certbot +++ b/docker/Dockerfile.certbot @@ -45,11 +45,11 @@ 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 " 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 @@ -71,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" diff --git a/docker/Dockerfile.certbot-node b/docker/Dockerfile.certbot-node index c8e82e8..22827c7 100644 --- a/docker/Dockerfile.certbot-node +++ b/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 " 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" + diff --git a/local-build.sh b/local-build.sh index d652f37..5d196ce 100755 --- a/local-build.sh +++ b/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.7