Skip to content

Commit 82a186f

Browse files
alessfgalessfg
committed
Update stable NGINX to 1.22.0
And update stable NJS to 0.7.4
1 parent 7a694ae commit 82a186f

File tree

5 files changed

+27
-28
lines changed

5 files changed

+27
-28
lines changed

‎stable/alpine-perl/Dockerfile‎

Lines changed: 9 additions & 9 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.14
6+
ARG IMAGE=alpine:3.16
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.20.2
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.22.0
12+
ENV NJS_VERSION 0.7.4
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -57,7 +57,7 @@ RUN set -x \
5757
libc-dev \
5858
make \
5959
openssl-dev \
60-
pcre-dev \
60+
pcre2-dev \
6161
zlib-dev \
6262
linux-headers \
6363
libxslt-dev \
@@ -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/689.tar.gz \
75-
&& PKGOSSCHECKSUM=\"b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116 *689.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r 689.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 689.tar.gz \
83-
&& cd pkg-oss-689 \
82+
&& tar xzvf 696.tar.gz \
83+
&& cd pkg-oss-696 \
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: 9 additions & 9 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.14
6+
ARG IMAGE=alpine:3.16
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION 1.20.2
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.22.0
12+
ENV NJS_VERSION 0.7.4
1313
ENV PKG_RELEASE 1
1414

1515
ARG UID=101
@@ -56,7 +56,7 @@ RUN set -x \
5656
libc-dev \
5757
make \
5858
openssl-dev \
59-
pcre-dev \
59+
pcre2-dev \
6060
zlib-dev \
6161
linux-headers \
6262
libxslt-dev \
@@ -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/689.tar.gz \
74-
&& PKGOSSCHECKSUM=\"b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116 *689.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r 689.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 689.tar.gz \
82-
&& cd pkg-oss-689 \
81+
&& tar xzvf 696.tar.gz \
82+
&& cd pkg-oss-696 \
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: 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.20.2
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.22.0
12+
ENV NJS_VERSION 0.7.4
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
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.20.2
12-
ENV NJS_VERSION 0.7.3
11+
ENV NGINX_VERSION 1.22.0
12+
ENV NJS_VERSION 0.7.4
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 5 additions & 6 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.21.6'
16-
[stable]='1.20.2'
16+
[stable]='1.22.0'
1717
)
1818

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

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

3737
declare -A alpine=(
3838
[mainline]='3.15'
39-
[stable]='3.14'
39+
[stable]='3.16'
4040
)
4141

4242
# When we bump njs version in a stable release we don't move the tag in the
@@ -45,16 +45,15 @@ declare -A alpine=(
4545
# Remember to update pkgosschecksum when changing this.
4646
declare -A rev=(
4747
[mainline]='688'
48-
[stable]='689'
49-
#[stable]='500'
48+
[stable]='696'
5049
)
5150

5251
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5352
# revision/tag in the previous block
5453
# Used in alpine builds for architectures not packaged by nginx.org
5554
declare -A pkgosschecksum=(
5655
[mainline]='a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718'
57-
[stable]='b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116'
56+
[stable]='fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230'
5857
)
5958

6059
get_packages() {

0 commit comments

Comments
 (0)