Skip to content

Commit d4a47bc

Browse files
thresheekthresheek
committed
Moved stable to njs 0.7.5.
While at it, updated revisions and checksums for current tags.
1 parent 04226fe commit d4a47bc

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/688.tar.gz \
71-
&& PKGOSSCHECKSUM=\"a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718 *688.tar.gz\" \
72-
&& if [ \"\$(openssl sha512 -r 688.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
70+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
71+
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
72+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.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 688.tar.gz \
79-
&& cd pkg-oss-688 \
78+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
79+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
8080
&& cd alpine \
8181
&& make all \
8282
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/688.tar.gz \
70-
&& PKGOSSCHECKSUM=\"a8ab6ff80ab67c6c9567a9103b52a42a5962e9c1bc7091b7710aaf553a3b484af61b0797dd9b048c518e371a6f69e34d474cfaaeaa116fd2824bffa1cd9d4718 *688.tar.gz\" \
71-
&& if [ \"\$(openssl sha512 -r 688.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
69+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70+
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
71+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.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 688.tar.gz \
78-
&& cd pkg-oss-688 \
77+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
78+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7979
&& cd alpine \
8080
&& make all \
8181
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-perl/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM alpine:3.16
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.4
11+
ENV NJS_VERSION 0.7.5
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -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/696.tar.gz \
71-
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
72-
&& if [ \"\$(openssl sha512 -r 696.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
70+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
71+
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
72+
&& if [ \"\$(openssl sha512 -r 714.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 696.tar.gz \
79-
&& cd pkg-oss-696 \
78+
&& tar xzvf 714.tar.gz \
79+
&& cd pkg-oss-714 \
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM alpine:3.16
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.4
11+
ENV NJS_VERSION 0.7.5
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \
@@ -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/696.tar.gz \
70-
&& PKGOSSCHECKSUM=\"fabf394af60d935d7c3f5e36db65dddcced9595fd06d3dfdfabbb77aaea88a5b772ef9c1521531673bdbb2876390cdea3b81c51030d36ab76cf5bfc0bfe79230 *696.tar.gz\" \
71-
&& if [ \"\$(openssl sha512 -r 696.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
69+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
70+
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
71+
&& if [ \"\$(openssl sha512 -r 714.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 696.tar.gz \
78-
&& cd pkg-oss-696 \
77+
&& tar xzvf 714.tar.gz \
78+
&& cd pkg-oss-714 \
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.4
11+
ENV NJS_VERSION 0.7.5
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎stable/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.22.0
11-
ENV NJS_VERSION 0.7.4
11+
ENV NJS_VERSION 0.7.5
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎update.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ declare -A nginx=(
1919
# Current njs versions
2020
declare -A njs=(
2121
[mainline]='0.7.5'
22-
[stable]='0.7.4'
22+
[stable]='0.7.5'
2323
)
2424

2525
# Current package patchlevel version
@@ -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)