Skip to content

Commit 1a8d87b

Browse files
thresheekthresheek
committed
Updated stable nginx to 1.24.0.
1 parent 7f1ef35 commit 1a8d87b

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

‎generate-stackbrew-library.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44
declare -A aliases
55
aliases=(
66
[mainline]='1 1.23 latest'
7-
[stable]='1.22'
7+
[stable]='1.24'
88
)
99

1010
self="$(basename "$BASH_SOURCE")"

‎stable/alpine-perl/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.22.1-alpine
6+
FROM nginx:1.24.0-alpine
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -54,16 +54,16 @@ RUN set -x \
5454
&& su nobody -s /bin/sh -c " \
5555
export HOME=${tempDir} \
5656
&& cd ${tempDir} \
57-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
58-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
59-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
57+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
58+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
59+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6060
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6161
else \
6262
echo \"pkg-oss tarball checksum verification failed!\"; \
6363
exit 1; \
6464
fi \
65-
&& tar xzvf 811.tar.gz \
66-
&& cd pkg-oss-811 \
65+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6767
&& cd alpine \
6868
&& make module-perl \
6969
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.17
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.22.1
10+
ENV NGINX_VERSION 1.24.0
1111
ENV PKG_RELEASE 1
1212

1313
RUN set -x \
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
60-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf 811.tar.gz \
68-
&& cd pkg-oss-811 \
67+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.22.1-alpine-slim
6+
FROM nginx:1.24.0-alpine-slim
77

8-
ENV NJS_VERSION 0.7.11
8+
ENV NJS_VERSION 0.7.12
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -58,16 +58,16 @@ RUN set -x \
5858
&& su nobody -s /bin/sh -c " \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
61-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
62-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
63+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \
6666
echo \"pkg-oss tarball checksum verification failed!\"; \
6767
exit 1; \
6868
fi \
69-
&& tar xzvf 811.tar.gz \
70-
&& cd pkg-oss-811 \
69+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7171
&& cd alpine \
7272
&& make module-geoip module-image-filter module-njs module-xslt \
7373
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian-perl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.22.1
6+
FROM nginx:1.24.0
77

88
RUN set -x \
99
&& apt-get update \

‎stable/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.22.1
11-
ENV NJS_VERSION 0.7.11
10+
ENV NGINX_VERSION 1.24.0
11+
ENV NJS_VERSION 0.7.12
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎sync-awsecr.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ registry="public.ecr.aws/z9d2n7e1"
77
declare -A aliases
88
aliases=(
99
[mainline]='1 1.23 latest'
10-
[stable]='1.22'
10+
[stable]='1.24'
1111
)
1212

1313
architectures=( amd64 arm64v8 )

‎update.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ declare branches=(
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
1515
[mainline]='1.23.4'
16-
[stable]='1.22.1'
16+
[stable]='1.24.0'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
2121
[mainline]='0.7.11'
22-
[stable]='0.7.11'
22+
[stable]='0.7.12'
2323
)
2424

2525
# Current package patchlevel version
@@ -45,15 +45,15 @@ declare -A alpine=(
4545
# Remember to update pkgosschecksum when changing this.
4646
declare -A rev=(
4747
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
48-
[stable]='811'
48+
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
4949
)
5050

5151
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5252
# revision/tag in the previous block
5353
# Used in alpine builds for architectures not packaged by nginx.org
5454
declare -A pkgosschecksum=(
5555
[mainline]='8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c'
56-
[stable]='c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc'
56+
[stable]='dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b'
5757
)
5858

5959
get_packages() {

0 commit comments

Comments
 (0)