Skip to content

Commit

Permalink
Update nginx image
Browse files Browse the repository at this point in the history
Bumps tag to latest in the "mainline-alpine". Hadn't been updated in a
while. Clarifies comment in nginx config, preserving the new route
logic.
  • Loading branch information
Conor Schaefer committed Aug 19, 2021
1 parent 17718b0 commit 304736a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 304736a

Please sign in to comment.