diff --git a/20/alpine3.22/Dockerfile b/20/alpine3.22/Dockerfile index 62a5ff07c..e20dc3dfe 100644 --- a/20/alpine3.22/Dockerfile +++ b/20/alpine3.22/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="2b51a5388f6aaf8e2af65fe3bad6114db0ebd81a1ae1250b1de0cbf034b10c5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="02d7c51f40f165e248c80d01fd26a80ab9dc726737d971edc94a65dc1c74d613" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/20/alpine3.23/Dockerfile b/20/alpine3.23/Dockerfile index 87e893c77..b9281312e 100644 --- a/20/alpine3.23/Dockerfile +++ b/20/alpine3.23/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="2b51a5388f6aaf8e2af65fe3bad6114db0ebd81a1ae1250b1de0cbf034b10c5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="02d7c51f40f165e248c80d01fd26a80ab9dc726737d971edc94a65dc1c74d613" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/22/alpine3.22/Dockerfile b/22/alpine3.22/Dockerfile index 0316ad0fd..b58bb462e 100644 --- a/22/alpine3.22/Dockerfile +++ b/22/alpine3.22/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="c58109c8da448196f0d811df7a6079748678132067e3b53d01c8c8a4bcd86992" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="a099f666cd95c80b838cd7eb4ee2ca1dcd24bfa66cbc0b3c17ebb505d5925438" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/22/alpine3.23/Dockerfile b/22/alpine3.23/Dockerfile index 3fc463514..804ad01b1 100644 --- a/22/alpine3.23/Dockerfile +++ b/22/alpine3.23/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="c58109c8da448196f0d811df7a6079748678132067e3b53d01c8c8a4bcd86992" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="a099f666cd95c80b838cd7eb4ee2ca1dcd24bfa66cbc0b3c17ebb505d5925438" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/24/alpine3.22/Dockerfile b/24/alpine3.22/Dockerfile index 7c9cfb546..97cfb3640 100644 --- a/24/alpine3.22/Dockerfile +++ b/24/alpine3.22/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="8b75070ed35ef8381548f4396d3cf957fd1449db063f288fe00b0cb64456477f" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="e57d7ce7bf7ef95209332b0f6786fe76b662984667841b526911068021793eef" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/24/alpine3.23/Dockerfile b/24/alpine3.23/Dockerfile index 1d98f46d6..bf0746a3b 100644 --- a/24/alpine3.23/Dockerfile +++ b/24/alpine3.23/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="8b75070ed35ef8381548f4396d3cf957fd1449db063f288fe00b0cb64456477f" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="e57d7ce7bf7ef95209332b0f6786fe76b662984667841b526911068021793eef" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/25/alpine3.22/Dockerfile b/25/alpine3.22/Dockerfile index e5bf11c3a..fdc39628c 100644 --- a/25/alpine3.22/Dockerfile +++ b/25/alpine3.22/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="46dfaea08624f9cb9d439d603784b2751ab4d7700c81c26604c032a4dc4e74a1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="12e66efe36cf4e37564eca51a93949c0dab629c349af89d56beb53e2060151d8" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/25/alpine3.23/Dockerfile b/25/alpine3.23/Dockerfile index 94090e501..4ab347a54 100644 --- a/25/alpine3.23/Dockerfile +++ b/25/alpine3.23/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="46dfaea08624f9cb9d439d603784b2751ab4d7700c81c26604c032a4dc4e74a1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="12e66efe36cf4e37564eca51a93949c0dab629c349af89d56beb53e2060151d8" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d4096cc08..a6c3ac00b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM=CHECKSUM_arm64 OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/update.sh b/update.sh index 278ed8063..4f4210ce5 100755 --- a/update.sh +++ b/update.sh @@ -141,10 +141,11 @@ function update_node_version() { if is_alpine "${variant}"; then alpine_version="${variant#*alpine}" - checksum=$( - curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 - ) - if [ -z "$checksum" ]; then + SHASUMS256=$(curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt") + CHECKSUM_x64=$(echo "$SHASUMS256" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1) + CHECKSUM_arm64=$(echo "$SHASUMS256" | grep "node-v${nodeVersion}-linux-arm64-musl.tar.xz" | cut -d' ' -f1) + + if [ -z "$CHECKSUM_x64" ] || [ -z "$CHECKSUM_arm64" ]; then rm -f "${dockerfile}-tmp" if [ "${SKIP_ALPINE}" = true ]; then echo "${nodeVersion} is missing the musl build for ${variant}, but skipping for security release!" @@ -153,7 +154,8 @@ function update_node_version() { fi else sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" - sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp" + sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${CHECKSUM_x64}\"/" "${dockerfile}-tmp" + sed -Ei -e "s/CHECKSUM=CHECKSUM_arm64/CHECKSUM=\"${CHECKSUM_arm64}\"/" "${dockerfile}-tmp" fi elif is_debian "${variant}"; then sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"