Skip to content

Commit 7a694ae

Browse files
alessfgalessfg
committed
Update NJS to 0.7.3
1 parent 87af0a3 commit 7a694ae

File tree

10 files changed

+35
-35
lines changed

10 files changed

+35
-35
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This Dockerfile creates an NGINX Docker image that runs NGINX as a non root, unprivileged user. Notable differences with respect to the official NGINX Docker image include:
44

5-
* The default NGINX listen port is now `8080` instead of `80`.
5+
* The default NGINX listen port is now `8080` instead of `80` (this is no longer necessary as of Docker `20.03` but it's still required in other container runtimes).
66
* The default NGINX user directive in `/etc/nginx/nginx.conf` has been removed.
77
* The default NGINX PID has been moved from `/var/run/nginx.pid` to `/tmp/nginx.pid`.
88
* Change `*_temp_path` variables to `/tmp/*`.

‎mainline/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.21.6
12-
ENV NJS_VERSION 0.7.2
12+
ENV NJS_VERSION 0.7.3
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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
75-
&& PKGOSSCHECKSUM=\"29ec1c635da36b7727953544e1a20e9d75bd9d2050e063b9f81f88ca07bb7ea0b65cef46d0f3cb7134b38ce9b94ecada631619f233231845a3d8a16b6ad0db82 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
83-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
82+
&& tar xzvf 688.tar.gz \
83+
&& cd pkg-oss-688 \
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: 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.21.6
12-
ENV NJS_VERSION 0.7.2
12+
ENV NJS_VERSION 0.7.3
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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74-
&& PKGOSSCHECKSUM=\"29ec1c635da36b7727953544e1a20e9d75bd9d2050e063b9f81f88ca07bb7ea0b65cef46d0f3cb7134b38ce9b94ecada631619f233231845a3d8a16b6ad0db82 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
82-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
81+
&& tar xzvf 688.tar.gz \
82+
&& cd pkg-oss-688 \
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: 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.21.6
12-
ENV NJS_VERSION 0.7.2
12+
ENV NJS_VERSION 0.7.3
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎mainline/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.21.6
12-
ENV NJS_VERSION 0.7.2
12+
ENV NJS_VERSION 0.7.3
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.20.2
12-
ENV NJS_VERSION 0.7.0
12+
ENV NJS_VERSION 0.7.3
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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
75-
&& PKGOSSCHECKSUM=\"af6e7eb25594dffe2903358f7a2c5c956f5b67b8df3f4e8237c30b63e50ce28e6eada3ed453687409beef8f3afa8f551cb20df2f06bd5e235eb66df212ece2ed *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
76-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
83-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
82+
&& tar xzvf 689.tar.gz \
83+
&& cd pkg-oss-689 \
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.20.2
12-
ENV NJS_VERSION 0.7.0
12+
ENV NJS_VERSION 0.7.3
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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74-
&& PKGOSSCHECKSUM=\"af6e7eb25594dffe2903358f7a2c5c956f5b67b8df3f4e8237c30b63e50ce28e6eada3ed453687409beef8f3afa8f551cb20df2f06bd5e235eb66df212ece2ed *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
75-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
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 \
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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
82-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
81+
&& tar xzvf 689.tar.gz \
82+
&& cd pkg-oss-689 \
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.20.2
12-
ENV NJS_VERSION 0.7.0
12+
ENV NJS_VERSION 0.7.3
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.20.2
12-
ENV NJS_VERSION 0.7.0
12+
ENV NJS_VERSION 0.7.3
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ declare -A nginx=(
1818

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

2525
# Current package patchlevel version
@@ -44,17 +44,17 @@ 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]='${NGINX_VERSION}-${PKG_RELEASE}'
48-
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
47+
[mainline]='688'
48+
[stable]='689'
4949
#[stable]='500'
5050
)
5151

5252
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5353
# revision/tag in the previous block
5454
# Used in alpine builds for architectures not packaged by nginx.org
5555
declare -A pkgosschecksum=(
56-
[mainline]='29ec1c635da36b7727953544e1a20e9d75bd9d2050e063b9f81f88ca07bb7ea0b65cef46d0f3cb7134b38ce9b94ecada631619f233231845a3d8a16b6ad0db82'
57-
[stable]='af6e7eb25594dffe2903358f7a2c5c956f5b67b8df3f4e8237c30b63e50ce28e6eada3ed453687409beef8f3afa8f551cb20df2f06bd5e235eb66df212ece2ed'
56+
[mainline]='a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718'
57+
[stable]='b3cb5de3d22b4db2ab478e60469638e1935cb91c20405e33bdbf7303766278cf864bace62f95ef40f4fe39e92731f53ce1c4a18192ec7f7820f4083cd9384116'
5858
)
5959

6060
get_packages() {

0 commit comments

Comments
 (0)