Skip to content

Conversation

@thresheek
Copy link
Contributor

And moved it to Trixie and Alpine 3.23

And moved it to Trixie and Alpine 3.23
@github-actions
Copy link

Diff for cee20bd:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3616e93..a37aa8b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,7 +4,6 @@ arm32v6
 arm32v7
 arm64v8
 i386
-mips64le
 ppc64le
 riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9ca586a..a797d01 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,39 +1,39 @@
 Maintainers: NGINX Docker Maintainers <[email protected]> (@nginx)
 GitRepo: https://github.com/nginx/docker-nginx.git
 
-Tags: 1.28.0, stable, 1.28, 1.28.0-bookworm, stable-bookworm, 1.28-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9b549fdf936778810dbe95a4813899c60444ef1c
+Tags: 1.28.1, stable, 1.28, 1.28.1-trixie, stable-trixie, 1.28-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/debian
 
-Tags: 1.28.0-alpine, stable-alpine, 1.28-alpine, 1.28.0-alpine3.21, stable-alpine3.21, 1.28-alpine3.21
+Tags: 1.28.1-alpine, stable-alpine, 1.28-alpine, 1.28.1-alpine3.23, stable-alpine3.23, 1.28-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 7f1d49f6f222f7e588a9066fd53a0ce43c3466a5
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/alpine
 
-Tags: 1.28.0-alpine-otel, stable-alpine-otel, 1.28-alpine-otel, 1.28.0-alpine3.21-otel, stable-alpine3.21-otel, 1.28-alpine3.21-otel
+Tags: 1.28.1-alpine-otel, stable-alpine-otel, 1.28-alpine-otel, 1.28.1-alpine3.23-otel, stable-alpine3.23-otel, 1.28-alpine3.23-otel
 Architectures: amd64, arm64v8
-GitCommit: 7f1d49f6f222f7e588a9066fd53a0ce43c3466a5
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/alpine-otel
 
-Tags: 1.28.0-alpine-perl, stable-alpine-perl, 1.28-alpine-perl, 1.28.0-alpine3.21-perl, stable-alpine3.21-perl, 1.28-alpine3.21-perl
+Tags: 1.28.1-alpine-perl, stable-alpine-perl, 1.28-alpine-perl, 1.28.1-alpine3.23-perl, stable-alpine3.23-perl, 1.28-alpine3.23-perl
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 7f1d49f6f222f7e588a9066fd53a0ce43c3466a5
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/alpine-perl
 
-Tags: 1.28.0-alpine-slim, stable-alpine-slim, 1.28-alpine-slim, 1.28.0-alpine3.21-slim, stable-alpine3.21-slim, 1.28-alpine3.21-slim
+Tags: 1.28.1-alpine-slim, stable-alpine-slim, 1.28-alpine-slim, 1.28.1-alpine3.23-slim, stable-alpine3.23-slim, 1.28-alpine3.23-slim
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b549fdf936778810dbe95a4813899c60444ef1c
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/alpine-slim
 
-Tags: 1.28.0-otel, stable-otel, 1.28-otel, 1.28.0-bookworm-otel, stable-bookworm-otel, 1.28-bookworm-otel
+Tags: 1.28.1-otel, stable-otel, 1.28-otel, 1.28.1-trixie-otel, stable-trixie-otel, 1.28-trixie-otel
 Architectures: amd64, arm64v8
-GitCommit: 7f1d49f6f222f7e588a9066fd53a0ce43c3466a5
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/debian-otel
 
-Tags: 1.28.0-perl, stable-perl, 1.28-perl, 1.28.0-bookworm-perl, stable-bookworm-perl, 1.28-bookworm-perl
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7f1d49f6f222f7e588a9066fd53a0ce43c3466a5
+Tags: 1.28.1-perl, stable-perl, 1.28-perl, 1.28.1-trixie-perl, stable-trixie-perl, 1.28-trixie-perl
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 50dc9c37b0668fd9e7760c9841c3bef50e8d4227
 Directory: stable/debian-perl
 
 Tags: 1.29.4, mainline, 1, 1.29, latest, 1.29.4-trixie, mainline-trixie, 1-trixie, 1.29-trixie, trixie
diff --git a/_bashbrew-list b/_bashbrew-list
index d5b5362..28ea847 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,32 +14,32 @@ nginx:1-trixie-otel
 nginx:1-trixie-perl
 nginx:1.28
 nginx:1.28-alpine
