Skip to content

Commit 85f846c

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.23.2
* Update stable NGINX to 1.22.1 * Update NJS to 0.7.7
1 parent e833c67 commit 85f846c

File tree

11 files changed

+43
-43
lines changed

11 files changed

+43
-43
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.23.1
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.23.2
12+
ENV NJS_VERSION 0.7.7
1313
ENV PKG_RELEASE 1
1414

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

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM alpine:3.16
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.23.1
11+
ENV NGINX_VERSION 1.23.2
1212
ENV PKG_RELEASE 1
1313

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

‎mainline/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.23.1
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.23.2
12+
ENV NJS_VERSION 0.7.7
1313
ENV PKG_RELEASE 1
1414

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

‎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 <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.23.1
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.23.2
12+
ENV NJS_VERSION 0.7.7
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 <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.23.1
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.23.2
12+
ENV NJS_VERSION 0.7.7
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎stable/alpine-perl/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.22.1
12+
ENV NJS_VERSION 0.7.7
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/725.tar.gz \
75-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
74+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
75+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
83-
&& cd pkg-oss-725 \
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 \

‎stable/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM alpine:3.16
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.22.0
11+
ENV NGINX_VERSION 1.22.1
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \
64-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 725.tar.gz \
72-
&& cd pkg-oss-725 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.22.1
12+
ENV NJS_VERSION 0.7.7
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/725.tar.gz \
74-
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
73+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74+
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
82-
&& cd pkg-oss-725 \
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 \

‎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 <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.22.1
12+
ENV NJS_VERSION 0.7.7
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 <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.22.0
12-
ENV NJS_VERSION 0.7.6
11+
ENV NGINX_VERSION 1.22.1
12+
ENV NJS_VERSION 0.7.7
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

0 commit comments

Comments
 (0)