From fe8a0410ee349245d1d9605a2d675ed446e8de69 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 20 Dec 2022 17:12:47 +0100 Subject: [PATCH] Update mainline NGINX to 1.23.3 --- Dockerfile-alpine-perl.template | 3 +++ Dockerfile-alpine.template | 7 +++++-- Dockerfile-debian-perl.template | 3 +++ mainline/alpine-perl/Dockerfile | 15 +++++++++------ mainline/alpine-slim/Dockerfile | 12 ++++++------ mainline/alpine/Dockerfile | 19 +++++++++++-------- mainline/debian-perl/Dockerfile | 5 ++++- mainline/debian/Dockerfile | 2 +- stable/alpine-perl/Dockerfile | 3 +++ stable/alpine/Dockerfile | 7 +++++-- stable/debian-perl/Dockerfile | 3 +++ update.sh | 6 +++--- 12 files changed, 56 insertions(+), 29 deletions(-) diff --git a/Dockerfile-alpine-perl.template b/Dockerfile-alpine-perl.template index 6677f3a..072ac1e 100644 --- a/Dockerfile-alpine-perl.template +++ b/Dockerfile-alpine-perl.template @@ -1,6 +1,9 @@ ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9f5c834..2d1d2f7 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,10 +1,13 @@ ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine-slim FROM $IMAGE -USER root - ENV NJS_VERSION %%NJS_VERSION%% +ARG UID=101 +ARG GID=101 + +USER root + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages="%%PACKAGES%% diff --git a/Dockerfile-debian-perl.template b/Dockerfile-debian-perl.template index 93fbe37..881956e 100644 --- a/Dockerfile-debian-perl.template +++ b/Dockerfile-debian-perl.template @@ -1,6 +1,9 @@ ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%% FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index de39d92..ae9f551 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -3,9 +3,12 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2-alpine +ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3-alpine FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ @@ -57,16 +60,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \ - && PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \ - && if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ + && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ echo \"pkg-oss tarball checksum verification failed!\"; \ exit 1; \ fi \ - && tar xzvf 756.tar.gz \ - && cd pkg-oss-756 \ + && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \ && cd alpine \ && make module-perl \ && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile index c0d0c06..f31144b 100644 --- a/mainline/alpine-slim/Dockerfile +++ b/mainline/alpine-slim/Dockerfile @@ -8,7 +8,7 @@ FROM $IMAGE LABEL maintainer="NGINX Docker Maintainers " -ENV NGINX_VERSION 1.23.2 +ENV NGINX_VERSION 1.23.3 ENV PKG_RELEASE 1 ARG UID=101 @@ -60,16 +60,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \ - && PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \ - && if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ + && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ echo \"pkg-oss tarball checksum verification failed!\"; \ exit 1; \ fi \ - && tar xzvf 756.tar.gz \ - && cd pkg-oss-756 \ + && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \ && cd alpine \ && make base \ && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index 982fabd..9de72ff 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -3,13 +3,16 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2-alpine-slim +ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3-alpine-slim FROM $IMAGE -USER root - ENV NJS_VERSION 0.7.9 +ARG UID=101 +ARG GID=101 + +USER root + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages=" \ @@ -61,16 +64,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \ - && PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \ - && if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ + && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ echo \"pkg-oss tarball checksum verification failed!\"; \ exit 1; \ fi \ - && tar xzvf 756.tar.gz \ - && cd pkg-oss-756 \ + && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ + && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \ && cd alpine \ && make module-geoip module-image-filter module-njs module-xslt \ && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile index 760c2f5..483f02c 100644 --- a/mainline/debian-perl/Dockerfile +++ b/mainline/debian-perl/Dockerfile @@ -3,9 +3,12 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2 +ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3 FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index 031735b..8636433 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -8,7 +8,7 @@ FROM $IMAGE LABEL maintainer="NGINX Docker Maintainers " -ENV NGINX_VERSION 1.23.2 +ENV NGINX_VERSION 1.23.3 ENV NJS_VERSION 0.7.9 ENV PKG_RELEASE 1~bullseye diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index a6e63a0..35c7334 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -6,6 +6,9 @@ ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index 1f002c4..cf9d8c1 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -6,10 +6,13 @@ ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine-slim FROM $IMAGE -USER root - ENV NJS_VERSION 0.7.9 +ARG UID=101 +ARG GID=101 + +USER root + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages=" \ diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile index 4aa4e44..e4f9f5b 100644 --- a/stable/debian-perl/Dockerfile +++ b/stable/debian-perl/Dockerfile @@ -6,6 +6,9 @@ ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1 FROM $IMAGE +ARG UID=101 +ARG GID=101 + USER root RUN set -x \ diff --git a/update.sh b/update.sh index 0b6299a..606ee9b 100755 --- a/update.sh +++ b/update.sh @@ -12,7 +12,7 @@ declare branches=( # Current nginx versions # Remember to update pkgosschecksum when changing this. declare -A nginx=( - [mainline]='1.23.2' + [mainline]='1.23.3' [stable]='1.22.1' ) @@ -44,7 +44,7 @@ declare -A alpine=( # when building alpine packages on architectures not supported by nginx.org # Remember to update pkgosschecksum when changing this. declare -A rev=( - [mainline]='756' + [mainline]='${NGINX_VERSION}-${PKG_RELEASE}' [stable]='757' ) @@ -52,7 +52,7 @@ declare -A rev=( # revision/tag in the previous block # Used in alpine builds for architectures not packaged by nginx.org declare -A pkgosschecksum=( - [mainline]='5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f' + [mainline]='52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990' [stable]='32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852' )