From 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 11 Apr 2023 12:57:07 -0700
Subject: [PATCH] Updated stable nginx to 1.24.0.
---
generate-stackbrew-library.sh | 2 +-
stable/alpine-perl/Dockerfile | 12 ++++++------
stable/alpine-slim/Dockerfile | 12 ++++++------
stable/alpine/Dockerfile | 14 +++++++-------
stable/debian-perl/Dockerfile | 2 +-
stable/debian/Dockerfile | 4 ++--
sync-awsecr.sh | 2 +-
update.sh | 8 ++++----
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index d5b71cb..cb25d01 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -4,7 +4,7 @@ set -eu
declare -A aliases
aliases=(
[mainline]='1 1.23 latest'
- [stable]='1.22'
+ [stable]='1.24'
)
self="$(basename "$BASH_SOURCE")"
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index d929754..15cc834 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -3,7 +3,7 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.22.1-alpine
+FROM nginx:1.24.0-alpine
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -54,16 +54,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/811.tar.gz \
- && PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${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 \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 811.tar.gz \
- && cd pkg-oss-811 \
+ && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& 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 221f28b..0f8c0b2 100644
--- a/stable/alpine-slim/Dockerfile
+++ b/stable/alpine-slim/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.17
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.1
+ENV NGINX_VERSION 1.24.0
ENV PKG_RELEASE 1
RUN set -x \
@@ -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/811.tar.gz \
- && PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${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 \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 811.tar.gz \
- && cd pkg-oss-811 \
+ && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& 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 a5b7d64..a5842e1 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -3,9 +3,9 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.22.1-alpine-slim
+FROM nginx:1.24.0-alpine-slim
-ENV NJS_VERSION 0.7.11
+ENV NJS_VERSION 0.7.12
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -58,16 +58,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/811.tar.gz \
- && PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${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 \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
- && tar xzvf 811.tar.gz \
- && cd pkg-oss-811 \
+ && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& 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-perl/Dockerfile b/stable/debian-perl/Dockerfile
index 55d2b8b..e485478 100644
--- a/stable/debian-perl/Dockerfile
+++ b/stable/debian-perl/Dockerfile
@@ -3,7 +3,7 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.22.1
+FROM nginx:1.24.0
RUN set -x \
&& apt-get update \
diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile
index db048dd..be3ec60 100644
--- a/stable/debian/Dockerfile
+++ b/stable/debian/Dockerfile
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.1
-ENV NJS_VERSION 0.7.11
+ENV NGINX_VERSION 1.24.0
+ENV NJS_VERSION 0.7.12
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/sync-awsecr.sh b/sync-awsecr.sh
index 3e10a9b..015dd63 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.23 latest'
- [stable]='1.22'
+ [stable]='1.24'
)
architectures=( amd64 arm64v8 )
diff --git a/update.sh b/update.sh
index 4215237..e545c72 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.23.4'
- [stable]='1.22.1'
+ [stable]='1.24.0'
)
# Current njs versions
declare -A njs=(
[mainline]='0.7.11'
- [stable]='0.7.11'
+ [stable]='0.7.12'
)
# Current package patchlevel version
@@ -45,7 +45,7 @@ declare -A alpine=(
# Remember to update pkgosschecksum when changing this.
declare -A rev=(
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
- [stable]='811'
+ [stable]='${NGINX_VERSION}-${PKG_RELEASE}'
)
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
@@ -53,7 +53,7 @@ declare -A rev=(
# Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=(
[mainline]='8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c'
- [stable]='c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc'
+ [stable]='dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b'
)
get_packages() {
--
GitLab