Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated nginx to latest versions #17368

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Updated nginx to latest versions #17368

merged 1 commit into from
Aug 15, 2024

Conversation

thresheek
Copy link
Contributor

mainline gets updated to 1.27.1
stable gets updated to 1.26.2

while at it, Alpine is bumped for both mainline and stable to 3.20

also implemented a way to specify a different dynamic module packaging release version (1 vs 2) to workaround currently published packaging sources; might likely come in handy in the future when we'd need to bump nginx "base" package independently of all other modules.

@thresheek thresheek requested a review from a team as a code owner August 15, 2024 00:23
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@jnoordsij jnoordsij mentioned this pull request Aug 15, 2024
Merged
5 tasks
@github-actions GitHub Actions
Copy link

Diff for 9800bf7: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a50614b..a777f54 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,72 +1,72 @@
 Maintainers: NGINX Docker Maintainers <[email protected]> (@nginxinc)
 GitRepo: https://github.com/nginxinc/docker-nginx.git
 
-Tags: 1.26.1, stable, 1.26, 1.26.1-bookworm, stable-bookworm, 1.26-bookworm
+Tags: 1.26.2, stable, 1.26, 1.26.2-bookworm, stable-bookworm, 1.26-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a6f7d140744f8b15ff4314b8718b3f022efc7f43
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: stable/debian
 
-Tags: 1.26.1-alpine, stable-alpine, 1.26-alpine, 1.26.1-alpine3.19, stable-alpine3.19, 1.26-alpine3.19
+Tags: 1.26.2-alpine, stable-alpine, 1.26-alpine, 1.26.2-alpine3.20, stable-alpine3.20, 1.26-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: stable/alpine
 
-Tags: 1.26.1-alpine-otel, stable-alpine-otel, 1.26-alpine-otel, 1.26.1-alpine3.19-otel, stable-alpine3.19-otel, 1.26-alpine3.19-otel
+Tags: 1.26.2-alpine-otel, stable-alpine-otel, 1.26-alpine-otel, 1.26.2-alpine3.20-otel, stable-alpine3.20-otel, 1.26-alpine3.20-otel
 Architectures: amd64, arm64v8
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: stable/alpine-otel
 
-Tags: 1.26.1-alpine-perl, stable-alpine-perl, 1.26-alpine-perl, 1.26.1-alpine3.19-perl, stable-alpine3.19-perl, 1.26-alpine3.19-perl
+Tags: 1.26.2-alpine-perl, stable-alpine-perl, 1.26-alpine-perl, 1.26.2-alpine3.20-perl, stable-alpine3.20-perl, 1.26-alpine3.20-perl
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: stable/alpine-perl
 
-Tags: 1.26.1-alpine-slim, stable-alpine-slim, 1.26-alpine-slim, 1.26.1-alpine3.19-slim, stable-alpine3.19-slim, 1.26-alpine3.19-slim
+Tags: 1.26.2-alpine-slim, stable-alpine-slim, 1.26-alpine-slim, 1.26.2-alpine3.20-slim, stable-alpine3.20-slim, 1.26-alpine3.20-slim
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 1c99bf1406f95d5fbddb4c9f246e67ad07f79642
 Directory: stable/alpine-slim
 
-Tags: 1.26.1-otel, stable-otel, 1.26-otel, 1.26.1-bookworm-otel, stable-bookworm-otel, 1.26-bookworm-otel
+Tags: 1.26.2-otel, stable-otel, 1.26-otel, 1.26.2-bookworm-otel, stable-bookworm-otel, 1.26-bookworm-otel
 Architectures: amd64, arm64v8
-GitCommit: 3180cdbec313dc4a9f6dd1109ae66adaf98f11fb
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: stable/debian-otel
 
-Tags: 1.26.1-perl, stable-perl, 1.26-perl, 1.26.1-bookworm-perl, stable-bookworm-perl, 1.26-bookworm-perl
+Tags: 1.26.2-perl, stable-perl, 1.26-perl, 1.26.2-bookworm-perl, stable-bookworm-perl, 1.26-bookworm-perl
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3180cdbec313dc4a9f6dd1109ae66adaf98f11fb
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: stable/debian-perl
 
