diff --git a/26/alpine3.22/Dockerfile b/26/alpine3.22/Dockerfile index c7dfc358a..65e7fddf8 100644 --- a/26/alpine3.22/Dockerfile +++ b/26/alpine3.22/Dockerfile @@ -37,6 +37,8 @@ RUN addgroup -g 1000 node \ make \ python3 \ py-setuptools \ + rust \ + cargo \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/26/alpine3.23/Dockerfile b/26/alpine3.23/Dockerfile index ea1819e8c..76ebf1527 100644 --- a/26/alpine3.23/Dockerfile +++ b/26/alpine3.23/Dockerfile @@ -37,6 +37,8 @@ RUN addgroup -g 1000 node \ make \ python3 \ py-setuptools \ + rust \ + cargo \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d4096cc08..7ccaab1a1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -37,6 +37,8 @@ RUN addgroup -g 1000 node \ make \ python3 \ py-setuptools \ + rust \ + cargo \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/update.sh b/update.sh index 278ed8063..5d2d884ae 100755 --- a/update.sh +++ b/update.sh @@ -167,6 +167,12 @@ function update_node_version() { sed -Ei -e "/ENV YARN_VERSION/,/rm -rf \/tmp\/\*/d" "${dockerfile}-tmp" fi + # Strip out rust/cargo from Alpine images for Node < 26 since these versions don't need rust/cargo for Temporal + # See: https://github.com/nodejs/docker-node/pull/2488 + if [ "${nodeVersion:0:2}" -lt "26" ]; then + sed -Ei -e "/rust/,/cargo/d" "${dockerfile}-tmp" + fi + if diff -q "${dockerfile}-tmp" "${dockerfile}" > /dev/null; then echo "${dockerfile} is already up to date!" else