Skip to content

Commit d47e080

Browse files
alessfgalessfg
committed
Fix njs arm32v5 build
1 parent 5a776b6 commit d47e080

File tree

11 files changed

+44
-48
lines changed

11 files changed

+44
-48
lines changed

‎.github/workflows/debian-mainline.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ jobs:
110110
id: build
111111
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
112112
with:
113-
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114-
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
113+
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
115114
context: "{{ defaultContext }}:mainline/debian"
116115
labels: ${{ steps.meta.outputs.labels }}
117116
annotations: ${{ steps.meta.outputs.annotations }}
@@ -229,8 +228,7 @@ jobs:
229228
id: build
230229
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
231230
with:
232-
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
233-
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
231+
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
234232
context: "{{ defaultContext }}:mainline/debian-perl"
235233
labels: ${{ steps.meta.outputs.labels }}
236234
annotations: ${{ steps.meta.outputs.annotations }}

‎.github/workflows/debian-stable.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ jobs:
106106
id: build
107107
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
108108
with:
109-
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
110-
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
109+
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
111110
context: "{{ defaultContext }}:stable/debian"
112111
labels: ${{ steps.meta.outputs.labels }}
113112
annotations: ${{ steps.meta.outputs.annotations }}
@@ -217,8 +216,7 @@ jobs:
217216
id: build
218217
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
219218
with:
220-
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
221-
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
219+
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
222220
context: "{{ defaultContext }}:stable/debian-perl"
223221
labels: ${{ steps.meta.outputs.labels }}
224222
annotations: ${{ steps.meta.outputs.annotations }}

‎mainline/alpine-perl/Dockerfile

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

‎mainline/alpine-slim/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/93ac6e194ad0.tar.gz \
64-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
64+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.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 93ac6e194ad0.tar.gz \
72-
&& cd pkg-oss-93ac6e194ad0 \
71+
&& tar xzvf 27357d6c5453.tar.gz \
72+
&& cd pkg-oss-27357d6c5453 \
7373
&& cd alpine \
7474
&& make base \
7575
&& 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
@@ -7,7 +7,7 @@ ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5-alpine-slim
77
FROM $IMAGE
88

99
ENV NJS_VERSION 0.8.4
10-
ENV NJS_RELEASE 2
10+
ENV NJS_RELEASE 3
1111

1212
ARG UID=101
1313
ARG GID=101
@@ -55,16 +55,16 @@ RUN set -x \
5555
&& su nobody -s /bin/sh -c " \
5656
export HOME=${tempDir} \
5757
&& cd ${tempDir} \
58-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/93ac6e194ad0.tar.gz \
59-
&& PKGOSSCHECKSUM=\"d56d10fbc6a1774e0a000b4322c5f847f8dfdcc3035b21cfd2a4a417ecce46939f39ff39ab865689b60cf6486c3da132aa5a88fa56edaad13d90715affe2daf0 *93ac6e194ad0.tar.gz\" \
60-
&& if [ \"\$(openssl sha512 -r 93ac6e194ad0.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
58+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
59+
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
60+
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6161
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6262
else \
6363
echo \"pkg-oss tarball checksum verification failed!\"; \
6464
exit 1; \
6565
fi \
66-
&& tar xzvf 93ac6e194ad0.tar.gz \
67-
&& cd pkg-oss-93ac6e194ad0 \
66+
&& tar xzvf 27357d6c5453.tar.gz \
67+
&& cd pkg-oss-27357d6c5453 \
6868
&& cd alpine \
6969
&& make module-geoip module-image-filter module-njs module-xslt \
7070
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.25.5
1212
ENV NJS_VERSION 0.8.4
13-
ENV NJS_RELEASE 2~bookworm
13+
ENV NJS_RELEASE 3~bookworm
1414
ENV PKG_RELEASE 1~bookworm
1515

1616
ARG UID=101

‎stable/alpine-perl/Dockerfile

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

‎stable/alpine-slim/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
64+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
71+
&& tar xzvf 73d6839714a2.tar.gz \
72+
&& cd pkg-oss-73d6839714a2 \
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG IMAGE=nginxinc/nginx-unprivileged:1.26.0-alpine-slim
77
FROM $IMAGE
88

99
ENV NJS_VERSION 0.8.4
10-
ENV NJS_RELEASE 1
10+
ENV NJS_RELEASE 2
1111

1212
ARG UID=101
1313
ARG GID=101
@@ -55,16 +55,16 @@ RUN set -x \
5555
&& su nobody -s /bin/sh -c " \
5656
export HOME=${tempDir} \
5757
&& cd ${tempDir} \
58-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
59-
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
58+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
59+
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
60+
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6161
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6262
else \
6363
echo \"pkg-oss tarball checksum verification failed!\"; \
6464
exit 1; \
6565
fi \
66-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
67-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
66+
&& tar xzvf 73d6839714a2.tar.gz \
67+
&& cd pkg-oss-73d6839714a2 \
6868
&& cd alpine \
6969
&& make module-geoip module-image-filter module-njs module-xslt \
7070
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.26.0
1212
ENV NJS_VERSION 0.8.4
13-
ENV NJS_RELEASE 1~bookworm
13+
ENV NJS_RELEASE 2~bookworm
1414
ENV PKG_RELEASE 1~bookworm
1515

1616
ARG UID=101

‎update.sh

Lines changed: 6 additions & 6 deletions
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 package patchlevel version
@@ -51,16 +51,16 @@ declare -A alpine=(
5151
# when building alpine packages on architectures not supported by nginx.org
5252
# Remember to update pkgosschecksum when changing this.
5353
declare -A rev=(
54-
[mainline]='93ac6e194ad0'
55-
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
54+
[mainline]='27357d6c5453'
55+
[stable]='73d6839714a2'
5656
)
5757

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

6666
get_packages() {

0 commit comments

Comments
 (0)