-nginx:1.28-alpine3.21
-nginx:1.28-alpine3.21-otel
-nginx:1.28-alpine3.21-perl
-nginx:1.28-alpine3.21-slim
+nginx:1.28-alpine3.23
+nginx:1.28-alpine3.23-otel
+nginx:1.28-alpine3.23-perl
+nginx:1.28-alpine3.23-slim
 nginx:1.28-alpine-otel
 nginx:1.28-alpine-perl
 nginx:1.28-alpine-slim
-nginx:1.28-bookworm
-nginx:1.28-bookworm-otel
-nginx:1.28-bookworm-perl
 nginx:1.28-otel
 nginx:1.28-perl
-nginx:1.28.0
-nginx:1.28.0-alpine
-nginx:1.28.0-alpine3.21
-nginx:1.28.0-alpine3.21-otel
-nginx:1.28.0-alpine3.21-perl
-nginx:1.28.0-alpine3.21-slim
-nginx:1.28.0-alpine-otel
-nginx:1.28.0-alpine-perl
-nginx:1.28.0-alpine-slim
-nginx:1.28.0-bookworm
-nginx:1.28.0-bookworm-otel
-nginx:1.28.0-bookworm-perl
-nginx:1.28.0-otel
-nginx:1.28.0-perl
+nginx:1.28-trixie
+nginx:1.28-trixie-otel
+nginx:1.28-trixie-perl
+nginx:1.28.1
+nginx:1.28.1-alpine
+nginx:1.28.1-alpine3.23
+nginx:1.28.1-alpine3.23-otel
+nginx:1.28.1-alpine3.23-perl
+nginx:1.28.1-alpine3.23-slim
+nginx:1.28.1-alpine-otel
+nginx:1.28.1-alpine-perl
+nginx:1.28.1-alpine-slim
+nginx:1.28.1-otel
+nginx:1.28.1-perl
+nginx:1.28.1-trixie
+nginx:1.28.1-trixie-otel
+nginx:1.28.1-trixie-perl
 nginx:1.29
 nginx:1.29-alpine
 nginx:1.29-alpine3.23
@@ -95,18 +95,18 @@ nginx:otel
 nginx:perl
 nginx:stable
 nginx:stable-alpine
-nginx:stable-alpine3.21
-nginx:stable-alpine3.21-otel
-nginx:stable-alpine3.21-perl
-nginx:stable-alpine3.21-slim
+nginx:stable-alpine3.23
+nginx:stable-alpine3.23-otel
+nginx:stable-alpine3.23-perl
+nginx:stable-alpine3.23-slim
 nginx:stable-alpine-otel
 nginx:stable-alpine-perl
 nginx:stable-alpine-slim
-nginx:stable-bookworm
-nginx:stable-bookworm-otel
-nginx:stable-bookworm-perl
 nginx:stable-otel
 nginx:stable-perl
+nginx:stable-trixie
+nginx:stable-trixie-otel
+nginx:stable-trixie-perl
 nginx:trixie
 nginx:trixie-otel
 nginx:trixie-perl
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e0ec0cc..d399454 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,14 +1,14 @@
-nginx:1.28-alpine3.21-slim
-nginx:1.28-bookworm
-nginx:1.28-bookworm-otel
-nginx:1.28-bookworm-perl
+nginx:1.28-alpine3.23-slim
+nginx:1.28-trixie
+nginx:1.28-trixie-otel
+nginx:1.28-trixie-perl
 nginx:alpine3.23-slim
 nginx:trixie
 nginx:trixie-otel
 nginx:trixie-perl
-nginx:1.28-alpine3.21
-nginx:1.28-alpine3.21-otel
-nginx:1.28-alpine3.21-perl
+nginx:1.28-alpine3.23
+nginx:1.28-alpine3.23-otel
+nginx:1.28-alpine3.23-perl
 nginx:alpine3.23
 nginx:alpine3.23-otel
 nginx:alpine3.23-perl
diff --git a/nginx_1.28-alpine3.21-otel/Dockerfile b/nginx_1.28-alpine3.23-otel/Dockerfile
similarity index 93%
rename from nginx_1.28-alpine3.21-otel/Dockerfile
rename to nginx_1.28-alpine3.23-otel/Dockerfile
index 7ca1a94..d2a2ee7 100644
--- a/nginx_1.28-alpine3.21-otel/Dockerfile
+++ b/nginx_1.28-alpine3.23-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.28.0-alpine
+FROM nginx:1.28.1-alpine
 
 ENV OTEL_VERSION   0.1.2
 
