Skip to content

Commit 9a8b6d6

Browse files
alessfgalessfg
committed
Update stable NGINX to 1.24.0
And stable NJS to 0.7.12
1 parent 582fa68 commit 9a8b6d6

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎stable/alpine-perl/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.24.0-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
64-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 811.tar.gz \
72-
&& cd pkg-oss-811 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make module-perl \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.22.1
11+
ENV NGINX_VERSION 1.24.0
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
64-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 811.tar.gz \
72-
&& cd pkg-oss-811 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.24.0-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.7.11
9+
ENV NJS_VERSION 0.7.12
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -64,16 +64,16 @@ RUN set -x \
6464
&& su nobody -s /bin/sh -c " \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
67-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/811.tar.gz \
68-
&& PKGOSSCHECKSUM=\"c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc *811.tar.gz\" \
69-
&& if [ \"\$(openssl sha512 -r 811.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
67+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
69+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \
7272
echo \"pkg-oss tarball checksum verification failed!\"; \
7373
exit 1; \
7474
fi \
75-
&& tar xzvf 811.tar.gz \
76-
&& cd pkg-oss-811 \
75+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
76+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7777
&& cd alpine \
7878
&& make module-geoip module-image-filter module-njs module-xslt \
7979
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian-perl/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.24.0
77
FROM $IMAGE
88

99
ARG UID=101

‎stable/debian/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.22.1
12-
ENV NJS_VERSION 0.7.11
11+
ENV NGINX_VERSION 1.24.0
12+
ENV NJS_VERSION 0.7.12
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 4 additions & 4 deletions
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)