Skip to content

Commit b18fb32

Browse files
committed
Updated Dockerfiles.
1 parent 40923d1 commit b18fb32

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

stable/alpine-perl/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.14
6+
FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.20.2
11-
ENV NJS_VERSION 0.7.3
10+
ENV NGINX_VERSION 1.22.0
11+
ENV NJS_VERSION 0.7.4
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -53,7 +53,7 @@ RUN set -x \
5353
libc-dev \
5454
make \
5555
openssl-dev \
56-
pcre-dev \
56+
pcre2-dev \
5757
zlib-dev \
5858
linux-headers \
5959
libxslt-dev \
@@ -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/689.tar.gz \
71-
&& PKGOSSCHECKSUM=\"b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116 *689.tar.gz\" \
72-
&& if [ \"\$(openssl sha512 -r 689.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
70+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/696.tar.gz \
71+
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
72+
&& if [ \"\$(openssl sha512 -r 696.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 689.tar.gz \
79-
&& cd pkg-oss-689 \
78+
&& tar xzvf 696.tar.gz \
79+
&& cd pkg-oss-696 \
8080
&& cd alpine \
8181
&& make all \
8282
&& 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,12 +3,12 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.14
6+
FROM alpine:3.16
77

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

10-
ENV NGINX_VERSION 1.20.2
11-
ENV NJS_VERSION 0.7.3
10+
ENV NGINX_VERSION 1.22.0
11+
ENV NJS_VERSION 0.7.4
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -52,7 +52,7 @@ RUN set -x \
5252
libc-dev \
5353
make \
5454
openssl-dev \
55-
pcre-dev \
55+
pcre2-dev \
5656
zlib-dev \
5757
linux-headers \
5858
libxslt-dev \
@@ -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/689.tar.gz \
70-
&& PKGOSSCHECKSUM=\"b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116 *689.tar.gz\" \
71-
&& if [ \"\$(openssl sha512 -r 689.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
69+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/696.tar.gz \
70+
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
71+
&& if [ \"\$(openssl sha512 -r 696.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 689.tar.gz \
78-
&& cd pkg-oss-689 \
77+
&& tar xzvf 696.tar.gz \
78+
&& cd pkg-oss-696 \
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

Lines changed: 2 additions & 2 deletions
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.20.2
11-
ENV NJS_VERSION 0.7.3
10+
ENV NGINX_VERSION 1.22.0
11+
ENV NJS_VERSION 0.7.4
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

stable/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
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.20.2
11-
ENV NJS_VERSION 0.7.3
10+
ENV NGINX_VERSION 1.22.0
11+
ENV NJS_VERSION 0.7.4
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

0 commit comments

Comments
 (0)