Skip to content

Commit 992ae4b

Browse files
committed
feat: only include the architectures supported in version.json
1 parent a752c10 commit 992ae4b

10 files changed

Lines changed: 20 additions & 19 deletions

File tree

22/bullseye-slim/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ ENV NODE_VERSION=22.23.1
88
RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
11-
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1311
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1412
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1513
*) echo "unsupported architecture"; exit 1 ;; \

22/trixie-slim/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
1212
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
&& set -ex \

24/bookworm-slim/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
1212
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
&& set -ex \

24/bullseye-slim/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ ENV NODE_VERSION=24.18.0
88
RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
11-
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1311
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1512
*) echo "unsupported architecture"; exit 1 ;; \
1613
esac \
1714
&& set -ex \

24/trixie-slim/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
1212
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
&& set -ex \

26/bookworm-slim/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
1212
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
&& set -ex \

26/bullseye-slim/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ ENV NODE_VERSION=26.4.0
88
RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
11-
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1311
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1512
*) echo "unsupported architecture"; exit 1 ;; \
1613
esac \
1714
&& set -ex \

26/trixie-slim/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
1212
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
&& set -ex \

Dockerfile-slim.template

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ ENV NODE_VERSION=0.0.0
77

88
RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
10-
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
11-
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
13-
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
14-
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
15-
*) echo "unsupported architecture"; exit 1 ;; \
10+
"${DEB_ARCH[@]}"
1611
esac \
1712
&& set -ex \
1813
# libatomic1 for arm

update.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,25 @@ function update_node_version() {
197197
sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
198198
elif is_debian_slim "${variant}"; then
199199
sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
200+
deb_arch=''
201+
arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
202+
if [[ "${arches}" == *"amd64"* ]]; then
203+
deb_arch+='amd64) ARCH='"'"'x64'"'"' OPENSSL_ARCH='"'"'linux-x86_64'"'"';; \\\n '
204+
fi
205+
if [[ "$arches" == *"ppc64le"* ]]; then
206+
deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"' OPENSSL_ARCH='"'"'linux-ppc64le'"'"';; \\\n '
207+
fi
208+
if [[ "$arches" == *"s390x"* ]]; then
209+
deb_arch+='s390x) ARCH='"'"'s390x'"'"' OPENSSL_ARCH='"'"'linux*-s390x'"'"';; \\\n '
210+
fi
211+
if [[ "$arches" == *"arm64v8"* ]]; then
212+
deb_arch+='arm64) ARCH='"'"'arm64'"'"' OPENSSL_ARCH='"'"'linux-aarch64'"'"';; \\\n '
213+
fi
214+
if [[ "$arches" == *"arm32v7"* ]]; then
215+
deb_arch+='armhf) ARCH='"'"'armv7l'"'"' OPENSSL_ARCH='"'"'linux-armv4'"'"';; \\\n '
216+
fi
217+
deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
218+
sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
200219
fi
201220

202221
# Strip out Yarn v1 from Node 26+ images https://github.com/nodejs/docker-node/issues/2407

0 commit comments

Comments
 (0)