commit 61a4b592d2a5c597065a3701a260e47e426c2b87
author Elena Tverdokhlib <elena@nitralabs.com> Mon Oct 08 19:13:55 2018 +0300
committer Otto van der Schaaf <oschaaf@we-amp.com> Mon Oct 08 18:13:55 2018 +0200
tree 5b0e54c322a759461a2b7832b56d85d331d2dbeb
parent c24e387462fbd1b3b5d06054aa54766be46ecd5e

Nginx Mainline update to 1.15.5 (#1599)

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 db227dd..88c2035 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.4
+ARG NGINX_VERSION=1.15.5
 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.4" \
+      version.nginx="1.15.5" \
       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 75c8c6a..51ce7a2 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.4
+ARG NGINX_VERSION=1.15.5
 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.4" \
+      version.nginx="1.15.5" \
       version.ngx-pagespeed="1.13.35.2"
 
 COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin