From 114ae927cf44bedd10f8458a3d1ad4f17feffde4 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 8 May 2026 18:29:35 -0400
Subject: [PATCH 01/10] wip: no-op replacement of condition

---
 Dockerfile-alpine.template | 8 +-------
 update.sh                  | 8 ++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 7ccaab1a1..94be2c144 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -10,13 +10,7 @@ RUN addgroup -g 1000 node \
         curl \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && 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;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
-        s390x) OPENSSL_ARCH=linux-s390x;; \
-        *) ;; \
+        "${ALPINE_ARCH[@]}"
       esac \
   && if [ -n "${CHECKSUM}" ]; then \
     set -eu; \
diff --git a/update.sh b/update.sh
index fe25202ab..3e0dad5d3 100755
--- a/update.sh
+++ b/update.sh
@@ -153,6 +153,14 @@ function update_node_version() {
         fi
       else
         sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp"
+        alpine_arch='x86_64) ARCH='"'"'x64'"'"' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \\\
+        x86) OPENSSL_ARCH=linux-elf;; \\\
+        aarch64) OPENSSL_ARCH=linux-aarch64;; \\\
+        arm*) OPENSSL_ARCH=linux-armv4;; \\\
+        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\
+        s390x) OPENSSL_ARCH=linux-s390x;; \\\
+        *) ;; \\'
+        sed -Ei -e "s/\"\\$\{ALPINE_ARCH\[@\]\}\"/${alpine_arch}/" "${dockerfile}-tmp"
         sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp"
       fi
     elif is_debian "${variant}"; then

From 4a0360bc4c19647d1e180d6b6c2e650ea9a0bd08 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sat, 9 May 2026 12:13:31 -0400
Subject: [PATCH 02/10] wip split t individual strings

---
 update.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/update.sh b/update.sh
index 3e0dad5d3..e23d9ab74 100755
--- a/update.sh
+++ b/update.sh
@@ -153,13 +153,14 @@ function update_node_version() {
         fi
       else
         sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp"
-        alpine_arch='x86_64) ARCH='"'"'x64'"'"' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \\\
-        x86) OPENSSL_ARCH=linux-elf;; \\\
-        aarch64) OPENSSL_ARCH=linux-aarch64;; \\\
-        arm*) OPENSSL_ARCH=linux-armv4;; \\\
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\
-        s390x) OPENSSL_ARCH=linux-s390x;; \\\
-        *) ;; \\'
+        alpine_x64='x86_64) ARCH='"'"'x64'"'"' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \\\n        '
+        alpine_x86='x86) OPENSSL_ARCH=linux-elf;; \\\n        '
+        alpine_aarch64='aarch64) OPENSSL_ARCH=linux-aarch64;; \\\n        '
+        alpine_armv4='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
+        alpine_ppc64le='ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\n        '
+        alpine_x390='s390x) OPENSSL_ARCH=linux-s390x;; \\\n        '
+        alpine_other='*) ;; \\'
+        alpine_arch="${alpine_x64}${alpine_x86}${alpine_aarch64}${alpine_armv4}${alpine_ppc64le}${alpine_x390}${alpine_other}"
         sed -Ei -e "s/\"\\$\{ALPINE_ARCH\[@\]\}\"/${alpine_arch}/" "${dockerfile}-tmp"
         sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp"
       fi

From 209999fdc0c94769a270b888fbbf41f44fb196b0 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sat, 9 May 2026 17:43:16 -0400
Subject: [PATCH 03/10] feat: only include the architectures supported in
 version.json

---
 22/alpine3.23/Dockerfile |  4 +---
 22/alpine3.24/Dockerfile |  4 +---
 24/alpine3.23/Dockerfile |  3 ---
 24/alpine3.24/Dockerfile |  3 ---
 26/alpine3.23/Dockerfile |  4 ----
 26/alpine3.24/Dockerfile |  4 ----
 update.sh                | 28 +++++++++++++++++++---------
 7 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/22/alpine3.23/Dockerfile b/22/alpine3.23/Dockerfile
index 974a3153b..1d650889d 100644
--- a/22/alpine3.23/Dockerfile
+++ b/22/alpine3.23/Dockerfile
@@ -11,10 +11,8 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="25b5ec8550ca8bac9ade321f8b87e1c1aa6a64020ce34efef0217fe84106794c" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
-        aarch64) OPENSSL_ARCH=linux-aarch64;; \
         arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
+        aarch64) OPENSSL_ARCH=linux-aarch64;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/22/alpine3.24/Dockerfile b/22/alpine3.24/Dockerfile
index 048efbf15..90a57384e 100644
--- a/22/alpine3.24/Dockerfile
+++ b/22/alpine3.24/Dockerfile
@@ -11,10 +11,8 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="25b5ec8550ca8bac9ade321f8b87e1c1aa6a64020ce34efef0217fe84106794c" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
-        aarch64) OPENSSL_ARCH=linux-aarch64;; \
         arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
+        aarch64) OPENSSL_ARCH=linux-aarch64;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/24/alpine3.23/Dockerfile b/24/alpine3.23/Dockerfile
index df4aa5a8b..26e6ba2b5 100644
--- a/24/alpine3.23/Dockerfile
+++ b/24/alpine3.23/Dockerfile
@@ -11,10 +11,7 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="b818a0c3857272329cad4d575abf49e5060215858c9c3015437366f8adc7b85d" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/24/alpine3.24/Dockerfile b/24/alpine3.24/Dockerfile
index 56fec5985..c7e6cafb6 100644
--- a/24/alpine3.24/Dockerfile
+++ b/24/alpine3.24/Dockerfile
@@ -11,10 +11,7 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="b818a0c3857272329cad4d575abf49e5060215858c9c3015437366f8adc7b85d" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/26/alpine3.23/Dockerfile b/26/alpine3.23/Dockerfile
index e68b9235d..563bef600 100644
--- a/26/alpine3.23/Dockerfile
+++ b/26/alpine3.23/Dockerfile
@@ -11,11 +11,7 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="adb255aff6caf681b473c25e1a1dbb8feb5ba28b7fa3eb2b7efa09abb9389bd2" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
-        s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
   && if [ -n "${CHECKSUM}" ]; then \
diff --git a/26/alpine3.24/Dockerfile b/26/alpine3.24/Dockerfile
index 244f3bdb3..645dc3f8c 100644
--- a/26/alpine3.24/Dockerfile
+++ b/26/alpine3.24/Dockerfile
@@ -11,11 +11,7 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="adb255aff6caf681b473c25e1a1dbb8feb5ba28b7fa3eb2b7efa09abb9389bd2" OPENSSL_ARCH=linux-x86_64;; \
-        x86) OPENSSL_ARCH=linux-elf;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
-        ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
-        s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
   && if [ -n "${CHECKSUM}" ]; then \
