diff --git a/mainline/alpine-otel/Dockerfile b/mainline/alpine-otel/Dockerfile index 87c8559b..9216974f 100644 --- a/mainline/alpine-otel/Dockerfile +++ b/mainline/alpine-otel/Dockerfile @@ -50,16 +50,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ - && PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && PKGOSSCHECKSUM=\"13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *d2d80b90d604c4c312c8f4de235567911befabba.tar.gz\" \ + && if [ \"\$(openssl sha512 -r d2d80b90d604c4c312c8f4de235567911befabba.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 d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && cd pkg-oss-d2d80b90d604c4c312c8f4de235567911befabba \ && cd alpine \ && make module-otel \ && apk index --allow-untrusted -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 5bbd2d7c..ace92083 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -45,16 +45,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ - && PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && PKGOSSCHECKSUM=\"13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *d2d80b90d604c4c312c8f4de235567911befabba.tar.gz\" \ + && if [ \"\$(openssl sha512 -r d2d80b90d604c4c312c8f4de235567911befabba.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 d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && cd pkg-oss-d2d80b90d604c4c312c8f4de235567911befabba \ && cd alpine \ && make module-perl \ && apk index --allow-untrusted -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 f9fd0dd6..af704d5f 100644 --- a/mainline/alpine-slim/Dockerfile +++ b/mainline/alpine-slim/Dockerfile @@ -58,16 +58,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ - && PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && PKGOSSCHECKSUM=\"13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *d2d80b90d604c4c312c8f4de235567911befabba.tar.gz\" \ + && if [ \"\$(openssl sha512 -r d2d80b90d604c4c312c8f4de235567911befabba.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 d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && cd pkg-oss-d2d80b90d604c4c312c8f4de235567911befabba \ && cd alpine \ && make base \ && apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index d5296027..894bbdc3 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -5,7 +5,7 @@ # FROM nginx:1.29.0-alpine-slim -ENV NJS_VERSION 0.9.0 +ENV NJS_VERSION 0.9.1 ENV NJS_RELEASE 1 RUN set -x \ @@ -50,16 +50,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ - && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ - && PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && PKGOSSCHECKSUM=\"13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *d2d80b90d604c4c312c8f4de235567911befabba.tar.gz\" \ + && if [ \"\$(openssl sha512 -r d2d80b90d604c4c312c8f4de235567911befabba.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 d2d80b90d604c4c312c8f4de235567911befabba.tar.gz \ + && cd pkg-oss-d2d80b90d604c4c312c8f4de235567911befabba \ && cd alpine \ && make module-geoip module-image-filter module-njs module-xslt \ && apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/mainline/debian-otel/Dockerfile b/mainline/debian-otel/Dockerfile index 4b551fc4..5cbc99c0 100644 --- a/mainline/debian-otel/Dockerfile +++ b/mainline/debian-otel/Dockerfile @@ -47,10 +47,10 @@ RUN set -x; \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="d2d80b90d604c4c312c8f4de235567911befabba" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile index 37d0b871..58e14ef0 100644 --- a/mainline/debian-perl/Dockerfile +++ b/mainline/debian-perl/Dockerfile @@ -45,10 +45,10 @@ RUN set -x; \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="d2d80b90d604c4c312c8f4de235567911befabba" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index 9e9f0ce4..89c006c6 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -8,7 +8,7 @@ FROM debian:bookworm-slim LABEL maintainer="NGINX Docker Maintainers " ENV NGINX_VERSION 1.29.0 -ENV NJS_VERSION 0.9.0 +ENV NJS_VERSION 0.9.1 ENV NJS_RELEASE 1~bookworm ENV PKG_RELEASE 1~bookworm ENV DYNPKG_RELEASE 1~bookworm @@ -74,10 +74,10 @@ RUN set -x \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="d2d80b90d604c4c312c8f4de235567911befabba" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/stable/alpine-otel/Dockerfile b/stable/alpine-otel/Dockerfile index 7ca1a94b..82fe285a 100644 --- a/stable/alpine-otel/Dockerfile +++ b/stable/alpine-otel/Dockerfile @@ -50,16 +50,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ 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\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && PKGOSSCHECKSUM=\"137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *87ccb478e7dc7118180d877952902577a7799a81.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 87ccb478e7dc7118180d877952902577a7799a81.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 87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && cd pkg-oss-87ccb478e7dc7118180d877952902577a7799a81 \ && cd alpine \ && make module-otel \ && apk index --allow-untrusted -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 9676d8bc..e407d0ab 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -45,16 +45,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ 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\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && PKGOSSCHECKSUM=\"137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *87ccb478e7dc7118180d877952902577a7799a81.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 87ccb478e7dc7118180d877952902577a7799a81.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 87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && cd pkg-oss-87ccb478e7dc7118180d877952902577a7799a81 \ && cd alpine \ && make module-perl \ && apk index --allow-untrusted -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 29bf5ba2..23fe889d 100644 --- a/stable/alpine-slim/Dockerfile +++ b/stable/alpine-slim/Dockerfile @@ -58,16 +58,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ 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\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && PKGOSSCHECKSUM=\"137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *87ccb478e7dc7118180d877952902577a7799a81.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 87ccb478e7dc7118180d877952902577a7799a81.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 87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && cd pkg-oss-87ccb478e7dc7118180d877952902577a7799a81 \ && cd alpine \ && make base \ && apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index fb0c900a..8efdea08 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -5,7 +5,7 @@ # FROM nginx:1.28.0-alpine-slim -ENV NJS_VERSION 0.8.10 +ENV NJS_VERSION 0.9.1 ENV NJS_RELEASE 1 RUN set -x \ @@ -50,16 +50,16 @@ RUN set -x \ && su nobody -s /bin/sh -c " \ 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\" \ - && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -L -O https://github.com/nginx/pkg-oss/archive/87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && PKGOSSCHECKSUM=\"137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *87ccb478e7dc7118180d877952902577a7799a81.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 87ccb478e7dc7118180d877952902577a7799a81.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 87ccb478e7dc7118180d877952902577a7799a81.tar.gz \ + && cd pkg-oss-87ccb478e7dc7118180d877952902577a7799a81 \ && cd alpine \ && make module-geoip module-image-filter module-njs module-xslt \ && apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/stable/debian-otel/Dockerfile b/stable/debian-otel/Dockerfile index e4129a43..b00e8f1b 100644 --- a/stable/debian-otel/Dockerfile +++ b/stable/debian-otel/Dockerfile @@ -47,10 +47,10 @@ RUN set -x; \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="87ccb478e7dc7118180d877952902577a7799a81" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile index bda0e1b8..3a3488a6 100644 --- a/stable/debian-perl/Dockerfile +++ b/stable/debian-perl/Dockerfile @@ -45,10 +45,10 @@ RUN set -x; \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="87ccb478e7dc7118180d877952902577a7799a81" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile index d0b7cf62..fb549c68 100644 --- a/stable/debian/Dockerfile +++ b/stable/debian/Dockerfile @@ -8,7 +8,7 @@ FROM debian:bookworm-slim LABEL maintainer="NGINX Docker Maintainers " ENV NGINX_VERSION 1.28.0 -ENV NJS_VERSION 0.8.10 +ENV NJS_VERSION 0.9.1 ENV NJS_RELEASE 1~bookworm ENV PKG_RELEASE 1~bookworm ENV DYNPKG_RELEASE 1~bookworm @@ -74,10 +74,10 @@ RUN set -x \ xsltproc \ && ( \ cd "$tempDir" \ - && REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \ + && REVISION="87ccb478e7dc7118180d877952902577a7799a81" \ && REVISION=${REVISION%~*} \ && curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \ - && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233 *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \ diff --git a/update.sh b/update.sh index e85d193f..eb000cc8 100755 --- a/update.sh +++ b/update.sh @@ -18,8 +18,8 @@ declare -A nginx=( # Current njs versions declare -A njs=( - [mainline]='0.9.0' - [stable]='0.8.10' + [mainline]='0.9.1' + [stable]='0.9.1' ) # Current njs patchlevel version @@ -64,16 +64,16 @@ declare -A alpine=( # when building packages on architectures not supported by nginx.org # Remember to update pkgosschecksum when changing this. declare -A rev=( - [mainline]='${NGINX_VERSION}-${PKG_RELEASE}' - [stable]='${NGINX_VERSION}-${PKG_RELEASE}' + [mainline]='d2d80b90d604c4c312c8f4de235567911befabba' + [stable]='87ccb478e7dc7118180d877952902577a7799a81' ) # Holds SHA512 checksum for the pkg-oss tarball produced by source code # revision/tag in the previous block # Used in builds for architectures not packaged by nginx.org declare -A pkgosschecksum=( - [mainline]='400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1' - [stable]='517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4' + [mainline]='13c9aa59a7c0bd36c3a42f275ea182cfb81f84c69b9bfabe4cedd3141a71821bd63bd65b01b23989197000cd5641462a2203a0ea30e6674e6439bf1abc10baef' + [stable]='137604f91cdff9e7288a65338c2c5f0c225f05fa86f3eec1ec5b38bb1bd6716d9f44f7cd70915c6c5a896e83853b481a63235aadcc74c4e92056a81ad98dc233' ) get_packages() {