From 8f70b3b46e0f950728934f5689c21396aab7ddd9 Mon Sep 17 00:00:00 2001 From: Micheal Waltz Date: Mon, 1 Oct 2018 10:36:03 -0700 Subject: [PATCH] update base nginx image to 1.15 --- Dockerfile | 8 +++----- Dockerfile.proxy_protocol | 7 ++----- nginx.conf | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b568b1..8a9eed3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ -FROM nginx:1.11-alpine -MAINTAINER Micheal Waltz +FROM nginx:1.15-alpine + +LABEL maintainer="Demandbase Devops " # Add in the config COPY nginx.conf /etc/nginx/nginx.conf - -#Start nginx -ENTRYPOINT ["nginx"] diff --git a/Dockerfile.proxy_protocol b/Dockerfile.proxy_protocol index 5a17572..c72c923 100644 --- a/Dockerfile.proxy_protocol +++ b/Dockerfile.proxy_protocol @@ -1,8 +1,5 @@ -FROM nginx:1.11-alpine -MAINTAINER Micheal Waltz +FROM nginx:1.15-alpine +LABEL maintainer="Demandbase DevOps " # Add in the config COPY nginx.conf.proxy_protocol /etc/nginx/nginx.conf - -#Start nginx -ENTRYPOINT ["nginx"] diff --git a/nginx.conf b/nginx.conf index 9a219b3..0e7ac2f 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,4 +1,3 @@ -daemon off; worker_processes 1; pid /run/nginx.pid;