Skip to content

Commit 9abe4ae

Browse files
thresheekthresheek
committed
Bump njs releases to hopefully fix builds on arm32v5
1 parent 3142ac3 commit 9abe4ae

File tree

11 files changed

+50
-50
lines changed

11 files changed

+50
-50
lines changed

‎mainline/alpine-otel/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ RUN set -x \
4949
&& su nobody -s /bin/sh -c " \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
52-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/93ac6e194ad0.tar.gz \
53-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
54-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
52+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
53+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
54+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \
5757
echo \"pkg-oss tarball checksum verification failed!\"; \
5858
exit 1; \
5959
fi \
60-
&& tar xzvf 93ac6e194ad0.tar.gz \
61-
&& cd pkg-oss-93ac6e194ad0 \
60+
&& tar xzvf 27357d6c5453.tar.gz \
61+
&& cd pkg-oss-27357d6c5453 \
6262
&& cd alpine \
6363
&& make module-otel \
6464
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-perl/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ RUN set -x \
4444
&& su nobody -s /bin/sh -c " \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
47-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/93ac6e194ad0.tar.gz \
48-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
49-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
47+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
48+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
49+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \
5252
echo \"pkg-oss tarball checksum verification failed!\"; \
5353
exit 1; \
5454
fi \
55-
&& tar xzvf 93ac6e194ad0.tar.gz \
56-
&& cd pkg-oss-93ac6e194ad0 \
55+
&& tar xzvf 27357d6c5453.tar.gz \
56+
&& cd pkg-oss-27357d6c5453 \
5757
&& cd alpine \
5858
&& make module-perl \
5959
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/93ac6e194ad0.tar.gz \
60-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
60+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf 93ac6e194ad0.tar.gz \
68-
&& cd pkg-oss-93ac6e194ad0 \
67+
&& tar xzvf 27357d6c5453.tar.gz \
68+
&& cd pkg-oss-27357d6c5453 \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
FROM nginx:1.25.5-alpine-slim
77

88
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 2
9+
ENV NJS_RELEASE 3
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
@@ -49,16 +49,16 @@ RUN set -x \
4949
&& su nobody -s /bin/sh -c " \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
52-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/93ac6e194ad0.tar.gz \
53-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
54-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
52+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
53+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
54+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \
5757
echo \"pkg-oss tarball checksum verification failed!\"; \
5858
exit 1; \
5959
fi \
60-
&& tar xzvf 93ac6e194ad0.tar.gz \
61-
&& cd pkg-oss-93ac6e194ad0 \
60+
&& tar xzvf 27357d6c5453.tar.gz \
61+
&& cd pkg-oss-27357d6c5453 \
6262
&& cd alpine \
6363
&& make module-geoip module-image-filter module-njs module-xslt \
6464
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
99

1010
ENV NGINX_VERSION 1.25.5
1111
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 2~bookworm
12+
ENV NJS_RELEASE 3~bookworm
1313
ENV PKG_RELEASE 1~bookworm
1414

1515
RUN set -x \

‎stable/alpine-otel/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ RUN set -x \
4949
&& su nobody -s /bin/sh -c " \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
52-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
53-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
52+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
53+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
54+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \
5757
echo \"pkg-oss tarball checksum verification failed!\"; \
5858
exit 1; \
5959
fi \
60-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
61-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
60+
&& tar xzvf 73d6839714a2.tar.gz \
61+
&& cd pkg-oss-73d6839714a2 \
6262
&& cd alpine \
6363
&& make module-otel \
6464
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-perl/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ RUN set -x \
4444
&& su nobody -s /bin/sh -c " \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
47-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
48-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
47+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
48+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
49+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \
5252
echo \"pkg-oss tarball checksum verification failed!\"; \
5353
exit 1; \
5454
fi \
55-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
56-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
55+
&& tar xzvf 73d6839714a2.tar.gz \
56+
&& cd pkg-oss-73d6839714a2 \
5757
&& cd alpine \
5858
&& make module-perl \
5959
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
60+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
67+
&& tar xzvf 73d6839714a2.tar.gz \
68+
&& cd pkg-oss-73d6839714a2 \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
FROM nginx:1.26.0-alpine-slim
77

88
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 1
9+
ENV NJS_RELEASE 2
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
@@ -49,16 +49,16 @@ RUN set -x \
4949
&& su nobody -s /bin/sh -c " \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
52-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
53-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
52+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
53+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
54+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \
5757
echo \"pkg-oss tarball checksum verification failed!\"; \
5858
exit 1; \
5959
fi \
60-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
61-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
60+
&& tar xzvf 73d6839714a2.tar.gz \
61+
&& cd pkg-oss-73d6839714a2 \
6262
&& cd alpine \
6363
&& make module-geoip module-image-filter module-njs module-xslt \
6464
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
99

1010
ENV NGINX_VERSION 1.26.0
1111
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 1~bookworm
12+
ENV NJS_RELEASE 2~bookworm
1313
ENV PKG_RELEASE 1~bookworm
1414

1515
RUN set -x \

‎update.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ declare -A njs=(
2525
# Current njs patchlevel version
2626
# Remember to update pkgosschecksum when changing this.
2727
declare -A njspkg=(
28-
[mainline]='2'
29-
[stable]='1'
28+
[mainline]='3'
29+
[stable]='2'
3030
)
3131

3232
# Current otel versions
@@ -57,16 +57,16 @@ declare -A alpine=(
5757
# when building alpine packages on architectures not supported by nginx.org
5858
# Remember to update pkgosschecksum when changing this.
5959
declare -A rev=(
60-
[mainline]='93ac6e194ad0'
61-
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
60+
[mainline]='27357d6c5453'
61+
[stable]='73d6839714a2'
6262
)
6363

6464
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
6565
# revision/tag in the previous block
6666
# Used in alpine builds for architectures not packaged by nginx.org
6767
declare -A pkgosschecksum=(
68-
[mainline]='d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0'
69-
[stable]='f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb'
68+
[mainline]='a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0'
69+
[stable]='95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db'
7070
)
7171

7272
get_packages() {

0 commit comments

Comments
 (0)