From ac764837a3fd8fa234e225c3e49d0acd4c85c6ac Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 22 Apr 2025 13:51:29 -0700 Subject: [PATCH 1/2] Bump stable to 1.28.0. While at it, bump njs and otel to contemporary versions as well. --- generate-stackbrew-library.sh | 2 +- sync-awsecr.sh | 2 +- update.sh | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5f1025dd..8776c686 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -4,7 +4,7 @@ set -eu declare -A aliases aliases=( [mainline]='1 1.27 latest' - [stable]='1.26' + [stable]='1.28' ) self="$(basename "$BASH_SOURCE")" diff --git a/sync-awsecr.sh b/sync-awsecr.sh index 547c83ff..af1ed2bc 100755 --- a/sync-awsecr.sh +++ b/sync-awsecr.sh @@ -7,7 +7,7 @@ registry="public.ecr.aws/z9d2n7e1" declare -A aliases aliases=( [mainline]='1 1.27 latest' - [stable]='1.26' + [stable]='1.28' ) architectures=( amd64 arm64v8 ) diff --git a/update.sh b/update.sh index 7df556d6..dfe7935a 100755 --- a/update.sh +++ b/update.sh @@ -13,13 +13,13 @@ declare branches=( # Remember to update pkgosschecksum when changing this. declare -A nginx=( [mainline]='1.27.5' - [stable]='1.26.3' + [stable]='1.28.0' ) # Current njs versions declare -A njs=( [mainline]='0.8.10' - [stable]='0.8.9' + [stable]='0.8.10' ) # Current njs patchlevel version @@ -32,7 +32,7 @@ declare -A njspkg=( # Current otel versions declare -A otel=( [mainline]='0.1.2' - [stable]='0.1.1' + [stable]='0.1.2' ) # Current nginx package patchlevel version @@ -46,7 +46,7 @@ declare -A pkg=( # Remember to update pkgosschecksum when changing this declare -A dynpkg=( [mainline]=1 - [stable]=2 + [stable]=1 ) declare -A debian=( @@ -73,7 +73,7 @@ declare -A rev=( # Used in builds for architectures not packaged by nginx.org declare -A pkgosschecksum=( [mainline]='c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745' - [stable]='3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea' + [stable]='517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4' ) get_packages() { From ea31de02aad5311b10dd5a1e8d121c63014b419d Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 23 Apr 2025 10:06:56 -0700 Subject: [PATCH 2/2] Regenerated stable dockerfiles after the last commits. --- stable/alpine-otel/Dockerfile | 6 +++--- stable/alpine-perl/Dockerfile | 4 ++-- stable/alpine-slim/Dockerfile | 6 +++--- stable/alpine/Dockerfile | 6 +++--- stable/debian-otel/Dockerfile | 6 +++--- stable/debian-perl/Dockerfile | 4 ++-- stable/debian/Dockerfile | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/stable/alpine-otel/Dockerfile b/stable/alpine-otel/Dockerfile index cb6cd3bd..7ca1a94b 100644 --- a/stable/alpine-otel/Dockerfile +++ b/stable/alpine-otel/Dockerfile @@ -3,9 +3,9 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM nginx:1.26.3-alpine +FROM nginx:1.28.0-alpine -ENV OTEL_VERSION 0.1.1 +ENV OTEL_VERSION 0.1.2 RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ @@ -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=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${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 \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index 133c8a6e..9676d8bc 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -3,7 +3,7 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM nginx:1.26.3-alpine +FROM nginx:1.28.0-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=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${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 \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ diff --git a/stable/alpine-slim/Dockerfile b/stable/alpine-slim/Dockerfile index af03749c..29bf5ba2 100644 --- a/stable/alpine-slim/Dockerfile +++ b/stable/alpine-slim/Dockerfile @@ -7,9 +7,9 @@ FROM alpine:3.21 LABEL maintainer="NGINX Docker Maintainers " -ENV NGINX_VERSION 1.26.3 +ENV NGINX_VERSION 1.28.0 ENV PKG_RELEASE 1 -ENV DYNPKG_RELEASE 2 +ENV DYNPKG_RELEASE 1 RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants @@ -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=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${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 \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index ec1007e4..fb0c900a 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -3,9 +3,9 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM nginx:1.26.3-alpine-slim +FROM nginx:1.28.0-alpine-slim -ENV NJS_VERSION 0.8.9 +ENV NJS_VERSION 0.8.10 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=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${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 \ echo \"pkg-oss tarball checksum verification succeeded!\"; \ else \ diff --git a/stable/debian-otel/Dockerfile b/stable/debian-otel/Dockerfile index c39b0ee7..e4129a43 100644 --- a/stable/debian-otel/Dockerfile +++ b/stable/debian-otel/Dockerfile @@ -3,9 +3,9 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM nginx:1.26.3 +FROM nginx:1.28.0 -ENV OTEL_VERSION 0.1.1 +ENV OTEL_VERSION 0.1.2 RUN set -x; \ NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \ @@ -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="3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${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 18ca094e..bda0e1b8 100644 --- a/stable/debian-perl/Dockerfile +++ b/stable/debian-perl/Dockerfile @@ -3,7 +3,7 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM nginx:1.26.3 +FROM nginx:1.28.0 RUN set -x; \ NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \ @@ -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="3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${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 509a1f76..d0b7cf62 100644 --- a/stable/debian/Dockerfile +++ b/stable/debian/Dockerfile @@ -7,11 +7,11 @@ FROM debian:bookworm-slim LABEL maintainer="NGINX Docker Maintainers " -ENV NGINX_VERSION 1.26.3 -ENV NJS_VERSION 0.8.9 +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 2~bookworm +ENV DYNPKG_RELEASE 1~bookworm RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants @@ -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="3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${REVISION}.tar.gz" \ + && PKGOSSCHECKSUM="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \ && if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \ echo "pkg-oss tarball checksum verification succeeded!"; \ else \