Skip to content

Commit a752c10

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

10 files changed

Lines changed: 20 additions & 19 deletions

File tree

22/bullseye/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= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64';; \
11-
ppc64el) ARCH='ppc64le';; \
12-
s390x) ARCH='s390x';; \
1311
arm64) ARCH='arm64';; \
1412
armhf) ARCH='armv7l';; \
1513
*) echo "unsupported architecture"; exit 1 ;; \

22/trixie/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le';; \
1212
s390x) ARCH='s390x';; \
1313
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

24/bookworm/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le';; \
1212
s390x) ARCH='s390x';; \
1313
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

24/bullseye/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= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64';; \
11-
ppc64el) ARCH='ppc64le';; \
12-
s390x) ARCH='s390x';; \
1311
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1512
*) echo "unsupported architecture"; exit 1 ;; \
1613
esac \
1714
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

24/trixie/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le';; \
1212
s390x) ARCH='s390x';; \
1313
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

26/bookworm/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le';; \
1212
s390x) ARCH='s390x';; \
1313
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

26/bullseye/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= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64';; \
11-
ppc64el) ARCH='ppc64le';; \
12-
s390x) ARCH='s390x';; \
1311
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1512
*) echo "unsupported architecture"; exit 1 ;; \
1613
esac \
1714
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

26/trixie/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1111
ppc64el) ARCH='ppc64le';; \
1212
s390x) ARCH='s390x';; \
1313
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
1514
*) echo "unsupported architecture"; exit 1 ;; \
1615
esac \
1716
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150

Dockerfile-debian.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= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
10-
amd64) ARCH='x64';; \
11-
ppc64el) ARCH='ppc64le';; \
12-
s390x) ARCH='s390x';; \
13-
arm64) ARCH='arm64';; \
14-
armhf) ARCH='armv7l';; \
15-
*) echo "unsupported architecture"; exit 1 ;; \
10+
"${DEB_ARCH[@]}"
1611
esac \
1712
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
1813
&& export GNUPGHOME="$(mktemp -d)" \

update.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,25 @@ function update_node_version() {
176176
fi
177177
elif is_debian "${variant}"; then
178178
sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
179+
deb_arch=''
180+
arches=$(jq -r ".\"${version}\".variants.\"${variant}\" | @sh" "versions.json")
181+
if [[ "${arches}" == *"amd64"* ]]; then
182+
deb_arch+='amd64) ARCH='"'"'x64'"'"';; \\\n '
183+
fi
184+
if [[ "$arches" == *"ppc64le"* ]]; then
185+
deb_arch+='ppc64el) ARCH='"'"'ppc64le'"'"';; \\\n '
186+
fi
187+
if [[ "$arches" == *"s390x"* ]]; then
188+
deb_arch+='s390x) ARCH='"'"'s390x'"'"';; \\\n '
189+
fi
190+
if [[ "$arches" == *"arm64v8"* ]]; then
191+
deb_arch+='arm64) ARCH='"'"'arm64'"'"';; \\\n '
192+
fi
193+
if [[ "$arches" == *"arm32v7"* ]]; then
194+
deb_arch+='armhf) ARCH='"'"'armv7l'"'"';; \\\n '
195+
fi
196+
deb_arch+='*) echo "unsupported architecture"; exit 1 ;; \\'
197+
sed -Ei -e "s/\"\\$\{DEB_ARCH\[@\]\}\"/${deb_arch}/" "${dockerfile}-tmp"
179198
elif is_debian_slim "${variant}"; then
180199
sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
181200
fi

0 commit comments

Comments
 (0)