Skip to content

Commit fef5123

Browse files
thresheekthresheek
committed
Updated NGINX to 1.22.1, 1.23.2, NJS to 0.7.7.
1 parent 7e0541f commit fef5123

File tree

11 files changed

+43
-43
lines changed

11 files changed

+43
-43
lines changed

‎mainline/alpine-perl/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.23.1
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.23.2
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -68,7 +68,7 @@ RUN set -x \
6868
export HOME=${tempDir} \
6969
&& cd ${tempDir} \
7070
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
71-
&& PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
71+
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
7272
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7373
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7474
else \

‎mainline/alpine-slim/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.23.1
10+
ENV NGINX_VERSION 1.23.2
1111
ENV PKG_RELEASE 1
1212

1313
RUN set -x \
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.23.1
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.23.2
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -67,7 +67,7 @@ RUN set -x \
6767
export HOME=${tempDir} \
6868
&& cd ${tempDir} \
6969
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70-
&& PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
70+
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
7171
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7272
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7373
else \

‎mainline/debian-perl/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.23.1
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.23.2
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎mainline/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.23.1
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.23.2
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎stable/alpine-perl/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.22.1
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -67,16 +67,16 @@ RUN set -x \
6767
&& su nobody -s /bin/sh -c " \
6868
export HOME=${tempDir} \
6969
&& cd ${tempDir} \
70-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \
71-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
72-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
70+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
71+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
72+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7373
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7474
else \
7575
echo \"pkg-oss tarball checksum verification failed!\"; \
7676
exit 1; \
7777
fi \
78-
&& tar xzvf 725.tar.gz \
79-
&& cd pkg-oss-725 \
78+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
79+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
8080
&& cd alpine \
8181
&& make all \
8282
&& 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.16
77

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

10-
ENV NGINX_VERSION 1.22.0
10+
ENV NGINX_VERSION 1.22.1
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/725.tar.gz \
60-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
68-
&& cd pkg-oss-725 \
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
@@ -7,8 +7,8 @@ FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.22.1
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -66,16 +66,16 @@ RUN set -x \
6666
&& su nobody -s /bin/sh -c " \
6767
export HOME=${tempDir} \
6868
&& cd ${tempDir} \
69-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \
70-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
71-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
69+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
71+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7272
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7373
else \
7474
echo \"pkg-oss tarball checksum verification failed!\"; \
7575
exit 1; \
7676
fi \
77-
&& tar xzvf 725.tar.gz \
78-
&& cd pkg-oss-725 \
77+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
78+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7979
&& cd alpine \
8080
&& make all \
8181
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian-perl/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.0
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.22.1
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎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.0
11-
ENV NJS_VERSION 0.7.6
10+
ENV NGINX_VERSION 1.22.1
11+
ENV NJS_VERSION 0.7.7
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎update.sh

+7-7
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.1'
16-
[stable]='1.22.0'
15+
[mainline]='1.23.2'
16+
[stable]='1.22.1'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.7.6'
22-
[stable]='0.7.6'
21+
[mainline]='0.7.7'
22+
[stable]='0.7.7'
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]='725'
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=(
55-
[mainline]='513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd'
56-
[stable]='a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3'
55+
[mainline]='98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6'
56+
[stable]='7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25'
5757
)
5858

5959
get_packages() {

0 commit comments

Comments
 (0)