Skip to content

Commit 5ce65c3

Browse files
thresheekthresheek
committed
Updated mainline NGINX to 1.23.3.
1 parent 564ae3c commit 5ce65c3

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎mainline/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-
FROM nginx:1.23.2-alpine
6+
FROM nginx:1.23.3-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/756.tar.gz \
58-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
59-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
57+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
58+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${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 756.tar.gz \
66-
&& cd pkg-oss-756 \
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 \

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 6 deletions
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.23.2
10+
ENV NGINX_VERSION 1.23.3
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/756.tar.gz \
60-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${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 756.tar.gz \
68-
&& cd pkg-oss-756 \
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 \

‎mainline/alpine/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-
FROM nginx:1.23.2-alpine-slim
6+
FROM nginx:1.23.3-alpine-slim
77

88
ENV NJS_VERSION 0.7.9
99

@@ -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/756.tar.gz \
62-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${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 756.tar.gz \
70-
&& cd pkg-oss-756 \
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 \

‎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-
FROM nginx:1.23.2
6+
FROM nginx:1.23.3
77

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

‎mainline/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM debian:bullseye-slim
77

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

10-
ENV NGINX_VERSION 1.23.2
10+
ENV NGINX_VERSION 1.23.3
1111
ENV NJS_VERSION 0.7.9
1212
ENV PKG_RELEASE 1~bullseye
1313

‎update.sh‎

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

@@ -44,15 +44,15 @@ declare -A alpine=(
4444
# when building alpine packages on architectures not supported by nginx.org
4545
# Remember to update pkgosschecksum when changing this.
4646
declare -A rev=(
47-
[mainline]='756'
47+
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
4848
[stable]='757'
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]='5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f'
55+
[mainline]='52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990'
5656
[stable]='32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852'
5757
)
5858

0 commit comments

Comments
 (0)