diff --git a/update.sh b/update.sh
index e23d9ab74..c1d819ea9 100755
--- a/update.sh
+++ b/update.sh
@@ -153,16 +153,26 @@ function update_node_version() {
         fi
       else
         sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp"
-        alpine_x64='x86_64) ARCH='"'"'x64'"'"' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \\\n        '
-        alpine_x86='x86) OPENSSL_ARCH=linux-elf;; \\\n        '
-        alpine_aarch64='aarch64) OPENSSL_ARCH=linux-aarch64;; \\\n        '
-        alpine_armv4='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
-        alpine_ppc64le='ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\n        '
-        alpine_x390='s390x) OPENSSL_ARCH=linux-s390x;; \\\n        '
-        alpine_other='*) ;; \\'
-        alpine_arch="${alpine_x64}${alpine_x86}${alpine_aarch64}${alpine_armv4}${alpine_ppc64le}${alpine_x390}${alpine_other}"
+
+        alpine_arch=''
+        arches=$(jq -r ".\"${version}\".variants.\"alpine${alpine_version}\" | @sh" "versions.json")
+        if [[ "${arches}" == *"amd64"* ]]; then
+          alpine_arch+='x86_64) ARCH='"'"'x64'"'"' CHECKSUM="'${checksum}'" OPENSSL_ARCH=linux-x86_64;; \\\n        '
+        fi
+        if [[ "$arches" == *"arm32"* ]]; then
+          alpine_arch+='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
+        fi
+        if [[ "$arches" == *"arm64v8"* ]]; then
+          alpine_arch+='aarch64) OPENSSL_ARCH=linux-aarch64;; \\\n        '
+        fi
+        if [[ "$arches" == *"ppc64le"* ]]; then
+          alpine_arch+='ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\n        '
+        fi
+        if [[ "$arches" == *"s390x"* ]]; then
+          alpine_arch+='s390x) OPENSSL_ARCH=linux-s390x;; \\\n        '
+        fi
+        alpine_arch+='*) ;; \\'
         sed -Ei -e "s/\"\\$\{ALPINE_ARCH\[@\]\}\"/${alpine_arch}/" "${dockerfile}-tmp"
-        sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp"
       fi
     elif is_debian "${variant}"; then
       sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"

From 19bf342836c18ebcc625ae2f1eb7d743a96191d8 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sat, 9 May 2026 17:58:14 -0400
Subject: [PATCH 04/10] feat: only include the architectures supported in
 version.json

---
 22/bullseye/Dockerfile     |  2 --
 22/trixie/Dockerfile       |  1 -
 24/bookworm/Dockerfile     |  1 -
 24/bullseye/Dockerfile     |  3 ---
 24/trixie/Dockerfile       |  1 -
 26/bookworm/Dockerfile     |  1 -
 26/bullseye/Dockerfile     |  3 ---
 26/trixie/Dockerfile       |  1 -
 Dockerfile-debian.template |  7 +------
 update.sh                  | 19 +++++++++++++++++++
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile
index 808c62c9b..93df8b180 100644
--- a/22/bullseye/Dockerfile
+++ b/22/bullseye/Dockerfile
@@ -8,8 +8,6 @@ ENV NODE_VERSION=22.23.1
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
-    ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
     armhf) ARCH='armv7l';; \
     *) echo "unsupported architecture"; exit 1 ;; \
diff --git a/22/trixie/Dockerfile b/22/trixie/Dockerfile
index aeae60f08..96372da58 100644
--- a/22/trixie/Dockerfile
+++ b/22/trixie/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     ppc64el) ARCH='ppc64le';; \
     s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/24/bookworm/Dockerfile
index 38839d595..2b8455c25 100644
--- a/24/bookworm/Dockerfile
+++ b/24/bookworm/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     ppc64el) ARCH='ppc64le';; \
     s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/24/bullseye/Dockerfile
index 08b80bb7c..069aeb82b 100644
--- a/24/bullseye/Dockerfile
+++ b/24/bullseye/Dockerfile
@@ -8,10 +8,7 @@ ENV NODE_VERSION=24.18.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
-    ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/24/trixie/Dockerfile
index 573c40817..8c25fb846 100644
--- a/24/trixie/Dockerfile
+++ b/24/trixie/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     ppc64el) ARCH='ppc64le';; \
     s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/26/bookworm/Dockerfile
index e945a6cdb..8b3944de4 100644
--- a/26/bookworm/Dockerfile
+++ b/26/bookworm/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     ppc64el) ARCH='ppc64le';; \
     s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/26/bullseye/Dockerfile
index 073803524..133408d75 100644
--- a/26/bullseye/Dockerfile
+++ b/26/bullseye/Dockerfile
@@ -8,10 +8,7 @@ ENV NODE_VERSION=26.5.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
-    ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile b/26/trixie/Dockerfile
index 45e602fdc..4f923870d 100644
--- a/26/trixie/Dockerfile
+++ b/26/trixie/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     ppc64el) ARCH='ppc64le';; \
     s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
     *) 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/Dockerfile-debian.template b/Dockerfile-debian.template
