oschaaf closed pull request #1599: Nginx Mainline update to 1.15.5 URL: https://github.com/apache/incubator-pagespeed-ngx/pull/1599
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docker/alpine-3.8/nginx-mainline/Dockerfile b/docker/alpine-3.8/nginx-mainline/Dockerfile index db227dd32..88c2035f8 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.4 +ARG NGINX_VERSION=1.15.5 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 <[email protected]>" \ 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 diff --git a/docker/alpine-edge/nginx-mainline/Dockerfile b/docker/alpine-edge/nginx-mainline/Dockerfile index 75c8c6a5f..51ce7a26d 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.4 +ARG NGINX_VERSION=1.15.5 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 <[email protected]>" \ 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 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
