diff --git a/docker/Dockerfile b/docker/Dockerfile index d9de044..78a8069 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ -# sha256 as of 2020-09-25 for mainline-alpine -FROM nginx@sha256:4635b632d2aaf8c37c8a1cf76a1f96d11b899f74caa2c6946ea56d0a5af02c0c +# sha256 as of 2021-08-18 for nginx:mainline-alpine +FROM nginx:mainline-alpine@sha256:bead42240255ae1485653a956ef41c9e458eb077fcb6dc664cbc3aa9701a05ce COPY docker/nginx.conf /etc/nginx RUN mkdir -p /opt/nginx && chown nginx:nginx /opt/nginx diff --git a/docker/nginx.conf b/docker/nginx.conf index c5ca389..6213e6a 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -22,8 +22,7 @@ http { location / { root /opt/nginx/root; index index.html; - # This line has been adjusted for the temporary different external URL. - # Don't include this change in the main branch. + # Catch all relevant URLs and redirect to most recent, i.e. "2021" route rewrite ^/https-everywhere($|//+)(.*) /https-everywhere-2021/$2 permanent; } }