-Tags: 1.27.0, mainline, 1, 1.27, latest, 1.27.0-bookworm, mainline-bookworm, 1-bookworm, 1.27-bookworm, bookworm
+Tags: 1.27.1, mainline, 1, 1.27, latest, 1.27.1-bookworm, mainline-bookworm, 1-bookworm, 1.27-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a6f7d140744f8b15ff4314b8718b3f022efc7f43
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: mainline/debian
 
-Tags: 1.27.0-alpine, mainline-alpine, 1-alpine, 1.27-alpine, alpine, 1.27.0-alpine3.19, mainline-alpine3.19, 1-alpine3.19, 1.27-alpine3.19, alpine3.19
+Tags: 1.27.1-alpine, mainline-alpine, 1-alpine, 1.27-alpine, alpine, 1.27.1-alpine3.20, mainline-alpine3.20, 1-alpine3.20, 1.27-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: mainline/alpine
 
-Tags: 1.27.0-alpine-otel, mainline-alpine-otel, 1-alpine-otel, 1.27-alpine-otel, alpine-otel, 1.27.0-alpine3.19-otel, mainline-alpine3.19-otel, 1-alpine3.19-otel, 1.27-alpine3.19-otel, alpine3.19-otel
+Tags: 1.27.1-alpine-otel, mainline-alpine-otel, 1-alpine-otel, 1.27-alpine-otel, alpine-otel, 1.27.1-alpine3.20-otel, mainline-alpine3.20-otel, 1-alpine3.20-otel, 1.27-alpine3.20-otel, alpine3.20-otel
 Architectures: amd64, arm64v8
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: mainline/alpine-otel
 
-Tags: 1.27.0-alpine-perl, mainline-alpine-perl, 1-alpine-perl, 1.27-alpine-perl, alpine-perl, 1.27.0-alpine3.19-perl, mainline-alpine3.19-perl, 1-alpine3.19-perl, 1.27-alpine3.19-perl, alpine3.19-perl
+Tags: 1.27.1-alpine-perl, mainline-alpine-perl, 1-alpine-perl, 1.27-alpine-perl, alpine-perl, 1.27.1-alpine3.20-perl, mainline-alpine3.20-perl, 1-alpine3.20-perl, 1.27-alpine3.20-perl, alpine3.20-perl
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: mainline/alpine-perl
 
-Tags: 1.27.0-alpine-slim, mainline-alpine-slim, 1-alpine-slim, 1.27-alpine-slim, alpine-slim, 1.27.0-alpine3.19-slim, mainline-alpine3.19-slim, 1-alpine3.19-slim, 1.27-alpine3.19-slim, alpine3.19-slim
+Tags: 1.27.1-alpine-slim, mainline-alpine-slim, 1-alpine-slim, 1.27-alpine-slim, alpine-slim, 1.27.1-alpine3.20-slim, mainline-alpine3.20-slim, 1-alpine3.20-slim, 1.27-alpine3.20-slim, alpine3.20-slim
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94a27ac42d45670d941a55334d89e80760f7cc8e
+GitCommit: 239684923b2c652b0767540d180de7f7e84bd9fa
 Directory: mainline/alpine-slim
 
-Tags: 1.27.0-otel, mainline-otel, 1-otel, 1.27-otel, otel, 1.27.0-bookworm-otel, mainline-bookworm-otel, 1-bookworm-otel, 1.27-bookworm-otel, bookworm-otel
+Tags: 1.27.1-otel, mainline-otel, 1-otel, 1.27-otel, otel, 1.27.1-bookworm-otel, mainline-bookworm-otel, 1-bookworm-otel, 1.27-bookworm-otel, bookworm-otel
 Architectures: amd64, arm64v8
-GitCommit: 3180cdbec313dc4a9f6dd1109ae66adaf98f11fb
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: mainline/debian-otel
 
-Tags: 1.27.0-perl, mainline-perl, 1-perl, 1.27-perl, perl, 1.27.0-bookworm-perl, mainline-bookworm-perl, 1-bookworm-perl, 1.27-bookworm-perl, bookworm-perl
+Tags: 1.27.1-perl, mainline-perl, 1-perl, 1.27-perl, perl, 1.27.1-bookworm-perl, mainline-bookworm-perl, 1-bookworm-perl, 1.27-bookworm-perl, bookworm-perl
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3180cdbec313dc4a9f6dd1109ae66adaf98f11fb
+GitCommit: e78cf70ce7b73a0c9ea734c9cf8aaaa283c1cc5a
 Directory: mainline/debian-perl
