diff --git a/mainline/alpine-otel/Dockerfile b/mainline/alpine-otel/Dockerfile
index 25b3b95bac7bfc5d7c2a597528dc5bdeee280cc4..7e08f87a3f2f0799304f7f5940f24b2b6b629a36 100644
--- a/mainline/alpine-otel/Dockerfile
+++ b/mainline/alpine-otel/Dockerfile
@@ -49,16 +49,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/93ac6e194ad0.tar.gz \
- && PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
+ && PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 93ac6e194ad0.tar.gz \
- && cd pkg-oss-93ac6e194ad0 \
+ && tar xzvf 27357d6c5453.tar.gz \
+ && cd pkg-oss-27357d6c5453 \
&& cd alpine \
&& make module-otel \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index bf4296b1e8238cd06f40f3c3b21184792361db9e..2c583aad835bbde168b1349976775a6115b06d5f 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -44,16 +44,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/93ac6e194ad0.tar.gz \
- && PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
+ && PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 93ac6e194ad0.tar.gz \
- && cd pkg-oss-93ac6e194ad0 \
+ && tar xzvf 27357d6c5453.tar.gz \
+ && cd pkg-oss-27357d6c5453 \
&& 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 e164320fa5e3cb55f1a4529b2eb5342b9675cbab..c1bde59c883ac260e05a6a48a0bed930d6257785 100644
--- a/mainline/alpine-slim/Dockerfile
+++ b/mainline/alpine-slim/Dockerfile
@@ -56,16 +56,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/93ac6e194ad0.tar.gz \
- && PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
+ && PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 93ac6e194ad0.tar.gz \
- && cd pkg-oss-93ac6e194ad0 \
+ && tar xzvf 27357d6c5453.tar.gz \
+ && cd pkg-oss-27357d6c5453 \
&& 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 3f3f6cd1587771ba6f9d9d7b9a75ab793980de74..a1a0470026157a35837b1ebaaaaa941db1e52cc7 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -6,7 +6,7 @@
FROM nginx:1.25.5-alpine-slim
ENV NJS_VERSION 0.8.4
-ENV NJS_RELEASE 2
+ENV NJS_RELEASE 3
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -49,16 +49,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/93ac6e194ad0.tar.gz \
- && PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
+ && PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 93ac6e194ad0.tar.gz \
- && cd pkg-oss-93ac6e194ad0 \
+ && tar xzvf 27357d6c5453.tar.gz \
+ && cd pkg-oss-27357d6c5453 \
&& 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/Dockerfile b/mainline/debian/Dockerfile
index f0bec38fa709290328ad91807dd8f5faa6c31a19..c20481998471fb83cbfeef7bddcd47c354e4f209 100644
--- a/mainline/debian/Dockerfile
+++ b/mainline/debian/Dockerfile
@@ -9,7 +9,7 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.25.5
ENV NJS_VERSION 0.8.4
-ENV NJS_RELEASE 2~bookworm
+ENV NJS_RELEASE 3~bookworm
ENV PKG_RELEASE 1~bookworm
RUN set -x \
diff --git a/stable/alpine-otel/Dockerfile b/stable/alpine-otel/Dockerfile
index 060bd73c3a12cc303cac7b6130d7c0ddf3dd6536..66923ea1f76e9078905c09d80c8c7c22da04cc7a 100644
--- a/stable/alpine-otel/Dockerfile
+++ b/stable/alpine-otel/Dockerfile
@@ -49,16 +49,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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
- && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
+ && PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
+ && tar xzvf 73d6839714a2.tar.gz \
+ && cd pkg-oss-73d6839714a2 \
&& cd alpine \
&& make module-otel \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index 9a941e0a8ee588533d5c80360ae228b12d2152ef..9cdf5d0f2f2b2964d81700b083b833a58623d959 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -44,16 +44,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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
- && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
+ && PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
+ && tar xzvf 73d6839714a2.tar.gz \
+ && cd pkg-oss-73d6839714a2 \
&& cd alpine \
&& make module-perl \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/stable/alpine-slim/Dockerfile b/stable/alpine-slim/Dockerfile
index de34e10a70097a2a81c137e6f1bd5ddf7402ad31..59e0e309a9bd73ab8e4eeeb0cce29807a973b081 100644
--- a/stable/alpine-slim/Dockerfile
+++ b/stable/alpine-slim/Dockerfile
@@ -56,16 +56,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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
- && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
+ && PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
+ && tar xzvf 73d6839714a2.tar.gz \
+ && cd pkg-oss-73d6839714a2 \
&& cd alpine \
&& make base \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index 132b71d6e877aa03f606234ec2fbab9edf938fb5..d7f1f0c5ce6aacfbf3230b7f4006d3f15367feb1 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -6,7 +6,7 @@
FROM nginx:1.26.0-alpine-slim
ENV NJS_VERSION 0.8.4
-ENV NJS_RELEASE 1
+ENV NJS_RELEASE 2
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -49,16 +49,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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
- && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
+ && PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
+ && if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
+ && tar xzvf 73d6839714a2.tar.gz \
+ && cd pkg-oss-73d6839714a2 \
&& 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/stable/debian/Dockerfile b/stable/debian/Dockerfile
index 4a06824e6568feee05a0fd6ad76e261b6c449b8b..853e3e601a9d211630fea35f18cd5fd196d50481 100644
--- a/stable/debian/Dockerfile
+++ b/stable/debian/Dockerfile
@@ -9,7 +9,7 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.26.0
ENV NJS_VERSION 0.8.4
-ENV NJS_RELEASE 1~bookworm
+ENV NJS_RELEASE 2~bookworm
ENV PKG_RELEASE 1~bookworm
RUN set -x \
diff --git a/update.sh b/update.sh
index 1249f91a33519b4fddc8b2a5a388113366e21934..1327b7088536d06d894c1b2d6f7d7fb48534d627 100755
--- a/update.sh
+++ b/update.sh
@@ -25,8 +25,8 @@ declare -A njs=(
# Current njs patchlevel version
# Remember to update pkgosschecksum when changing this.
declare -A njspkg=(
- [mainline]='2'
- [stable]='1'
+ [mainline]='3'
+ [stable]='2'
)
# Current otel versions
@@ -57,16 +57,16 @@ 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]='93ac6e194ad0'
- [stable]='${NGINX_VERSION}-${PKG_RELEASE}'
+ [mainline]='27357d6c5453'
+ [stable]='73d6839714a2'
)
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
# revision/tag in the previous block
# Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=(
- [mainline]='d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0'
- [stable]='f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb'
+ [mainline]='a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0'
+ [stable]='95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db'
)
get_packages() {