From 784c08ade2a62a3a9adc49812d31d1e3bd728002 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Tue, 18 Oct 2022 09:33:04 +0100 Subject: [PATCH] proxy IPv6 removal needs to happen after envsubst --- ...n-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} | 0 hosting/proxy/Dockerfile | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename hosting/proxy/{10-listen-on-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} (100%) diff --git a/hosting/proxy/10-listen-on-ipv6-by-default.sh b/hosting/proxy/80-listen-on-ipv6-by-default.sh similarity index 100% rename from hosting/proxy/10-listen-on-ipv6-by-default.sh rename to hosting/proxy/80-listen-on-ipv6-by-default.sh diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile index f11480fd73..c1b11b23f7 100644 --- a/hosting/proxy/Dockerfile +++ b/hosting/proxy/Dockerfile @@ -5,8 +5,10 @@ FROM nginx:latest # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template -COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh -RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh +# IPv6 removal needs to happen after envsubst +RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh +COPY 80-listen-on-ipv6-by-default.sh /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh +RUN chmod +x /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh # Error handling COPY error.html /usr/share/nginx/html/error.html