diff --git a/_bashbrew-list b/_bashbrew-list
index 42e5d48..be69455 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
 nginx:1
 nginx:1-alpine
-nginx:1-alpine3.19
-nginx:1-alpine3.19-otel
-nginx:1-alpine3.19-perl
-nginx:1-alpine3.19-slim
+nginx:1-alpine3.20
+nginx:1-alpine3.20-otel
+nginx:1-alpine3.20-perl
+nginx:1-alpine3.20-slim
 nginx:1-alpine-otel
 nginx:1-alpine-perl
 nginx:1-alpine-slim
@@ -14,10 +14,10 @@ nginx:1-otel
 nginx:1-perl
 nginx:1.26
 nginx:1.26-alpine
-nginx:1.26-alpine3.19
-nginx:1.26-alpine3.19-otel
-nginx:1.26-alpine3.19-perl
-nginx:1.26-alpine3.19-slim
+nginx:1.26-alpine3.20
+nginx:1.26-alpine3.20-otel
+nginx:1.26-alpine3.20-perl
+nginx:1.26-alpine3.20-slim
 nginx:1.26-alpine-otel
 nginx:1.26-alpine-perl
 nginx:1.26-alpine-slim
@@ -26,26 +26,26 @@ nginx:1.26-bookworm-otel
 nginx:1.26-bookworm-perl
 nginx:1.26-otel
 nginx:1.26-perl
-nginx:1.26.1
-nginx:1.26.1-alpine
-nginx:1.26.1-alpine3.19
-nginx:1.26.1-alpine3.19-otel
-nginx:1.26.1-alpine3.19-perl
-nginx:1.26.1-alpine3.19-slim
-nginx:1.26.1-alpine-otel
-nginx:1.26.1-alpine-perl
-nginx:1.26.1-alpine-slim
-nginx:1.26.1-bookworm
-nginx:1.26.1-bookworm-otel
-nginx:1.26.1-bookworm-perl
-nginx:1.26.1-otel
-nginx:1.26.1-perl
+nginx:1.26.2
+nginx:1.26.2-alpine
+nginx:1.26.2-alpine3.20
+nginx:1.26.2-alpine3.20-otel
+nginx:1.26.2-alpine3.20-perl
+nginx:1.26.2-alpine3.20-slim
+nginx:1.26.2-alpine-otel
+nginx:1.26.2-alpine-perl
+nginx:1.26.2-alpine-slim
+nginx:1.26.2-bookworm
+nginx:1.26.2-bookworm-otel
+nginx:1.26.2-bookworm-perl
+nginx:1.26.2-otel
+nginx:1.26.2-perl
 nginx:1.27
 nginx:1.27-alpine
-nginx:1.27-alpine3.19
-nginx:1.27-alpine3.19-otel
-nginx:1.27-alpine3.19-perl
-nginx:1.27-alpine3.19-slim
+nginx:1.27-alpine3.20
+nginx:1.27-alpine3.20-otel
+nginx:1.27-alpine3.20-perl
+nginx:1.27-alpine3.20-slim
 nginx:1.27-alpine-otel
 nginx:1.27-alpine-perl
 nginx:1.27-alpine-slim
@@ -54,25 +54,25 @@ nginx:1.27-bookworm-otel
 nginx:1.27-bookworm-perl
 nginx:1.27-otel
 nginx:1.27-perl
-nginx:1.27.0
-nginx:1.27.0-alpine
-nginx:1.27.0-alpine3.19
-nginx:1.27.0-alpine3.19-otel
-nginx:1.27.0-alpine3.19-perl
-nginx:1.27.0-alpine3.19-slim
-nginx:1.27.0-alpine-otel
-nginx:1.27.0-alpine-perl
-nginx:1.27.0-alpine-slim
-nginx:1.27.0-bookworm
-nginx:1.27.0-bookworm-otel
-nginx:1.27.0-bookworm-perl
-nginx:1.27.0-otel
-nginx:1.27.0-perl
+nginx:1.27.1
+nginx:1.27.1-alpine
+nginx:1.27.1-alpine3.20
+nginx:1.27.1-alpine3.20-otel
+nginx:1.27.1-alpine3.20-perl
+nginx:1.27.1-alpine3.20-slim
+nginx:1.27.1-alpine-otel
+nginx:1.27.1-alpine-perl
+nginx:1.27.1-alpine-slim
+nginx:1.27.1-bookworm
+nginx:1.27.1-bookworm-otel
+nginx:1.27.1-bookworm-perl
+nginx:1.27.1-otel
+nginx:1.27.1-perl
 nginx:alpine
