From ec1971366a6be821c367011069763ae95d1ea914 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 1 Oct 2025 10:49:00 +0100 Subject: [PATCH 1/2] Support .node-version either with or without leading 'v' As per comment --- dockerbuild/setup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dockerbuild/setup.sh b/dockerbuild/setup.sh index efb4310834..ba6a3f3806 100755 --- a/dockerbuild/setup.sh +++ b/dockerbuild/setup.sh @@ -3,6 +3,9 @@ set -x declare -A archMap=(["amd64"]="x64" ["arm64"]="arm64") ARCH="${archMap["$TARGETARCH"]}" -NODE_VERSION=$(cat /.node-version) -curl --proto "=https" -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \ +# The .node-version file generally doesn't have the 'v' (rennovate does not put the 'v' and will +# strip it on upgrade if it's there) but the 'v' is also widely supported so we probably ought +# to just work either way. +NODE_VERSION=$(cat /.node-version | sed -e 's/^v//') +curl --proto "=https" -L "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \ unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md From cfff1c76404795a1938ff9058234e5912d16b0b7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 1 Oct 2025 11:06:34 +0100 Subject: [PATCH 2/2] Spell renovate right Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- dockerbuild/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/setup.sh b/dockerbuild/setup.sh index ba6a3f3806..5afba9708b 100755 --- a/dockerbuild/setup.sh +++ b/dockerbuild/setup.sh @@ -3,7 +3,7 @@ set -x declare -A archMap=(["amd64"]="x64" ["arm64"]="arm64") ARCH="${archMap["$TARGETARCH"]}" -# The .node-version file generally doesn't have the 'v' (rennovate does not put the 'v' and will +# The .node-version file generally doesn't have the 'v' (renovate does not put the 'v' and will # strip it on upgrade if it's there) but the 'v' is also widely supported so we probably ought # to just work either way. NODE_VERSION=$(cat /.node-version | sed -e 's/^v//')