From ced02f1821867b37eecb16b6e7fcb177a8e39aa5 Mon Sep 17 00:00:00 2001 From: Nico Berlee Date: Thu, 15 Nov 2018 10:32:22 +0100 Subject: [PATCH] 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 | 4 ++-- docker/alpine-3.8/nginx-stable/Dockerfile | 4 ++-- docker/alpine-edge/nginx-mainline/Dockerfile | 4 ++-- docker/alpine-edge/nginx-stable/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/alpine-3.8/nginx-mainline/Dockerfile b/docker/alpine-3.8/nginx-mainline/Dockerfile index 88c2035f8..fe3144df4 100644 --- a/docker/alpine-3.8/nginx-mainline/Dockerfile +++ b/docker/alpine-3.8/nginx-mainline/Dockerfile @@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx 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 @@ COPY pagespeed.png /usr/share/nginx/html/ FROM alpine:$ALPINE_VERSION LABEL maintainer="Nico Berlee " \ 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 diff --git a/docker/alpine-3.8/nginx-stable/Dockerfile b/docker/alpine-3.8/nginx-stable/Dockerfile index b187a1321..96a6b8d86 100644 --- a/docker/alpine-3.8/nginx-stable/Dockerfile +++ b/docker/alpine-3.8/nginx-stable/Dockerfile @@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx 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 @@ COPY pagespeed.png /usr/share/nginx/html/ FROM alpine:$ALPINE_VERSION LABEL maintainer="Nico Berlee " \ 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 diff --git a/docker/alpine-edge/nginx-mainline/Dockerfile b/docker/alpine-edge/nginx-mainline/Dockerfile index 51ce7a26d..80a02e21a 100644 --- a/docker/alpine-edge/nginx-mainline/Dockerfile +++ b/docker/alpine-edge/nginx-mainline/Dockerfile @@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx 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 @@ COPY pagespeed.png /usr/share/nginx/html/ FROM alpine:$ALPINE_VERSION LABEL maintainer="Nico Berlee " \ 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 diff --git a/docker/alpine-edge/nginx-stable/Dockerfile b/docker/alpine-edge/nginx-stable/Dockerfile index f34bf7165..e8b0e0965 100644 --- a/docker/alpine-edge/nginx-stable/Dockerfile +++ b/docker/alpine-edge/nginx-stable/Dockerfile @@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx 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 @@ COPY pagespeed.png /usr/share/nginx/html/ FROM alpine:$ALPINE_VERSION LABEL maintainer="Nico Berlee " \ 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