Skip to content

Commit 109ca3c

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.23.0
* Update NJS to 0.7.5 * Update mainline Alpine Linux to 3.16
1 parent c2e8e98 commit 109ca3c

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=alpine:3.15
6+
ARG IMAGE=alpine:3.16
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.21.6
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.23.0
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -71,16 +71,16 @@ RUN set -x \
7171
&& su nobody -s /bin/sh -c " \
7272
export HOME=${tempDir} \
7373
&& cd ${tempDir} \
74-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/688.tar.gz \
75-
&& PKGOSSCHECKSUM=\"a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718 *688.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r 688.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
74+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
75+
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
76+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7777
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7878
else \
7979
echo \"pkg-oss tarball checksum verification failed!\"; \
8080
exit 1; \
8181
fi \
82-
&& tar xzvf 688.tar.gz \
83-
&& cd pkg-oss-688 \
82+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
83+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
8484
&& cd alpine \
8585
&& make all \
8686
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=alpine:3.15
6+
ARG IMAGE=alpine:3.16
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.21.6
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.23.0
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -70,16 +70,16 @@ RUN set -x \
7070
&& su nobody -s /bin/sh -c " \
7171
export HOME=${tempDir} \
7272
&& cd ${tempDir} \
73-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/688.tar.gz \
74-
&& PKGOSSCHECKSUM=\"a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718 *688.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r 688.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
73+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74+
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
75+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7676
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7777
else \
7878
echo \"pkg-oss tarball checksum verification failed!\"; \
7979
exit 1; \
8080
fi \
81-
&& tar xzvf 688.tar.gz \
82-
&& cd pkg-oss-688 \
81+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
82+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
8383
&& cd alpine \
8484
&& make all \
8585
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-perl/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.21.6
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.23.0
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
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.21.6
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.23.0
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎stable/alpine-perl/Dockerfile‎

Lines changed: 6 additions & 6 deletions
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.0
12-
ENV NJS_VERSION 0.7.4
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -71,16 +71,16 @@ RUN set -x \
7171
&& su nobody -s /bin/sh -c " \
7272
export HOME=${tempDir} \
7373
&& cd ${tempDir} \
74-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/696.tar.gz \
75-
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r 696.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
74+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
75+
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
76+
&& if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7777
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7878
else \
7979
echo \"pkg-oss tarball checksum verification failed!\"; \
8080
exit 1; \
8181
fi \
82-
&& tar xzvf 696.tar.gz \
83-
&& cd pkg-oss-696 \
82+
&& tar xzvf 714.tar.gz \
83+
&& cd pkg-oss-714 \
8484
&& cd alpine \
8585
&& make all \
8686
&& 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
@@ -9,7 +9,7 @@ FROM $IMAGE
99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.4
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -70,16 +70,16 @@ RUN set -x \
7070
&& su nobody -s /bin/sh -c " \
7171
export HOME=${tempDir} \
7272
&& cd ${tempDir} \
73-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/696.tar.gz \
74-
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r 696.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
73+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
74+
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
75+
&& if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7676
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7777
else \
7878
echo \"pkg-oss tarball checksum verification failed!\"; \
7979
exit 1; \
8080
fi \
81-
&& tar xzvf 696.tar.gz \
82-
&& cd pkg-oss-696 \
81+
&& tar xzvf 714.tar.gz \
82+
&& cd pkg-oss-714 \
8383
&& cd alpine \
8484
&& make all \
8585
&& 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
@@ -9,7 +9,7 @@ FROM $IMAGE
99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.4
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎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.0
12-
ENV NJS_VERSION 0.7.4
12+
ENV NJS_VERSION 0.7.5
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 8 additions & 8 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.21.6'
15+
[mainline]='1.23.0'
1616
[stable]='1.22.0'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.7.3'
22-
[stable]='0.7.4'
21+
[mainline]='0.7.5'
22+
[stable]='0.7.5'
2323
)
2424

2525
# Current package patchlevel version
@@ -35,7 +35,7 @@ declare -A debian=(
3535
)
3636

3737
declare -A alpine=(
38-
[mainline]='3.15'
38+
[mainline]='3.16'
3939
[stable]='3.16'
4040
)
4141

@@ -44,16 +44,16 @@ 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]='688'
48-
[stable]='696'
47+
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
48+
[stable]='714'
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]='a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718'
56-
[stable]='fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230'
55+
[mainline]='678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4'
56+
[stable]='f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e'
5757
)
5858

5959
get_packages() {

0 commit comments

Comments
 (0)