Skip to content

Commit 17ba3ab

Browse files
alessfgalessfg
authored
Add riscv64 support on Alpine Linux (#268)
* And update njs to 0.8.8
1 parent 7095a65 commit 17ba3ab

File tree

13 files changed

+54
-54
lines changed

13 files changed

+54
-54
lines changed

‎.github/workflows/alpine-mainline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
id: build
111111
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
112112
with:
113-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
113+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
114114
context: "{{ defaultContext }}:mainline/alpine-slim"
115115
labels: ${{ steps.meta.outputs.labels }}
116116
annotations: ${{ steps.meta.outputs.annotations }}
@@ -228,7 +228,7 @@ jobs:
228228
id: build
229229
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
230230
with:
231-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
231+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
232232
context: "{{ defaultContext }}:mainline/alpine"
233233
labels: ${{ steps.meta.outputs.labels }}
234234
annotations: ${{ steps.meta.outputs.annotations }}
@@ -346,7 +346,7 @@ jobs:
346346
id: build
347347
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
348348
with:
349-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
349+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
350350
context: "{{ defaultContext }}:mainline/alpine-perl"
351351
labels: ${{ steps.meta.outputs.labels }}
352352
annotations: ${{ steps.meta.outputs.annotations }}

‎.github/workflows/alpine-stable.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
id: build
107107
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
108108
with:
109-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
109+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
110110
context: "{{ defaultContext }}:stable/alpine-slim"
111111
labels: ${{ steps.meta.outputs.labels }}
112112
annotations: ${{ steps.meta.outputs.annotations }}
@@ -216,7 +216,7 @@ jobs:
216216
id: build
217217
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
218218
with:
219-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
219+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
220220
context: "{{ defaultContext }}:stable/alpine"
221221
labels: ${{ steps.meta.outputs.labels }}
222222
annotations: ${{ steps.meta.outputs.annotations }}
@@ -326,7 +326,7 @@ jobs:
326326
id: build
327327
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
328328
with:
329-
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
329+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
330330
context: "{{ defaultContext }}:stable/alpine-perl"
331331
labels: ${{ steps.meta.outputs.labels }}
332332
annotations: ${{ steps.meta.outputs.annotations }}

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ RUN set -x \
5151
&& su nobody -s /bin/sh -c " \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
54-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"5617feecfb441cd972b9ac51a2fd78384a3d2bde2f399163be0746d44ec8f7d8c47234af4f6b0012667c3d0446cced521f55f8f71254415e3766c2e3802bf960 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
56-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
54+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
55+
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
56+
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \
5959
echo \"pkg-oss tarball checksum verification failed!\"; \
6060
exit 1; \
6161
fi \
62-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
63-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
62+
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
63+
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
6464
&& cd alpine \
6565
&& make module-perl \
6666
&& apk index --allow-untrusted -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
@@ -62,16 +62,16 @@ RUN set -x \
6262
&& su nobody -s /bin/sh -c " \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
65-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"5617feecfb441cd972b9ac51a2fd78384a3d2bde2f399163be0746d44ec8f7d8c47234af4f6b0012667c3d0446cced521f55f8f71254415e3766c2e3802bf960 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
67-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
65+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
66+
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
67+
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \
7070
echo \"pkg-oss tarball checksum verification failed!\"; \
7171
exit 1; \
7272
fi \
73-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
73+
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
74+
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
7575
&& cd alpine \
7676
&& make base \
7777
&& apk index --allow-untrusted -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
@@ -6,7 +6,7 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.3-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.8.7
9+
ENV NJS_VERSION=0.8.8
1010
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"5617feecfb441cd972b9ac51a2fd78384a3d2bde2f399163be0746d44ec8f7d8c47234af4f6b0012667c3d0446cced521f55f8f71254415e3766c2e3802bf960 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
60+
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.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 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
68+
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
6969
&& cd alpine \
7070
&& make module-geoip module-image-filter module-njs module-xslt \
7171
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-perl/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ RUN set -x; \
5151
xsltproc \
5252
&& ( \
5353
cd "$tempDir" \
54-
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
54+
&& REVISION="0286c5190d972a49bffc9bf247885dd510ce8181" \
5555
&& REVISION=${REVISION%~*} \
5656
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
57-
&& PKGOSSCHECKSUM="5617feecfb441cd972b9ac51a2fd78384a3d2bde2f399163be0746d44ec8f7d8c47234af4f6b0012667c3d0446cced521f55f8f71254415e3766c2e3802bf960 *${REVISION}.tar.gz" \
57+
&& PKGOSSCHECKSUM="1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *${REVISION}.tar.gz" \
5858
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5959
echo "pkg-oss tarball checksum verification succeeded!"; \
6060
else \

‎mainline/debian/Dockerfile‎

Lines changed: 3 additions & 3 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.27.3
12-
ENV NJS_VERSION=0.8.7
12+
ENV NJS_VERSION=0.8.8
1313
ENV NJS_RELEASE=1~bookworm
1414
ENV PKG_RELEASE=1~bookworm
1515
ENV DYNPKG_RELEASE=1~bookworm
@@ -78,10 +78,10 @@ RUN set -x \
7878
xsltproc \
7979
&& ( \
8080
cd "$tempDir" \
81-
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
81+
&& REVISION="0286c5190d972a49bffc9bf247885dd510ce8181" \
8282
&& REVISION=${REVISION%~*} \
8383
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
84-
&& PKGOSSCHECKSUM="5617feecfb441cd972b9ac51a2fd78384a3d2bde2f399163be0746d44ec8f7d8c47234af4f6b0012667c3d0446cced521f55f8f71254415e3766c2e3802bf960 *${REVISION}.tar.gz" \
84+
&& PKGOSSCHECKSUM="1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
else \

‎stable/alpine-perl/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ RUN set -x \
5151
&& su nobody -s /bin/sh -c " \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
54-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
56-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
54+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
55+
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
56+
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \
5959
echo \"pkg-oss tarball checksum verification failed!\"; \
6060
exit 1; \
6161
fi \
62-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
63-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
62+
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
63+
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
6464
&& cd alpine \
6565
&& make module-perl \
6666
&& apk index --allow-untrusted -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
@@ -62,16 +62,16 @@ RUN set -x \
6262
&& su nobody -s /bin/sh -c " \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
65-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
67-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
65+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
66+
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
67+
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \
7070
echo \"pkg-oss tarball checksum verification failed!\"; \
7171
exit 1; \
7272
fi \
73-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
74-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
73+
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
74+
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
7575
&& cd alpine \
7676
&& make base \
7777
&& apk index --allow-untrusted -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
@@ -6,7 +6,7 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.2-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.8.5
9+
ENV NJS_VERSION=0.8.8
1010
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
60+
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.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 f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
68+
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
6969
&& cd alpine \
7070
&& make module-geoip module-image-filter module-njs module-xslt \
7171
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

0 commit comments

Comments
 (0)