From 49b1a944f2b3573370906f7e9177725f1f4b32d4 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 21 Apr 2026 12:11:40 -0400 Subject: [PATCH 1/3] feat: Node.js Alpine arm64 Unofficial Builds --- 22/alpine3.22/Dockerfile | 2 +- 22/alpine3.23/Dockerfile | 2 +- 24/alpine3.22/Dockerfile | 2 +- 24/alpine3.23/Dockerfile | 2 +- 25/alpine3.22/Dockerfile | 2 +- 25/alpine3.23/Dockerfile | 2 +- 26/alpine3.22/Dockerfile | 2 +- 26/alpine3.23/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- update.sh | 12 +++++++----- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/22/alpine3.22/Dockerfile b/22/alpine3.22/Dockerfile index 0316ad0fd8..b58bb462eb 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 3fc4635148..804ad01b11 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 7c9cfb546b..97cfb36402 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 1d98f46d67..bf0746a3b9 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 e5bf11c3a2..fdc39628c7 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 94090e501b..4ab347a54e 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/26/alpine3.22/Dockerfile b/26/alpine3.22/Dockerfile index a17ec8f71f..18d435266b 100644 --- a/26/alpine3.22/Dockerfile +++ b/26/alpine3.22/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="e89b5c628c7058673c6c3b363f8d2219e211cd37dd4cb9204b4208110d7bbe78" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="b8504211d22d83f35764536482a782930ab09c2a1dddda6229bfa9057b103371" OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ s390x) OPENSSL_ARCH=linux-s390x;; \ diff --git a/26/alpine3.23/Dockerfile b/26/alpine3.23/Dockerfile index 509eb0c39e..ddb3c666c4 100644 --- a/26/alpine3.23/Dockerfile +++ b/26/alpine3.23/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) ARCH='x64' CHECKSUM="e89b5c628c7058673c6c3b363f8d2219e211cd37dd4cb9204b4208110d7bbe78" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ + aarch64) ARCH='arm64' CHECKSUM="b8504211d22d83f35764536482a782930ab09c2a1dddda6229bfa9057b103371" 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 d4096cc086..a6c3ac00be 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 278ed8063f..4f4210ce5b 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" From 025098f29bce1889a7b15f4cc9fb4c766b528ee3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 8 May 2026 09:44:22 -0400 Subject: [PATCH 2/3] ci: Run on ARM runners in addition to x64 --- .github/workflows/build-test.yml | 2 +- genMatrix.js | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bc0e9cfd53..05a9cc4535 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -51,7 +51,7 @@ jobs: if: ${{ fromJson(needs.gen-matrix.outputs.matrix) }} needs: gen-matrix name: build - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} timeout-minutes: 60 strategy: fail-fast: false diff --git a/genMatrix.js b/genMatrix.js index dc76724328..286126c5bc 100644 --- a/genMatrix.js +++ b/genMatrix.js @@ -71,9 +71,23 @@ const generateBuildMatrix = (filesAdded, filesModified, filesRenamed) => { const entries = dockerfiles.map(getDockerfileMatrixEntry); + let includes = []; + + entries.forEach(entry => { + includes.push({ + version: entry.version, + 'variant': entry.variant, + os: 'ubuntu-24.04' + }); + includes.push({ + version: entry.version, + 'variant': entry.variant, + os: 'ubuntu-24.04-arm' + }); + }); // Return null if there are no entries so we can skip the matrix step - return entries.length - ? { include: entries } + return includes.length + ? { include: includes } : null; }; From d9f1a8c418fa9f749772575326d3cffb3429585b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 8 May 2026 09:45:12 -0400 Subject: [PATCH 3/3] chore: remove i386 conditions --- 22/bookworm-slim/Dockerfile | 1 - 22/bookworm/Dockerfile | 1 - 22/bullseye-slim/Dockerfile | 1 - 22/bullseye/Dockerfile | 1 - 22/trixie-slim/Dockerfile | 1 - 22/trixie/Dockerfile | 1 - 24/bookworm-slim/Dockerfile | 1 - 24/bookworm/Dockerfile | 1 - 24/bullseye-slim/Dockerfile | 1 - 24/bullseye/Dockerfile | 1 - 24/trixie-slim/Dockerfile | 1 - 24/trixie/Dockerfile | 1 - 25/bookworm-slim/Dockerfile | 1 - 25/bookworm/Dockerfile | 1 - 25/bullseye-slim/Dockerfile | 1 - 25/bullseye/Dockerfile | 1 - 25/trixie-slim/Dockerfile | 1 - 25/trixie/Dockerfile | 1 - 26/bookworm-slim/Dockerfile | 1 - 26/bookworm/Dockerfile | 1 - 26/bullseye-slim/Dockerfile | 1 - 26/bullseye/Dockerfile | 1 - 26/trixie-slim/Dockerfile | 1 - 26/trixie/Dockerfile | 1 - 24 files changed, 24 deletions(-) diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index e173790d37..fcd5c08800 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 236b0e2d49..2ffdaa485d 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 489f7b559a..862dc22237 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/bullseye-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index e79027a708..1adf3cb471 100644 --- a/22/bullseye/Dockerfile +++ b/22/bullseye/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/22/trixie-slim/Dockerfile b/22/trixie-slim/Dockerfile index e5de6198b6..597ff2674d 100644 --- a/22/trixie-slim/Dockerfile +++ b/22/trixie-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/22/trixie/Dockerfile b/22/trixie/Dockerfile index 1c3c0be208..f0a985a583 100644 --- a/22/trixie/Dockerfile +++ b/22/trixie/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/24/bookworm-slim/Dockerfile b/24/bookworm-slim/Dockerfile index a4249a7c83..c76d7131a0 100644 --- a/24/bookworm-slim/Dockerfile +++ b/24/bookworm-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/24/bookworm/Dockerfile b/24/bookworm/Dockerfile index bad1123216..4aeaf4adb2 100644 --- a/24/bookworm/Dockerfile +++ b/24/bookworm/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/24/bullseye-slim/Dockerfile b/24/bullseye-slim/Dockerfile index 5716490dc5..d2c9877bfd 100644 --- a/24/bullseye-slim/Dockerfile +++ b/24/bullseye-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/24/bullseye/Dockerfile b/24/bullseye/Dockerfile index fe5fbfb706..7d407f70ec 100644 --- a/24/bullseye/Dockerfile +++ b/24/bullseye/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/24/trixie-slim/Dockerfile b/24/trixie-slim/Dockerfile index 328a5c365a..2e2b6876dc 100644 --- a/24/trixie-slim/Dockerfile +++ b/24/trixie-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/24/trixie/Dockerfile b/24/trixie/Dockerfile index c29001bd34..8c32d72495 100644 --- a/24/trixie/Dockerfile +++ b/24/trixie/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/25/bookworm-slim/Dockerfile b/25/bookworm-slim/Dockerfile index 7d3a85827f..826c3938ac 100644 --- a/25/bookworm-slim/Dockerfile +++ b/25/bookworm-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/25/bookworm/Dockerfile b/25/bookworm/Dockerfile index 6be31610c8..ef357fe313 100644 --- a/25/bookworm/Dockerfile +++ b/25/bookworm/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/25/bullseye-slim/Dockerfile b/25/bullseye-slim/Dockerfile index de714ee163..1a5157ef37 100644 --- a/25/bullseye-slim/Dockerfile +++ b/25/bullseye-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/25/bullseye/Dockerfile b/25/bullseye/Dockerfile index 4286794d31..e5005ad913 100644 --- a/25/bullseye/Dockerfile +++ b/25/bullseye/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/25/trixie-slim/Dockerfile b/25/trixie-slim/Dockerfile index 92ba49c7ee..853389cc22 100644 --- a/25/trixie-slim/Dockerfile +++ b/25/trixie-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/25/trixie/Dockerfile b/25/trixie/Dockerfile index 2225b57f8a..c1daa7728d 100644 --- a/25/trixie/Dockerfile +++ b/25/trixie/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/26/bookworm-slim/Dockerfile b/26/bookworm-slim/Dockerfile index 2269f11d7b..00a0ed8aec 100644 --- a/26/bookworm-slim/Dockerfile +++ b/26/bookworm-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/26/bookworm/Dockerfile b/26/bookworm/Dockerfile index ed8bb77d19..abe555f6a9 100644 --- a/26/bookworm/Dockerfile +++ b/26/bookworm/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/26/bullseye-slim/Dockerfile b/26/bullseye-slim/Dockerfile index e9728eef48..1b9f88d866 100644 --- a/26/bullseye-slim/Dockerfile +++ b/26/bullseye-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/26/bullseye/Dockerfile b/26/bullseye/Dockerfile index 4a8bed1d87..8d0d53e1e1 100644 --- a/26/bullseye/Dockerfile +++ b/26/bullseye/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/26/trixie-slim/Dockerfile b/26/trixie-slim/Dockerfile index 5f38c472b5..5b11663173 100644 --- a/26/trixie-slim/Dockerfile +++ b/26/trixie-slim/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ diff --git a/26/trixie/Dockerfile b/26/trixie/Dockerfile index 10e2522f43..0fe3b711fd 100644 --- a/26/trixie/Dockerfile +++ b/26/trixie/Dockerfile @@ -12,7 +12,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ s390x) ARCH='s390x';; \ arm64) ARCH='arm64';; \ armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150