From f1f8792e8d8719b8003d7f2ef38d1a142b1451fb Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 22 Apr 2024 15:32:36 +0200 Subject: [PATCH 1/3] build!: drop compabillity from docker image --- tools/docker/Dockerfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ef6faea831718d..04b89670692b1c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -60,14 +60,6 @@ ARG RENOVATE_VERSION COPY --from=build --chown=root:root /usr/local/renovate/ /usr/local/renovate/ -# Compabillity, so `config.js` can access renovate and deps -RUN set -ex; \ - mkdir /opt/containerbase/tools/renovate; \ - echo "${RENOVATE_VERSION}" > /opt/containerbase/versions/renovate; \ - ln -sf /usr/local/renovate /opt/containerbase/tools/renovate/${RENOVATE_VERSION}; \ - ln -sf /usr/local/renovate/node_modules ./node_modules; \ - true - RUN set -ex; \ renovate --version; \ renovate-config-validator; \ From 5f13c2ae563e5fee0a64dc0b9bbe8798069f2ceb Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 22 Apr 2024 15:41:06 +0200 Subject: [PATCH 2/3] test: change dir before checking re2 --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 04b89670692b1c..6ab9e893888f51 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -63,7 +63,7 @@ COPY --from=build --chown=root:root /usr/local/renovate/ /usr/local/renovate/ RUN set -ex; \ renovate --version; \ renovate-config-validator; \ - node -e "new require('re2')('.*').exec('test')"; \ + cd /usr/local/renovate && node -e "new require('re2')('.*').exec('test')"; \ true LABEL \ From bcb5d04366ae842a8ba214c0b580d7ff3438694d Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 22 Apr 2024 15:41:57 +0200 Subject: [PATCH 3/3] fix: use corepack --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 6ab9e893888f51..8190bd5da2e192 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -22,13 +22,13 @@ ENV CI=1 npm_config_modules_cache_max_age=0 COPY pnpm-lock.yaml ./ # only fetch deps from lockfile https://pnpm.io/cli/fetch -RUN pnpm fetch --prod +RUN corepack pnpm fetch --prod COPY . ./ # install RUN set -ex; \ - pnpm install --prod --offline --ignore-scripts; \ + corepack pnpm install --prod --offline --ignore-scripts; \ true # test