-nginx:alpine3.19
-nginx:alpine3.19-otel
-nginx:alpine3.19-perl
-nginx:alpine3.19-slim
+nginx:alpine3.20
+nginx:alpine3.20-otel
+nginx:alpine3.20-perl
+nginx:alpine3.20-slim
 nginx:alpine-otel
 nginx:alpine-perl
 nginx:alpine-slim
@@ -82,10 +82,10 @@ nginx:bookworm-perl
 nginx:latest
 nginx:mainline
 nginx:mainline-alpine
-nginx:mainline-alpine3.19
-nginx:mainline-alpine3.19-otel
-nginx:mainline-alpine3.19-perl
-nginx:mainline-alpine3.19-slim
+nginx:mainline-alpine3.20
+nginx:mainline-alpine3.20-otel
+nginx:mainline-alpine3.20-perl
+nginx:mainline-alpine3.20-slim
 nginx:mainline-alpine-otel
 nginx:mainline-alpine-perl
 nginx:mainline-alpine-slim
@@ -98,10 +98,10 @@ nginx:otel
 nginx:perl
 nginx:stable
 nginx:stable-alpine
-nginx:stable-alpine3.19
-nginx:stable-alpine3.19-otel
-nginx:stable-alpine3.19-perl
-nginx:stable-alpine3.19-slim
+nginx:stable-alpine3.20
+nginx:stable-alpine3.20-otel
+nginx:stable-alpine3.20-perl
+nginx:stable-alpine3.20-slim
 nginx:stable-alpine-otel
 nginx:stable-alpine-perl
 nginx:stable-alpine-slim
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 71860fe..3657bb6 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,14 +1,14 @@
-nginx:1.26-alpine3.19-slim
+nginx:1.26-alpine3.20-slim
 nginx:1.26-bookworm
 nginx:1.26-bookworm-otel
 nginx:1.26-bookworm-perl
-nginx:alpine3.19-slim
+nginx:alpine3.20-slim
 nginx:bookworm
 nginx:bookworm-otel
 nginx:bookworm-perl
-nginx:1.26-alpine3.19
-nginx:1.26-alpine3.19-otel
-nginx:1.26-alpine3.19-perl
-nginx:alpine3.19
-nginx:alpine3.19-otel
-nginx:alpine3.19-perl
+nginx:1.26-alpine3.20
+nginx:1.26-alpine3.20-otel
+nginx:1.26-alpine3.20-perl
+nginx:alpine3.20
+nginx:alpine3.20-otel
+nginx:alpine3.20-perl
diff --git a/nginx_1.26-alpine3.19-otel/Dockerfile b/nginx_1.26-alpine3.20-otel/Dockerfile
similarity index 87%
rename from nginx_1.26-alpine3.19-otel/Dockerfile
rename to nginx_1.26-alpine3.20-otel/Dockerfile
index 6fd59d8..dbb4501 100644
--- a/nginx_1.26-alpine3.19-otel/Dockerfile
+++ b/nginx_1.26-alpine3.20-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.26.1-alpine
+FROM nginx:1.26.2-alpine
 
 ENV OTEL_VERSION   0.1.0
 
@@ -11,9 +11,9 @@ RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
         nginx-module-otel=${NGINX_VERSION}.${OTEL_VERSION}-r${PKG_RELEASE} \
     " \
@@ -43,6 +43,7 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
                 xz \
                 re2-dev \
                 c-ares-dev \