@@ -51,7 +51,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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.28-alpine3.21-perl/Dockerfile b/nginx_1.28-alpine3.23-perl/Dockerfile
similarity index 93%
rename from nginx_1.28-alpine3.21-perl/Dockerfile
rename to nginx_1.28-alpine3.23-perl/Dockerfile
index 9676d8b..16817ea 100644
--- a/nginx_1.28-alpine3.21-perl/Dockerfile
+++ b/nginx_1.28-alpine3.23-perl/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.28.0-alpine
+FROM nginx:1.28.1-alpine
 
 RUN set -x \
     && apkArch="$(cat /etc/apk/arch)" \
@@ -46,7 +46,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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.28-alpine3.21-slim/10-listen-on-ipv6-by-default.sh b/nginx_1.28-alpine3.23-slim/10-listen-on-ipv6-by-default.sh
similarity index 100%
rename from nginx_1.28-alpine3.21-slim/10-listen-on-ipv6-by-default.sh
rename to nginx_1.28-alpine3.23-slim/10-listen-on-ipv6-by-default.sh
diff --git a/nginx_1.28-alpine3.21-slim/15-local-resolvers.envsh b/nginx_1.28-alpine3.23-slim/15-local-resolvers.envsh
similarity index 100%
rename from nginx_1.28-alpine3.21-slim/15-local-resolvers.envsh
rename to nginx_1.28-alpine3.23-slim/15-local-resolvers.envsh
diff --git a/nginx_1.28-alpine3.21-slim/20-envsubst-on-templates.sh b/nginx_1.28-alpine3.23-slim/20-envsubst-on-templates.sh
similarity index 100%
rename from nginx_1.28-alpine3.21-slim/20-envsubst-on-templates.sh
rename to nginx_1.28-alpine3.23-slim/20-envsubst-on-templates.sh
diff --git a/nginx_1.28-alpine3.21-slim/30-tune-worker-processes.sh b/nginx_1.28-alpine3.23-slim/30-tune-worker-processes.sh
similarity index 100%
rename from nginx_1.28-alpine3.21-slim/30-tune-worker-processes.sh
rename to nginx_1.28-alpine3.23-slim/30-tune-worker-processes.sh
diff --git a/nginx_1.28-alpine3.21-slim/Dockerfile b/nginx_1.28-alpine3.23-slim/Dockerfile
similarity index 95%
rename from nginx_1.28-alpine3.21-slim/Dockerfile
rename to nginx_1.28-alpine3.23-slim/Dockerfile
index 29bf5ba..676bf03 100644
--- a/nginx_1.28-alpine3.21-slim/Dockerfile
+++ b/nginx_1.28-alpine3.23-slim/Dockerfile
@@ -3,11 +3,11 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM alpine:3.21
+FROM alpine:3.23
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION  1.28.0
+ENV NGINX_VERSION  1.28.1
 ENV PKG_RELEASE    1
 ENV DYNPKG_RELEASE 1
 
@@ -59,7 +59,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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.28-alpine3.21-slim/docker-entrypoint.sh b/nginx_1.28-alpine3.23-slim/docker-entrypoint.sh
similarity index 100%
rename from nginx_1.28-alpine3.21-slim/docker-entrypoint.sh
rename to nginx_1.28-alpine3.23-slim/docker-entrypoint.sh
diff --git a/nginx_1.28-alpine3.21/Dockerfile b/nginx_1.28-alpine3.23/Dockerfile
similarity index 93%
rename from nginx_1.28-alpine3.21/Dockerfile
rename to nginx_1.28-alpine3.23/Dockerfile
index fb0c900..74510b8 100644
--- a/nginx_1.28-alpine3.21/Dockerfile
+++ b/nginx_1.28-alpine3.23/Dockerfile
@@ -3,9 +3,9 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.28.0-alpine-slim
+FROM nginx:1.28.1-alpine-slim
 
-ENV NJS_VERSION   0.8.10
+ENV NJS_VERSION   0.9.4
 ENV NJS_RELEASE   1
 
 RUN set -x \
@@ -51,7 +51,7 @@ RUN set -x \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
-                && PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+                && PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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.28-bookworm-otel/Dockerfile b/nginx_1.28-trixie-otel/Dockerfile
similarity index 94%
rename from nginx_1.28-bookworm-otel/Dockerfile
rename to nginx_1.28-trixie-otel/Dockerfile
index e4129a4..35e7cb0 100644
--- a/nginx_1.28-bookworm-otel/Dockerfile
+++ b/nginx_1.28-trixie-otel/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.28.0
+FROM nginx:1.28.1
 
 ENV OTEL_VERSION     0.1.2
 
@@ -21,7 +21,7 @@ RUN set -x; \
     && case "$dpkgArch" in \
         amd64|arm64) \
 # arches officialy built by upstream
