artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Nginx in Docker (#1605)

Browse Source 
Stable from 1.14.0 to 1.14.1
Mainline from 1.15.5 to 1.15.6
This commit is contained in:
Nico Berlee
2018-11-15 10:32:22 +01:00
committed by Otto van der Schaaf
parent 24fe429a6f
commit ced02f1821
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/alpine-3.8/nginx-mainline/Dockerfile
+2 -2
View File
@@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx
ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
# Check http://nginx.org/en/download.html for the latest version. # 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_PGPKEY=520A9993A1C052F8
ARG NGINX_BUILD_CONFIG="\ ARG NGINX_BUILD_CONFIG="\
--prefix=/etc/nginx \ --prefix=/etc/nginx \
@@ -199,7 +199,7 @@ COPY pagespeed.png /usr/share/nginx/html/
FROM alpine:$ALPINE_VERSION FROM alpine:$ALPINE_VERSION
LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \ LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
version.mod-pagespeed="1.13.35.2" \ version.mod-pagespeed="1.13.35.2" \
version.nginx="1.15.5" \ version.nginx="1.15.6" \
version.ngx-pagespeed="1.13.35.2" version.ngx-pagespeed="1.13.35.2"
COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
docker/alpine-3.8/nginx-stable/Dockerfile
+2 -2
View File
@@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx
ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
# Check http://nginx.org/en/download.html for the latest version. # 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_PGPKEY=520A9993A1C052F8
ARG NGINX_BUILD_CONFIG="\ ARG NGINX_BUILD_CONFIG="\
--prefix=/etc/nginx \ --prefix=/etc/nginx \
@@ -199,7 +199,7 @@ COPY pagespeed.png /usr/share/nginx/html/
FROM alpine:$ALPINE_VERSION FROM alpine:$ALPINE_VERSION
LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \ LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
version.mod-pagespeed="1.13.35.2" \ version.mod-pagespeed="1.13.35.2" \
version.nginx="1.14.0" \ version.nginx="1.14.1" \
version.ngx-pagespeed="1.13.35.2" version.ngx-pagespeed="1.13.35.2"
COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
docker/alpine-edge/nginx-mainline/Dockerfile
+2 -2
View File
@@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx
ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
# Check http://nginx.org/en/download.html for the latest version. # 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_PGPKEY=520A9993A1C052F8
ARG NGINX_BUILD_CONFIG="\ ARG NGINX_BUILD_CONFIG="\
--prefix=/etc/nginx \ --prefix=/etc/nginx \
@@ -199,7 +199,7 @@ COPY pagespeed.png /usr/share/nginx/html/
FROM alpine:$ALPINE_VERSION FROM alpine:$ALPINE_VERSION
LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \ LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
version.mod-pagespeed="1.13.35.2" \ version.mod-pagespeed="1.13.35.2" \
version.nginx="1.15.5" \ version.nginx="1.15.6" \
version.ngx-pagespeed="1.13.35.2" version.ngx-pagespeed="1.13.35.2"
COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
docker/alpine-edge/nginx-stable/Dockerfile
+2 -2
View File
@@ -79,7 +79,7 @@ FROM alpine:$ALPINE_VERSION AS nginx
ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
# Check http://nginx.org/en/download.html for the latest version. # 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_PGPKEY=520A9993A1C052F8
ARG NGINX_BUILD_CONFIG="\ ARG NGINX_BUILD_CONFIG="\
--prefix=/etc/nginx \ --prefix=/etc/nginx \
@@ -204,7 +204,7 @@ COPY pagespeed.png /usr/share/nginx/html/
FROM alpine:$ALPINE_VERSION FROM alpine:$ALPINE_VERSION
LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \ LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
version.mod-pagespeed="1.13.35.2" \ version.mod-pagespeed="1.13.35.2" \
version.nginx="1.14.0" \ version.nginx="1.14.1" \
version.ngx-pagespeed="1.13.35.2" version.ngx-pagespeed="1.13.35.2"
COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin