Skip to content

Commit 582fa68

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.23.4
And NJS to 0.7.11
1 parent 2bcefe4 commit 582fa68

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎mainline/alpine-perl/Dockerfile

Lines changed: 2 additions & 2 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.23.3-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.4-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

‎mainline/alpine-slim/Dockerfile

Lines changed: 2 additions & 2 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.23.3
11+
ENV NGINX_VERSION 1.23.4
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

‎mainline/alpine/Dockerfile

Lines changed: 3 additions & 3 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.23.3-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.4-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.7.9
9+
ENV NJS_VERSION 0.7.11
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -65,7 +65,7 @@ RUN set -x \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
6767
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
68+
&& PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6969
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \

‎mainline/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.23.3
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.4
77
FROM $IMAGE
88

99
ARG UID=101

‎mainline/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.23.3
12-
ENV NJS_VERSION 0.7.9
11+
ENV NGINX_VERSION 1.23.4
12+
ENV NJS_VERSION 0.7.11
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎stable/alpine-perl/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/757.tar.gz \
64-
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 757.tar.gz \
72-
&& cd pkg-oss-757 \
71+
&& tar xzvf 811.tar.gz \
72+
&& cd pkg-oss-811 \
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/757.tar.gz \
64-
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 757.tar.gz \
72-
&& cd pkg-oss-757 \
71+
&& tar xzvf 811.tar.gz \
72+
&& cd pkg-oss-811 \
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.7.9
9+
ENV NJS_VERSION 0.7.11
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/757.tar.gz \
68-
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
69-
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 757.tar.gz \
76-
&& cd pkg-oss-757 \
75+
&& tar xzvf 811.tar.gz \
76+
&& cd pkg-oss-811 \
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/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM $IMAGE
99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.22.1
12-
ENV NJS_VERSION 0.7.9
12+
ENV NJS_VERSION 0.7.11
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ declare branches=(
1212
# Current nginx versions
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
15-
[mainline]='1.23.3'
15+
[mainline]='1.23.4'
1616
[stable]='1.22.1'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.7.9'
22-
[stable]='0.7.9'
21+
[mainline]='0.7.11'
22+
[stable]='0.7.11'
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]='757'
48+
[stable]='811'
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=(
55-
[mainline]='52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990'
56-
[stable]='32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852'
55+
[mainline]='8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c'
56+
[stable]='c979fbdcc429d146f7fce922b0cc3f47dfbfbec5685af82395c59e21216dce47ef13fc26d610f1faabc0cb3a4ee58b42000c511bf77277f0898f5de55c868dcc'
5757
)
5858

5959
get_packages() {

0 commit comments

Comments
 (0)