Skip to content

update base nginx image to 1.15 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update base nginx image to 1.15 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f70b3b
update base nginx image to 1.15
ecliptik Oct 1, 2018
d976826
Merge branch 'master' into update-nginx
ecliptik Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM nginx:1.13-alpine
LABEL maintainer="Demandbase DevOps <devops@demandbase.com>"
FROM nginx:1.15-alpine
LABEL maintainer="Demandbase Devops <devops@demandbase.com>"

# Add in the config
COPY nginx.conf /etc/nginx/nginx.conf
COPY nginx.conf /etc/nginx/nginx.conf
4 changes: 2 additions & 2 deletions Dockerfile.proxy_protocol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM nginx:1.13-alpine
FROM nginx:1.15-alpine
LABEL maintainer="Demandbase DevOps <devops@demandbase.com>"

# Add in the config
COPY nginx.conf.proxy_protocol /etc/nginx/nginx.conf
COPY nginx.conf.proxy_protocol /etc/nginx/nginx.conf