diff --git a/test/Dockerfile.distro b/test/Dockerfile.distro index 1560d0c2ea..737c7ff053 100644 --- a/test/Dockerfile.distro +++ b/test/Dockerfile.distro @@ -157,7 +157,7 @@ RUN install-tool gradle 9.2.0 FROM build AS test-node # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node -RUN install-tool node 22.21.1 +RUN install-tool node 24.11.1 # renovate: datasource=npm RUN install-tool pnpm 10.20.0 # renovate: datasource=npm packageName=@yarnpkg/cli-dist diff --git a/test/latest/Dockerfile b/test/latest/Dockerfile index 3680bf0e69..d0b913352b 100644 --- a/test/latest/Dockerfile +++ b/test/latest/Dockerfile @@ -65,7 +65,7 @@ FROM base AS testa RUN install-apt nginx # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node -RUN install-tool node 22.21.1 +RUN install-tool node 24.11.1 # renovate: datasource=github-releases packageName=containerbase/php-prebuild RUN install-tool php 8.4.14 @@ -194,7 +194,7 @@ RUN install-tool git-lfs v3.7.1 RUN install-tool powershell v7.5.4 # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node -RUN install-tool node 22.21.1 +RUN install-tool node 24.11.1 # renovate: datasource=github-releases packageName=moby/moby RUN install-tool docker v28.5.2 diff --git a/test/node/Dockerfile b/test/node/Dockerfile index 9917d8eb89..00d8adf47c 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -41,7 +41,7 @@ WORKDIR /test FROM base AS build # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node -RUN install-tool node 22.21.1 +RUN install-tool node 24.11.1 # ensure npmrc is writable by user RUN set -ex; [ $(stat --format '%u' "/tmp/containerbase/cache/.npmrc") -eq ${USER_ID} ] @@ -115,7 +115,7 @@ RUN set -ex; cd a; pnpm i # test: node 20 #-------------------------------------- -FROM base AS testd +FROM base AS test-v20 RUN prepare-tool node @@ -136,6 +136,43 @@ RUN set -ex; \ yarn --version; +COPY --chown=12021:0 test/node/test test + +RUN set -ex; \ + npm --version; \ + command -v npm; + +RUN set -ex; cd test/a; npm i + +# renovate: datasource=npm +RUN install-npm del-cli 7.0.0 +RUN del -d test/a/** + +#-------------------------------------- +# test: node 22 +#-------------------------------------- + +FROM base AS test-v22 + +RUN prepare-tool node + +USER 12021 + +# renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node +RUN install-tool node 22.21.1 + +RUN npm install -g yarn +RUN set -ex; \ + [ "$(command -v yarn)" = "" ] && echo "works" || exit 1; \ + true; + +# renovate: datasource=npm +RUN install-tool yarn 1.22.22 +RUN set -ex; \ + [ "$(command -v yarn)" = "/usr/local/bin/yarn" ] && echo "works" || exit 1; \ + yarn --version; + + COPY --chown=12021:0 test/node/test test RUN set -ex; \ @@ -527,7 +564,6 @@ FROM base COPY --from=testa /.dummy /.dummy COPY --from=testb /.dummy /.dummy COPY --from=testc /.dummy /.dummy -COPY --from=testd /.dummy /.dummy COPY --from=teste /.dummy /.dummy COPY --from=testf /.dummy /.dummy COPY --from=testg /.dummy /.dummy @@ -541,3 +577,6 @@ COPY --from=testn /.dummy /.dummy COPY --from=testo /.dummy /.dummy COPY --from=testp /.dummy /.dummy COPY --from=testq /.dummy /.dummy + +COPY --from=test-v20 /.dummy /.dummy +COPY --from=test-v22 /.dummy /.dummy diff --git a/test/node/Dockerfile.arm64 b/test/node/Dockerfile.arm64 index 66b869227e..8164d0bd62 100644 --- a/test/node/Dockerfile.arm64 +++ b/test/node/Dockerfile.arm64 @@ -38,7 +38,7 @@ ARG CONTAINERBASE_LOG_LEVEL FROM base AS test-node # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node -RUN install-tool node 22.21.1 +RUN install-tool node 24.11.1 #-------------------------------------- diff --git a/test/node/test/a/package.json b/test/node/test/a/package.json index 92ac1db178..12e5241b65 100755 --- a/test/node/test/a/package.json +++ b/test/node/test/a/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "re2": "1.21.4", + "re2": "1.21.5", "semver": "7.3.2" } }