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

This commit is contained in:
Jamie Curnow
2023-03-15 14:57:07 +10:00
parent 5c89a5b9fb
commit c70b94e438
8 changed files with 35 additions and 35 deletions
+1 -1
View File
@@ -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"
+4 -3
View File
@@ -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"
+3 -3
View File
@@ -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 <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"
+3 -3
View File
@@ -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 <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
@@ -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"
+4 -3
View File
@@ -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"