diff --git a/docker/Dockerfile b/docker/Dockerfile index 9875053f..88ce95ed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,6 @@ # This file assumes that the frontend has been built using ./scripts/frontend-build FROM nginxproxymanager/testca AS testca -FROM ghcr.io/letsencrypt/pebble:latest AS pebbleca FROM nginxproxymanager/nginx-full:certbot-node ARG TARGETPLATFORM @@ -46,7 +45,6 @@ RUN yarn install \ # add late to limit cache-busting by modifications COPY docker/rootfs / -COPY --from=pebbleca /test/certs/pebble.minica.pem /etc/ssl/certs/pebble.minica.pem COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/certs/NginxProxyManager.crt # Remove frontend service not required for prod, dev nginx config as well diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 42a7339e..f0f5ec60 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,5 +1,4 @@ FROM nginxproxymanager/testca AS testca -FROM ghcr.io/letsencrypt/pebble:latest AS pebbleca FROM nginxproxymanager/nginx-full:certbot-node LABEL maintainer="Jamie Curnow " @@ -33,7 +32,6 @@ RUN rm -f /etc/nginx/conf.d/production.conf \ && chmod 644 -R /root/.cache # Certs for testing purposes -COPY --from=pebbleca /test/certs/pebble.minica.pem /etc/ssl/certs/pebble.minica.pem COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/certs/NginxProxyManager.crt EXPOSE 80 81 443 diff --git a/docker/dev/pebble-config.json b/docker/dev/pebble-config.json deleted file mode 100644 index ea937905..00000000 --- a/docker/dev/pebble-config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "pebble": { - "listenAddress": "0.0.0.0:443", - "managementListenAddress": "0.0.0.0:15000", - "certificate": "test/certs/localhost/cert.pem", - "privateKey": "test/certs/localhost/key.pem", - "httpPort": 80, - "tlsPort": 443, - "ocspResponderURL": "", - "externalAccountBindingRequired": false - } -}