@@ -50,7 +51,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${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 \
diff --git a/nginx_1.26-alpine3.19-perl/Dockerfile b/nginx_1.26-alpine3.20-perl/Dockerfile
similarity index 85%
rename from nginx_1.26-alpine3.19-perl/Dockerfile
rename to nginx_1.26-alpine3.20-perl/Dockerfile
index f017a96..077ff3e 100644
--- a/nginx_1.26-alpine3.19-perl/Dockerfile
+++ b/nginx_1.26-alpine3.20-perl/Dockerfile
@@ -3,16 +3,16 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.26.1-alpine
+FROM nginx:1.26.2-alpine
 
 RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
     " \
 # install prerequisites for public key and pkg-oss checks
@@ -41,11 +41,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${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 \
diff --git a/nginx_1.26-alpine3.19-slim/10-listen-on-ipv6-by-default.sh b/nginx_1.26-alpine3.20-slim/10-listen-on-ipv6-by-default.sh
similarity index 100%
rename from nginx_1.26-alpine3.19-slim/10-listen-on-ipv6-by-default.sh
rename to nginx_1.26-alpine3.20-slim/10-listen-on-ipv6-by-default.sh
diff --git a/nginx_1.26-alpine3.19-slim/15-local-resolvers.envsh b/nginx_1.26-alpine3.20-slim/15-local-resolvers.envsh
similarity index 100%
rename from nginx_1.26-alpine3.19-slim/15-local-resolvers.envsh
rename to nginx_1.26-alpine3.20-slim/15-local-resolvers.envsh
diff --git a/nginx_1.26-alpine3.19-slim/20-envsubst-on-templates.sh b/nginx_1.26-alpine3.20-slim/20-envsubst-on-templates.sh
similarity index 100%
rename from nginx_1.26-alpine3.19-slim/20-envsubst-on-templates.sh
rename to nginx_1.26-alpine3.20-slim/20-envsubst-on-templates.sh
diff --git a/nginx_1.26-alpine3.19-slim/30-tune-worker-processes.sh b/nginx_1.26-alpine3.20-slim/30-tune-worker-processes.sh
similarity index 100%
rename from nginx_1.26-alpine3.19-slim/30-tune-worker-processes.sh
rename to nginx_1.26-alpine3.20-slim/30-tune-worker-processes.sh
diff --git a/nginx_1.26-alpine3.19-slim/Dockerfile b/nginx_1.26-alpine3.20-slim/Dockerfile
similarity index 94%
rename from nginx_1.26-alpine3.19-slim/Dockerfile
rename to nginx_1.26-alpine3.20-slim/Dockerfile
index 458724c..d1d3d8a 100644
--- a/nginx_1.26-alpine3.19-slim/Dockerfile
+++ b/nginx_1.26-alpine3.20-slim/Dockerfile
@@ -3,12 +3,13 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM alpine:3.19
+FROM alpine:3.20
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.26.1
-ENV PKG_RELEASE   2
+ENV NGINX_VERSION  1.26.2
+ENV PKG_RELEASE    1
+ENV DYNPKG_RELEASE 2
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -53,11 +54,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${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 \
diff --git a/nginx_1.26-alpine3.19-slim/docker-entrypoint.sh b/nginx_1.26-alpine3.20-slim/docker-entrypoint.sh
similarity index 100%
rename from nginx_1.26-alpine3.19-slim/docker-entrypoint.sh
rename to nginx_1.26-alpine3.20-slim/docker-entrypoint.sh
diff --git a/nginx_1.26-alpine3.19/Dockerfile b/nginx_1.26-alpine3.20/Dockerfile
similarity index 86%
rename from nginx_1.26-alpine3.19/Dockerfile
rename to nginx_1.26-alpine3.20/Dockerfile
index 317e11c..603b754 100644
--- a/nginx_1.26-alpine3.19/Dockerfile
+++ b/nginx_1.26-alpine3.20/Dockerfile
@@ -3,18 +3,18 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.26.1-alpine-slim
+FROM nginx:1.26.2-alpine-slim
 
-ENV NJS_VERSION   0.8.4
-ENV NJS_RELEASE   2
+ENV NJS_VERSION   0.8.5
+ENV NJS_RELEASE   1
 
 RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
     " \
 # install prerequisites for public key and pkg-oss checks
@@ -46,11 +46,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${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 \
diff --git a/nginx_1.26-bookworm-otel/Dockerfile b/nginx_1.26-bookworm-otel/Dockerfile
index 764b994..1bc6896 100644
--- a/nginx_1.26-bookworm-otel/Dockerfile
+++ b/nginx_1.26-bookworm-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.26.1
+FROM nginx:1.26.2
 
 ENV OTEL_VERSION     0.1.0
 
@@ -12,9 +12,9 @@ RUN set -x; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
         nginx-module-otel=${NGINX_VERSION}+${OTEL_VERSION}-${PKG_RELEASE} \
     " \
diff --git a/nginx_1.26-bookworm-perl/Dockerfile b/nginx_1.26-bookworm-perl/Dockerfile
index adfd57f..17b0f10 100644
--- a/nginx_1.26-bookworm-perl/Dockerfile
+++ b/nginx_1.26-bookworm-perl/Dockerfile
@@ -3,17 +3,17 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.26.1
+FROM nginx:1.26.2
 
 RUN set -x; \
     NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
     " \
     && case "$dpkgArch" in \
@@ -37,11 +37,11 @@ RUN set -x; \
             \
 # build .deb files from upstream's source packages (which are verified by apt-get)
             && apt-get update \
-            && apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+            && apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
             && ( \
                 cd "$tempDir" \
                 && DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
-                    apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+                    apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
             ) \
 # we don't remove APT lists here because they get re-downloaded and removed later
             \
diff --git a/nginx_1.26-bookworm/Dockerfile b/nginx_1.26-bookworm/Dockerfile
index dfdc542..e623e41 100644
--- a/nginx_1.26-bookworm/Dockerfile
+++ b/nginx_1.26-bookworm/Dockerfile
@@ -7,10 +7,11 @@ FROM debian:bookworm-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION   1.26.1
-ENV NJS_VERSION     0.8.4
-ENV NJS_RELEASE     2~bookworm
-ENV PKG_RELEASE     2~bookworm
+ENV NGINX_VERSION   1.26.2
+ENV NJS_VERSION     0.8.5
+ENV NJS_RELEASE     1~bookworm
+ENV PKG_RELEASE     1~bookworm
+ENV DYNPKG_RELEASE  2~bookworm
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -39,9 +40,9 @@ RUN set -x \
     && dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
     " \
     && case "$dpkgArch" in \
diff --git a/nginx_alpine3.19-otel/Dockerfile b/nginx_alpine3.20-otel/Dockerfile
similarity index 87%
rename from nginx_alpine3.19-otel/Dockerfile
rename to nginx_alpine3.20-otel/Dockerfile
index 784dd98..320fb07 100644
--- a/nginx_alpine3.19-otel/Dockerfile
+++ b/nginx_alpine3.20-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.27.0-alpine
+FROM nginx:1.27.1-alpine
 
 ENV OTEL_VERSION   0.1.0
 
@@ -11,9 +11,9 @@ RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
         nginx-module-otel=${NGINX_VERSION}.${OTEL_VERSION}-r${PKG_RELEASE} \
     " \
@@ -43,6 +43,7 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
                 xz \
                 re2-dev \
                 c-ares-dev \
@@ -50,7 +51,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${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 \
diff --git a/nginx_alpine3.19-perl/Dockerfile b/nginx_alpine3.20-perl/Dockerfile
similarity index 85%
rename from nginx_alpine3.19-perl/Dockerfile
rename to nginx_alpine3.20-perl/Dockerfile
index 55e9c5f..dc7219f 100644
--- a/nginx_alpine3.19-perl/Dockerfile
+++ b/nginx_alpine3.20-perl/Dockerfile
@@ -3,16 +3,16 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.27.0-alpine
+FROM nginx:1.27.1-alpine
 
 RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
     " \
 # install prerequisites for public key and pkg-oss checks
@@ -41,11 +41,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${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 \
diff --git a/nginx_alpine3.19-slim/10-listen-on-ipv6-by-default.sh b/nginx_alpine3.20-slim/10-listen-on-ipv6-by-default.sh
similarity index 100%
rename from nginx_alpine3.19-slim/10-listen-on-ipv6-by-default.sh
rename to nginx_alpine3.20-slim/10-listen-on-ipv6-by-default.sh
diff --git a/nginx_alpine3.19-slim/15-local-resolvers.envsh b/nginx_alpine3.20-slim/15-local-resolvers.envsh
similarity index 100%
rename from nginx_alpine3.19-slim/15-local-resolvers.envsh
rename to nginx_alpine3.20-slim/15-local-resolvers.envsh
diff --git a/nginx_alpine3.19-slim/20-envsubst-on-templates.sh b/nginx_alpine3.20-slim/20-envsubst-on-templates.sh
similarity index 100%
rename from nginx_alpine3.19-slim/20-envsubst-on-templates.sh
rename to nginx_alpine3.20-slim/20-envsubst-on-templates.sh
diff --git a/nginx_alpine3.19-slim/30-tune-worker-processes.sh b/nginx_alpine3.20-slim/30-tune-worker-processes.sh
similarity index 100%
rename from nginx_alpine3.19-slim/30-tune-worker-processes.sh
rename to nginx_alpine3.20-slim/30-tune-worker-processes.sh
diff --git a/nginx_alpine3.19-slim/Dockerfile b/nginx_alpine3.20-slim/Dockerfile
similarity index 94%
rename from nginx_alpine3.19-slim/Dockerfile
rename to nginx_alpine3.20-slim/Dockerfile
index 202eed7..a931809 100644
--- a/nginx_alpine3.19-slim/Dockerfile
+++ b/nginx_alpine3.20-slim/Dockerfile
@@ -3,12 +3,13 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM alpine:3.19
+FROM alpine:3.20
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.27.0
-ENV PKG_RELEASE   2
+ENV NGINX_VERSION  1.27.1
+ENV PKG_RELEASE    1
+ENV DYNPKG_RELEASE 2
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -53,11 +54,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${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 \
diff --git a/nginx_alpine3.19-slim/docker-entrypoint.sh b/nginx_alpine3.20-slim/docker-entrypoint.sh
similarity index 100%
rename from nginx_alpine3.19-slim/docker-entrypoint.sh
rename to nginx_alpine3.20-slim/docker-entrypoint.sh
diff --git a/nginx_alpine3.19/Dockerfile b/nginx_alpine3.20/Dockerfile
similarity index 86%
rename from nginx_alpine3.19/Dockerfile
rename to nginx_alpine3.20/Dockerfile
index d1c3965..1bb5b53 100644
--- a/nginx_alpine3.19/Dockerfile
+++ b/nginx_alpine3.20/Dockerfile
@@ -3,18 +3,18 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.27.0-alpine-slim
+FROM nginx:1.27.1-alpine-slim
 
-ENV NJS_VERSION   0.8.4
-ENV NJS_RELEASE   2
+ENV NJS_VERSION   0.8.5
+ENV NJS_RELEASE   1
 
 RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
     " \
 # install prerequisites for public key and pkg-oss checks
@@ -46,11 +46,12 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${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 \
diff --git a/nginx_bookworm-otel/Dockerfile b/nginx_bookworm-otel/Dockerfile
index 9fe3620..58a5cd9 100644
--- a/nginx_bookworm-otel/Dockerfile
+++ b/nginx_bookworm-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.27.0
+FROM nginx:1.27.1
 
 ENV OTEL_VERSION     0.1.0
 
@@ -12,9 +12,9 @@ RUN set -x; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
         nginx-module-otel=${NGINX_VERSION}+${OTEL_VERSION}-${PKG_RELEASE} \
     " \
diff --git a/nginx_bookworm-perl/Dockerfile b/nginx_bookworm-perl/Dockerfile
index b2fcb2e..e3a51fb 100644
--- a/nginx_bookworm-perl/Dockerfile
+++ b/nginx_bookworm-perl/Dockerfile
@@ -3,17 +3,17 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.27.0
+FROM nginx:1.27.1
 
 RUN set -x; \
     NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
     " \
     && case "$dpkgArch" in \
@@ -37,11 +37,11 @@ RUN set -x; \
             \
 # build .deb files from upstream's source packages (which are verified by apt-get)
             && apt-get update \
-            && apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+            && apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
             && ( \
                 cd "$tempDir" \
                 && DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
-                    apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
+                    apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
             ) \
 # we don't remove APT lists here because they get re-downloaded and removed later
             \
diff --git a/nginx_bookworm/Dockerfile b/nginx_bookworm/Dockerfile
index 1795d6b..40a9838 100644
--- a/nginx_bookworm/Dockerfile
+++ b/nginx_bookworm/Dockerfile
@@ -7,10 +7,11 @@ FROM debian:bookworm-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION   1.27.0
-ENV NJS_VERSION     0.8.4
-ENV NJS_RELEASE     2~bookworm
-ENV PKG_RELEASE     2~bookworm
+ENV NGINX_VERSION   1.27.1
+ENV NJS_VERSION     0.8.5
+ENV NJS_RELEASE     1~bookworm
+ENV PKG_RELEASE     1~bookworm
+ENV DYNPKG_RELEASE  2~bookworm
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -39,9 +40,9 @@ RUN set -x \
     && dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
         nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
     " \
     && case "$dpkgArch" in \

Relevant Maintainers:

@yosifkit yosifkit merged commit 5355a0a into docker-library:master Aug 15, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnoordsij jnoordsij jnoordsij left review comments

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/nginx
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thresheek @yosifkit @jnoordsij