feat: only include the architectures supported in version.json

nschonni · nschonni · commit 9ecae61749d1 · 2026-05-09T18:29:19.000-04:00
diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile
@@ -8,8 +8,6 @@ ENV NODE_VERSION=22.22.2
 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
@@ -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
@@ -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
@@ -8,10 +8,7 @@ ENV NODE_VERSION=24.15.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
@@ -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/25/bookworm-slim/Dockerfile b/25/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/25/bullseye-slim/Dockerfile b/25/bullseye-slim/Dockerfile
@@ -8,10 +8,7 @@ ENV NODE_VERSION=25.9.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/25/trixie-slim/Dockerfile b/25/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
@@ -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
@@ -8,10 +8,7 @@ ENV NODE_VERSION=26.1.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
@@ -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
@@ -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
@@ -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