index 5f00f8f08..23a503dc8 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -7,12 +7,7 @@ ENV NODE_VERSION=0.0.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
-    amd64) ARCH='x64';; \
-    ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
-    arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
-    *) echo "unsupported architecture"; exit 1 ;; \
+    "${DEB_ARCH[@]}"
   esac \
   # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
   && export GNUPGHOME="$(mktemp -d)" \
diff --git a/update.sh b/update.sh
index c1d819ea9..f5b96d318 100755
--- a/update.sh
+++ b/update.sh
@@ -176,6 +176,25 @@ function update_node_version() {
       fi
     elif is_debian "${variant}"; then
       sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
+      deb_arch=''
+      arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
+      if [[ "${arches}" == *"amd64"* ]]; then
+        deb_arch+='amd64) ARCH='"'"'x64'"'"';; \\\n    '
+      fi
+      if [[ "$arches" == *"ppc64le"* ]]; then
+        deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"';; \\\n    '
+      fi
+      if [[ "$arches" == *"s390x"* ]]; then
+        deb_arch+='s390x) ARCH='"'"'s390x'"'"';; \\\n    '
+      fi
+      if [[ "$arches" == *"arm64v8"* ]]; then
+        deb_arch+='arm64) ARCH='"'"'arm64'"'"';; \\\n    '
+      fi
+      if [[ "$arches" == *"arm32v7"* ]]; then
+        deb_arch+='armhf) ARCH='"'"'armv7l'"'"';; \\\n    '
+      fi
+      deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
+      sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
     elif is_debian_slim "${variant}"; then
       sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
     fi

From 948eba7c05d48299fccb4afd7fe80f3840aa9f29 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sat, 9 May 2026 18:29:19 -0400
Subject: [PATCH 05/10] feat: only include the architectures supported in
 version.json

---
 22/bullseye-slim/Dockerfile |  2 --
 22/trixie-slim/Dockerfile   |  1 -
 24/bookworm-slim/Dockerfile |  1 -
 24/bullseye-slim/Dockerfile |  3 ---
 24/trixie-slim/Dockerfile   |  1 -
 26/bookworm-slim/Dockerfile |  1 -
 26/bullseye-slim/Dockerfile |  3 ---
 26/trixie-slim/Dockerfile   |  1 -
 Dockerfile-slim.template    |  7 +------
 update.sh                   | 19 +++++++++++++++++++
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile
index 5cad07f58..37bdfbc11 100644
--- a/22/bullseye-slim/Dockerfile
+++ b/22/bullseye-slim/Dockerfile
@@ -8,8 +8,6 @@ ENV NODE_VERSION=22.23.1
 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
-      ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
       armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
diff --git a/22/trixie-slim/Dockerfile b/22/trixie-slim/Dockerfile
index d6b1a70cb..fa72b1039 100644
--- a/22/trixie-slim/Dockerfile
+++ b/22/trixie-slim/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
       s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/24/bookworm-slim/Dockerfile b/24/bookworm-slim/Dockerfile
index 2bfe2946b..440506877 100644
--- a/24/bookworm-slim/Dockerfile
+++ b/24/bookworm-slim/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
       s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/24/bullseye-slim/Dockerfile b/24/bullseye-slim/Dockerfile
index f501d7c09..1b47f0fbd 100644
--- a/24/bullseye-slim/Dockerfile
+++ b/24/bullseye-slim/Dockerfile
@@ -8,10 +8,7 @@ ENV NODE_VERSION=24.18.0
 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
-      ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/24/trixie-slim/Dockerfile b/24/trixie-slim/Dockerfile
index 56111ccc2..1a80e0486 100644
--- a/24/trixie-slim/Dockerfile
+++ b/24/trixie-slim/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
       s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/26/bookworm-slim/Dockerfile b/26/bookworm-slim/Dockerfile
index d4123ad70..2c7ef6134 100644
--- a/26/bookworm-slim/Dockerfile
+++ b/26/bookworm-slim/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
       s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/26/bullseye-slim/Dockerfile b/26/bullseye-slim/Dockerfile
index 46732314b..d3b858817 100644
--- a/26/bullseye-slim/Dockerfile
+++ b/26/bullseye-slim/Dockerfile
@@ -8,10 +8,7 @@ ENV NODE_VERSION=26.5.0
 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
-      ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/26/trixie-slim/Dockerfile b/26/trixie-slim/Dockerfile
index 34debad36..a44bc9c1a 100644
--- a/26/trixie-slim/Dockerfile
+++ b/26/trixie-slim/Dockerfile
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
       s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
     && set -ex \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 5a643ebde..b2d858ceb 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -7,12 +7,7 @@ ENV NODE_VERSION=0.0.0
 
 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
-      amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
-      ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
-      arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
-      armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
-      *) echo "unsupported architecture"; exit 1 ;; \
+      "${DEB_ARCH[@]}"
     esac \
     && set -ex \
     # libatomic1 for arm
diff --git a/update.sh b/update.sh
index f5b96d318..b53e4af37 100755
--- a/update.sh
+++ b/update.sh
@@ -197,6 +197,25 @@ function update_node_version() {
       sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
     elif is_debian_slim "${variant}"; then
       sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
+      deb_arch=''
+      arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
+      if [[ "${arches}" == *"amd64"* ]]; then
+        deb_arch+='amd64) ARCH='"'"'x64'"'"' OPENSSL_ARCH='"'"'linux-x86_64'"'"';; \\\n      '
+      fi
+      if [[ "$arches" == *"ppc64le"* ]]; then
+        deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"' OPENSSL_ARCH='"'"'linux-ppc64le'"'"';; \\\n      '
+      fi
+      if [[ "$arches" == *"s390x"* ]]; then
+        deb_arch+='s390x) ARCH='"'"'s390x'"'"' OPENSSL_ARCH='"'"'linux*-s390x'"'"';; \\\n      '
+      fi
+      if [[ "$arches" == *"arm64v8"* ]]; then
+        deb_arch+='arm64) ARCH='"'"'arm64'"'"' OPENSSL_ARCH='"'"'linux-aarch64'"'"';; \\\n      '
+      fi
+      if [[ "$arches" == *"arm32v7"* ]]; then
+        deb_arch+='armhf) ARCH='"'"'armv7l'"'"' OPENSSL_ARCH='"'"'linux-armv4'"'"';; \\\n      '
+      fi
+      deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
+      sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
     fi
 
     # Strip out Yarn v1 from Node 26+ images https://github.com/nodejs/docker-node/issues/2407

From 90b30c508776f78f222752e868ec4098a9032127 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sat, 9 May 2026 18:52:07 -0400
Subject: [PATCH 06/10] fix: Alpine arm order

---
 22/alpine3.23/Dockerfile | 2 +-
 22/alpine3.24/Dockerfile | 2 +-
 update.sh                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/22/alpine3.23/Dockerfile b/22/alpine3.23/Dockerfile
index 1d650889d..2df13ec0b 100644
--- a/22/alpine3.23/Dockerfile
+++ b/22/alpine3.23/Dockerfile
@@ -11,8 +11,8 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="25b5ec8550ca8bac9ade321f8b87e1c1aa6a64020ce34efef0217fe84106794c" OPENSSL_ARCH=linux-x86_64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
+        arm*) OPENSSL_ARCH=linux-armv4;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/22/alpine3.24/Dockerfile b/22/alpine3.24/Dockerfile
index 90a57384e..545594439 100644
--- a/22/alpine3.24/Dockerfile
+++ b/22/alpine3.24/Dockerfile
@@ -11,8 +11,8 @@ RUN addgroup -g 1000 node \
     && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
       && case "${alpineArch##*-}" in \
         x86_64) ARCH='x64' CHECKSUM="25b5ec8550ca8bac9ade321f8b87e1c1aa6a64020ce34efef0217fe84106794c" OPENSSL_ARCH=linux-x86_64;; \
-        arm*) OPENSSL_ARCH=linux-armv4;; \
         aarch64) OPENSSL_ARCH=linux-aarch64;; \
+        arm*) OPENSSL_ARCH=linux-armv4;; \
         s390x) OPENSSL_ARCH=linux-s390x;; \
         *) ;; \
       esac \
diff --git a/update.sh b/update.sh
index b53e4af37..dc8c1906c 100755
--- a/update.sh
+++ b/update.sh
@@ -159,12 +159,12 @@ function update_node_version() {
         if [[ "${arches}" == *"amd64"* ]]; then
           alpine_arch+='x86_64) ARCH='"'"'x64'"'"' CHECKSUM="'${checksum}'" OPENSSL_ARCH=linux-x86_64;; \\\n        '
         fi
-        if [[ "$arches" == *"arm32"* ]]; then
-          alpine_arch+='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
-        fi
         if [[ "$arches" == *"arm64v8"* ]]; then
           alpine_arch+='aarch64) OPENSSL_ARCH=linux-aarch64;; \\\n        '
         fi
+        if [[ "$arches" == *"arm32"* ]]; then
+          alpine_arch+='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
+        fi
         if [[ "$arches" == *"ppc64le"* ]]; then
           alpine_arch+='ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\n        '
         fi

From acaf907c55ec88929ad3002de35a3f5d35b787af Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 15 Jul 2026 00:32:46 -0400
Subject: [PATCH 07/10] fix: SC2128

---
 update.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/update.sh b/update.sh
index dc8c1906c..e8c162273 100755
--- a/update.sh
+++ b/update.sh
@@ -156,19 +156,19 @@ function update_node_version() {
 
         alpine_arch=''
         arches=$(jq -r ".\"${version}\".variants.\"alpine${alpine_version}\" | @sh" "versions.json")
-        if [[ "${arches}" == *"amd64"* ]]; then
+        if [[ "${arches[0]}" == *"amd64"* ]]; then
           alpine_arch+='x86_64) ARCH='"'"'x64'"'"' CHECKSUM="'${checksum}'" OPENSSL_ARCH=linux-x86_64;; \\\n        '
         fi
-        if [[ "$arches" == *"arm64v8"* ]]; then
+        if [[ "${arches[0]}" == *"arm64v8"* ]]; then
           alpine_arch+='aarch64) OPENSSL_ARCH=linux-aarch64;; \\\n        '
         fi
-        if [[ "$arches" == *"arm32"* ]]; then
+        if [[ "${arches[0]}" == *"arm32"* ]]; then
           alpine_arch+='arm*) OPENSSL_ARCH=linux-armv4;; \\\n        '
         fi
-        if [[ "$arches" == *"ppc64le"* ]]; then
+        if [[ "${arches[0]}" == *"ppc64le"* ]]; then
           alpine_arch+='ppc64le) OPENSSL_ARCH=linux-ppc64le;; \\\n        '
         fi
-        if [[ "$arches" == *"s390x"* ]]; then
+        if [[ "${arches[0]}" == *"s390x"* ]]; then
           alpine_arch+='s390x) OPENSSL_ARCH=linux-s390x;; \\\n        '
         fi
         alpine_arch+='*) ;; \\'
@@ -178,19 +178,19 @@ function update_node_version() {
       sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
       deb_arch=''
       arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
-      if [[ "${arches}" == *"amd64"* ]]; then
+      if [[ "${arches[0]}" == *"amd64"* ]]; then
         deb_arch+='amd64) ARCH='"'"'x64'"'"';; \\\n    '
       fi
-      if [[ "$arches" == *"ppc64le"* ]]; then
+      if [[ "${arches[0]}" == *"ppc64le"* ]]; then
         deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"';; \\\n    '
       fi
-      if [[ "$arches" == *"s390x"* ]]; then
+      if [[ "${arches[0]}" == *"s390x"* ]]; then
         deb_arch+='s390x) ARCH='"'"'s390x'"'"';; \\\n    '
       fi
-      if [[ "$arches" == *"arm64v8"* ]]; then
+      if [[ "${arches[0]}" == *"arm64v8"* ]]; then
         deb_arch+='arm64) ARCH='"'"'arm64'"'"';; \\\n    '
       fi
-      if [[ "$arches" == *"arm32v7"* ]]; then
+      if [[ "${arches[0]}" == *"arm32v7"* ]]; then
         deb_arch+='armhf) ARCH='"'"'armv7l'"'"';; \\\n    '
       fi
       deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
@@ -199,19 +199,19 @@ function update_node_version() {
       sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
       deb_arch=''
       arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
-      if [[ "${arches}" == *"amd64"* ]]; then
+      if [[ "${arches[0]}" == *"amd64"* ]]; then
         deb_arch+='amd64) ARCH='"'"'x64'"'"' OPENSSL_ARCH='"'"'linux-x86_64'"'"';; \\\n      '
       fi
-      if [[ "$arches" == *"ppc64le"* ]]; then
+      if [[ "${arches[0]}" == *"ppc64le"* ]]; then
         deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"' OPENSSL_ARCH='"'"'linux-ppc64le'"'"';; \\\n      '
       fi
-      if [[ "$arches" == *"s390x"* ]]; then
+      if [[ "${arches[0]}" == *"s390x"* ]]; then
         deb_arch+='s390x) ARCH='"'"'s390x'"'"' OPENSSL_ARCH='"'"'linux*-s390x'"'"';; \\\n      '
       fi
-      if [[ "$arches" == *"arm64v8"* ]]; then
+      if [[ "${arches[0]}" == *"arm64v8"* ]]; then
         deb_arch+='arm64) ARCH='"'"'arm64'"'"' OPENSSL_ARCH='"'"'linux-aarch64'"'"';; \\\n      '
       fi
-      if [[ "$arches" == *"arm32v7"* ]]; then
+      if [[ "${arches[0]}" == *"arm32v7"* ]]; then
         deb_arch+='armhf) ARCH='"'"'armv7l'"'"' OPENSSL_ARCH='"'"'linux-armv4'"'"';; \\\n      '
       fi
       deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'

From 3a957469718c59c7763f71f7099d87ca3bf59179 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 15 Jul 2026 00:34:23 -0400
Subject: [PATCH 08/10] fix: sync s390x Bookwork removal

---
 22/bookworm-slim/Dockerfile | 1 -
 22/bookworm/Dockerfile      | 1 -
 24/bookworm-slim/Dockerfile | 1 -
 24/bookworm/Dockerfile      | 1 -
 26/bookworm-slim/Dockerfile | 1 -
 26/bookworm/Dockerfile      | 1 -
 6 files changed, 6 deletions(-)

diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile
index a47dc5c59..192424b36 100644
--- a/22/bookworm-slim/Dockerfile
+++ b/22/bookworm-slim/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
       armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
       *) echo "unsupported architecture"; exit 1 ;; \
diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile
index 071b7c2a4..334013216 100644
--- a/22/bookworm/Dockerfile
+++ b/22/bookworm/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
     ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
     armhf) ARCH='armv7l';; \
     *) echo "unsupported architecture"; exit 1 ;; \
diff --git a/24/bookworm-slim/Dockerfile b/24/bookworm-slim/Dockerfile
index 440506877..432f91139 100644
--- a/24/bookworm-slim/Dockerfile
+++ b/24/bookworm-slim/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
diff --git a/24/bookworm/Dockerfile b/24/bookworm/Dockerfile
index 2b8455c25..5813e10f0 100644
--- a/24/bookworm/Dockerfile
+++ b/24/bookworm/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
     ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac \
diff --git a/26/bookworm-slim/Dockerfile b/26/bookworm-slim/Dockerfile
index 2c7ef6134..66b5de8f4 100644
--- a/26/bookworm-slim/Dockerfile
+++ b/26/bookworm-slim/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
       ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
-      s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
       arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
diff --git a/26/bookworm/Dockerfile b/26/bookworm/Dockerfile
index 8b3944de4..396199d3b 100644
--- a/26/bookworm/Dockerfile
+++ b/26/bookworm/Dockerfile
@@ -9,7 +9,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
     amd64) ARCH='x64';; \
     ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
     arm64) ARCH='arm64';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac \

From 0eeea9349e1275cbef7f469d91505b5faa051c21 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 15 Jul 2026 00:41:04 -0400
Subject: [PATCH 09/10] fix: SC2178

---
 update.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/update.sh b/update.sh
index e8c162273..0b534c3ce 100755
--- a/update.sh
+++ b/update.sh
@@ -155,6 +155,7 @@ function update_node_version() {
         sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp"
 
         alpine_arch=''
+        local -a arches
         arches=$(jq -r ".\"${version}\".variants.\"alpine${alpine_version}\" | @sh" "versions.json")
         if [[ "${arches[0]}" == *"amd64"* ]]; then
           alpine_arch+='x86_64) ARCH='"'"'x64'"'"' CHECKSUM="'${checksum}'" OPENSSL_ARCH=linux-x86_64;; \\\n        '
@@ -177,6 +178,7 @@ function update_node_version() {
     elif is_debian "${variant}"; then
       sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
       deb_arch=''
+      local -a arches
       arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
       if [[ "${arches[0]}" == *"amd64"* ]]; then
         deb_arch+='amd64) ARCH='"'"'x64'"'"';; \\\n    '
@@ -198,6 +200,7 @@ function update_node_version() {
     elif is_debian_slim "${variant}"; then
       sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
       deb_arch=''
+      local -a arches
       arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
       if [[ "${arches[0]}" == *"amd64"* ]]; then
         deb_arch+='amd64) ARCH='"'"'x64'"'"' OPENSSL_ARCH='"'"'linux-x86_64'"'"';; \\\n      '

From 555b081a2f729ac66f28919844aaf81c69c5332c Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 15 Jul 2026 00:45:19 -0400
Subject: [PATCH 10/10] fix: SC1003

---
 update.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/update.sh b/update.sh
index 0b534c3ce..8fbed0adf 100755
--- a/update.sh
+++ b/update.sh
@@ -172,6 +172,7 @@ function update_node_version() {
         if [[ "${arches[0]}" == *"s390x"* ]]; then
           alpine_arch+='s390x) OPENSSL_ARCH=linux-s390x;; \\\n        '
         fi
+        # shellcheck disable=SC1003
         alpine_arch+='*) ;; \\'
         sed -Ei -e "s/\"\\$\{ALPINE_ARCH\[@\]\}\"/${alpine_arch}/" "${dockerfile}-tmp"
       fi
@@ -195,6 +196,7 @@ function update_node_version() {
       if [[ "${arches[0]}" == *"arm32v7"* ]]; then
         deb_arch+='armhf) ARCH='"'"'armv7l'"'"';; \\\n    '
       fi
+      # shellcheck disable=SC1003
       deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
       sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
     elif is_debian_slim "${variant}"; then
@@ -217,6 +219,7 @@ function update_node_version() {
       if [[ "${arches[0]}" == *"arm32v7"* ]]; then
         deb_arch+='armhf) ARCH='"'"'armv7l'"'"' OPENSSL_ARCH='"'"'linux-armv4'"'"';; \\\n      '
       fi
+      # shellcheck disable=SC1003
       deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
       sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
     fi