diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index 74b16afb10ac05683d36d5bb283469350293585f..a67df4f7d3ebc91baebb13231fa0e2f004cae166 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -7,8 +7,8 @@ FROM alpine:3.16 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.23.0 -ENV NJS_VERSION 0.7.5 +ENV NGINX_VERSION 1.23.1 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1 RUN set -x \ @@ -68,7 +68,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=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ + && PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${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/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index 75aebbe959b1985a464a3432748fc90adacd55b1..d8a995bd9115152413dfaa89b869f5f0e289790c 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -7,8 +7,8 @@ FROM alpine:3.16 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.23.0 -ENV NJS_VERSION 0.7.5 +ENV NGINX_VERSION 1.23.1 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1 RUN set -x \ @@ -67,7 +67,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=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ + && PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${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/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile index a0c1781b6d3a211d1b5d3e44feac1d64ab477eba..a0a4c590a94309b1d616d47d0380e6d77711bb3b 100644 --- a/mainline/debian-perl/Dockerfile +++ b/mainline/debian-perl/Dockerfile @@ -7,8 +7,8 @@ FROM debian:bullseye-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.23.0 -ENV NJS_VERSION 0.7.5 +ENV NGINX_VERSION 1.23.1 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1~bullseye RUN set -x \ diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index 4be092e9d476819eecbab90cc4525e5f55c62272..dd378e7e09dc3cea174caecc93176c7e6a1547a1 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -7,8 +7,8 @@ FROM debian:bullseye-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.23.0 -ENV NJS_VERSION 0.7.5 +ENV NGINX_VERSION 1.23.1 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1~bullseye RUN set -x \ diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index 4f89d02921f20c8a7881020c256f3db908a866c8..50cac385fed9110bccba983be9424529ed591a8a 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.16 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" ENV NGINX_VERSION 1.22.0 -ENV NJS_VERSION 0.7.5 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1 RUN set -x \ @@ -67,16 +67,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/714.tar.gz \ - && PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \ - && if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \ + && PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ echo \"pkg-oss tarball checksum verification failed!\"; \ exit 1; \ fi \ - && tar xzvf 714.tar.gz \ - && cd pkg-oss-714 \ + && tar xzvf 725.tar.gz \ + && cd pkg-oss-725 \ && cd alpine \ && make all \ && 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 5c79c906760d933a0335ea88a7ea015ee3dbfbb0..4bec54dcf40a3cd05d07b8f6895c73b218e78133 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.16 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" ENV NGINX_VERSION 1.22.0 -ENV NJS_VERSION 0.7.5 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1 RUN set -x \ @@ -66,16 +66,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/714.tar.gz \ - && PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \ - && if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ + && curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \ + && PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \ + && if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ echo \"pkg-oss tarball checksum verification failed!\"; \ exit 1; \ fi \ - && tar xzvf 714.tar.gz \ - && cd pkg-oss-714 \ + && tar xzvf 725.tar.gz \ + && cd pkg-oss-725 \ && cd alpine \ && make all \ && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \ diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile index 57d8a670f5a6bb5216ce000f31dbf13f693294cd..fac18e55cd30294908f8029c2a8885002722ed47 100644 --- a/stable/debian-perl/Dockerfile +++ b/stable/debian-perl/Dockerfile @@ -8,7 +8,7 @@ FROM debian:bullseye-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" ENV NGINX_VERSION 1.22.0 -ENV NJS_VERSION 0.7.5 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1~bullseye RUN set -x \ diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile index 12eecb65a378d11573174f8b5765f44223cedcde..48258bacae4e5ff26fb28858dcbb0e1c9babef8c 100644 --- a/stable/debian/Dockerfile +++ b/stable/debian/Dockerfile @@ -8,7 +8,7 @@ FROM debian:bullseye-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" ENV NGINX_VERSION 1.22.0 -ENV NJS_VERSION 0.7.5 +ENV NJS_VERSION 0.7.6 ENV PKG_RELEASE 1~bullseye RUN set -x \ diff --git a/update.sh b/update.sh index 6f0bb00029be74d25f2b3763895d46f512dd44bc..f1bb316c831458caa31f014192cf4c387bd11a0b 100755 --- a/update.sh +++ b/update.sh @@ -12,14 +12,14 @@ declare branches=( # Current nginx versions # Remember to update pkgosschecksum when changing this. declare -A nginx=( - [mainline]='1.23.0' + [mainline]='1.23.1' [stable]='1.22.0' ) # Current njs versions declare -A njs=( - [mainline]='0.7.5' - [stable]='0.7.5' + [mainline]='0.7.6' + [stable]='0.7.6' ) # Current package patchlevel version @@ -45,15 +45,15 @@ declare -A alpine=( # Remember to update pkgosschecksum when changing this. declare -A rev=( [mainline]='${NGINX_VERSION}-${PKG_RELEASE}' - [stable]='714' + [stable]='725' ) # 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]='678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4' - [stable]='f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e' + [mainline]='513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd' + [stable]='a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3' ) get_packages() {