-            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
+            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
             && apt-get update \
             ;; \
         *) \
@@ -50,7 +50,7 @@ RUN set -x; \
                 && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
                 && REVISION=${REVISION%~*} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
-                && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
+                && PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
                 && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
                     echo "pkg-oss tarball checksum verification succeeded!"; \
                 else \
diff --git a/nginx_1.28-bookworm-perl/Dockerfile b/nginx_1.28-trixie-perl/Dockerfile
similarity index 94%
rename from nginx_1.28-bookworm-perl/Dockerfile
rename to nginx_1.28-trixie-perl/Dockerfile
index bda0e1b..7b0daea 100644
--- a/nginx_1.28-bookworm-perl/Dockerfile
+++ b/nginx_1.28-trixie-perl/Dockerfile
@@ -3,7 +3,7 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM nginx:1.28.0
+FROM nginx:1.28.1
 
 RUN set -x; \
     NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -19,7 +19,7 @@ RUN set -x; \
     && case "$dpkgArch" in \
         amd64|arm64) \
 # arches officialy built by upstream
-            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
+            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
             && apt-get update \
             ;; \
         *) \
@@ -48,7 +48,7 @@ RUN set -x; \
                 && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
                 && REVISION=${REVISION%~*} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
-                && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
+                && PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
                 && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
                     echo "pkg-oss tarball checksum verification succeeded!"; \
                 else \
diff --git a/nginx_1.28-bookworm/10-listen-on-ipv6-by-default.sh b/nginx_1.28-trixie/10-listen-on-ipv6-by-default.sh
similarity index 100%
rename from nginx_1.28-bookworm/10-listen-on-ipv6-by-default.sh
rename to nginx_1.28-trixie/10-listen-on-ipv6-by-default.sh
diff --git a/nginx_1.28-bookworm/15-local-resolvers.envsh b/nginx_1.28-trixie/15-local-resolvers.envsh
similarity index 100%
rename from nginx_1.28-bookworm/15-local-resolvers.envsh
rename to nginx_1.28-trixie/15-local-resolvers.envsh
diff --git a/nginx_1.28-bookworm/20-envsubst-on-templates.sh b/nginx_1.28-trixie/20-envsubst-on-templates.sh
similarity index 100%
rename from nginx_1.28-bookworm/20-envsubst-on-templates.sh
rename to nginx_1.28-trixie/20-envsubst-on-templates.sh
diff --git a/nginx_1.28-bookworm/30-tune-worker-processes.sh b/nginx_1.28-trixie/30-tune-worker-processes.sh
similarity index 100%
rename from nginx_1.28-bookworm/30-tune-worker-processes.sh
rename to nginx_1.28-trixie/30-tune-worker-processes.sh
diff --git a/nginx_1.28-bookworm/Dockerfile b/nginx_1.28-trixie/Dockerfile
similarity index 93%
rename from nginx_1.28-bookworm/Dockerfile
rename to nginx_1.28-trixie/Dockerfile
index 99f3495..c51dc28 100644
--- a/nginx_1.28-bookworm/Dockerfile
+++ b/nginx_1.28-trixie/Dockerfile
@@ -3,15 +3,15 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION   1.28.0
-ENV NJS_VERSION     0.8.10
-ENV NJS_RELEASE     1~bookworm
-ENV PKG_RELEASE     1~bookworm
-ENV DYNPKG_RELEASE  1~bookworm
+ENV NGINX_VERSION   1.28.1
+ENV NJS_VERSION     0.9.4
+ENV NJS_RELEASE     1~trixie
+ENV PKG_RELEASE     1~trixie
+ENV DYNPKG_RELEASE  1~trixie
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -48,7 +48,7 @@ RUN set -x \
     && case "$dpkgArch" in \
         amd64|arm64) \
 # arches officialy built by upstream
-            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
+            echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
             && apt-get update \
             ;; \
         *) \
@@ -77,7 +77,7 @@ RUN set -x \
                 && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
                 && REVISION=${REVISION%~*} \
                 && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
-                && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
+                && PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
                 && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
                     echo "pkg-oss tarball checksum verification succeeded!"; \
                 else \
diff --git a/nginx_1.28-bookworm/docker-entrypoint.sh b/nginx_1.28-trixie/docker-entrypoint.sh
similarity index 100%
rename from nginx_1.28-bookworm/docker-entrypoint.sh
rename to nginx_1.28-trixie/docker-entrypoint.sh

Relevant Maintainers:

@tianon tianon merged commit 12b58fd into docker-library:master Dec 24, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants