commit ced02f1821867b37eecb16b6e7fcb177a8e39aa5
author Nico Berlee <internet@notabigtruck.net> Thu Nov 15 10:32:22 2018 +0100
committer Otto van der Schaaf <oschaaf@we-amp.com> Thu Nov 15 10:32:22 2018 +0100
tree 19efc8cdfe47a3b1940fdd001cc58aeb1d047674
parent 24fe429a6f7e69209b974ab1b0f847d54741eb7a

Update Nginx in Docker (#1605)

Stable from 1.14.0 to 1.14.1
Mainline from 1.15.5 to 1.15.6

docker/alpine-3.8/nginx-mainline/Dockerfile

diff --git a/docker/alpine-3.8/nginx-mainline/Dockerfile b/docker/alpine-3.8/nginx-mainline/Dockerfile
index 88c2035..fe3144d 100644
--- a/docker/alpine-3.8/nginx-mainline/Dockerfile
+++ b/docker/alpine-3.8/nginx-mainline/Dockerfile
@@ -79,7 +79,7 @@
 ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
 
 # Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.15.5
+ARG NGINX_VERSION=1.15.6
 ARG NGINX_PGPKEY=520A9993A1C052F8
 ARG NGINX_BUILD_CONFIG="\
         --prefix=/etc/nginx \
@@ -199,7 +199,7 @@
 FROM alpine:$ALPINE_VERSION
 LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
       version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.15.5" \
+      version.nginx="1.15.6" \
       version.ngx-pagespeed="1.13.35.2"
 
 COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin

docker/alpine-3.8/nginx-stable/Dockerfile

diff --git a/docker/alpine-3.8/nginx-stable/Dockerfile b/docker/alpine-3.8/nginx-stable/Dockerfile
index b187a13..96a6b8d 100644
--- a/docker/alpine-3.8/nginx-stable/Dockerfile
+++ b/docker/alpine-3.8/nginx-stable/Dockerfile
@@ -79,7 +79,7 @@
 ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
 
 # Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.14.0
+ARG NGINX_VERSION=1.14.1
 ARG NGINX_PGPKEY=520A9993A1C052F8
 ARG NGINX_BUILD_CONFIG="\
         --prefix=/etc/nginx \
@@ -199,7 +199,7 @@
 FROM alpine:$ALPINE_VERSION
 LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
       version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.14.0" \
+      version.nginx="1.14.1" \
       version.ngx-pagespeed="1.13.35.2"
 
 COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin

docker/alpine-edge/nginx-mainline/Dockerfile

diff --git a/docker/alpine-edge/nginx-mainline/Dockerfile b/docker/alpine-edge/nginx-mainline/Dockerfile
index 51ce7a2..80a02e2 100644
--- a/docker/alpine-edge/nginx-mainline/Dockerfile
+++ b/docker/alpine-edge/nginx-mainline/Dockerfile
@@ -79,7 +79,7 @@
 ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
 
 # Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.15.5
+ARG NGINX_VERSION=1.15.6
 ARG NGINX_PGPKEY=520A9993A1C052F8
 ARG NGINX_BUILD_CONFIG="\
         --prefix=/etc/nginx \
@@ -199,7 +199,7 @@
 FROM alpine:$ALPINE_VERSION
 LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
       version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.15.5" \
+      version.nginx="1.15.6" \
       version.ngx-pagespeed="1.13.35.2"
 
 COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin

docker/alpine-edge/nginx-stable/Dockerfile

diff --git a/docker/alpine-edge/nginx-stable/Dockerfile b/docker/alpine-edge/nginx-stable/Dockerfile
index f34bf71..e8b0e09 100644
--- a/docker/alpine-edge/nginx-stable/Dockerfile
+++ b/docker/alpine-edge/nginx-stable/Dockerfile
@@ -79,7 +79,7 @@
 ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
 
 # Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.14.0
+ARG NGINX_VERSION=1.14.1
 ARG NGINX_PGPKEY=520A9993A1C052F8
 ARG NGINX_BUILD_CONFIG="\
         --prefix=/etc/nginx \
@@ -204,7 +204,7 @@
 FROM alpine:$ALPINE_VERSION
 LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
       version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.14.0" \
+      version.nginx="1.14.1" \
       version.ngx-pagespeed="1.13.35.2"
 
 COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin