From 0646bd137910cb93721ea9c659021c0f91bb0e6b Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 7 May 2026 16:17:37 +0200 Subject: [PATCH 1/8] ci(docker): fix faulty pnpm versions --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6eb8a08f57..e470d1c39e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN corepack enable FROM base AS packages COPY . /usr/src/app WORKDIR /usr/src/app +RUN corepack install RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build @@ -22,7 +23,7 @@ ENV PORT=$PORT HOST=$HOST APP_ENV=$APP_ENV RUN pnpm build:www RUN pnpm deploy --filter=@web/www --prod /prod/@web/www -FROM base AS www +FROM packages AS www COPY --from=www-build /prod/@web/www /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 @@ -38,7 +39,7 @@ ENV PORT=$PORT HOST=$HOST APP_ENV=$APP_ENV RUN pnpm build:themebuilder RUN pnpm deploy --filter=@web/themebuilder --prod /prod/@web/themebuilder -FROM base AS themebuilder +FROM packages AS themebuilder COPY --from=themebuilder-build /prod/@web/themebuilder /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 From 8074ac6e392ec803dfb9476f878ed610dd7d32b8 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 7 May 2026 16:30:53 +0200 Subject: [PATCH 2/8] try someting else --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e470d1c39e..5575458b07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,12 @@ ARG APP_ENV FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f2773447d8da26c AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable - -FROM base AS packages COPY . /usr/src/app WORKDIR /usr/src/app +RUN corepack enable RUN corepack install + +FROM base AS packages RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build @@ -23,7 +23,7 @@ ENV PORT=$PORT HOST=$HOST APP_ENV=$APP_ENV RUN pnpm build:www RUN pnpm deploy --filter=@web/www --prod /prod/@web/www -FROM packages AS www +FROM base AS www COPY --from=www-build /prod/@web/www /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 @@ -39,7 +39,7 @@ ENV PORT=$PORT HOST=$HOST APP_ENV=$APP_ENV RUN pnpm build:themebuilder RUN pnpm deploy --filter=@web/themebuilder --prod /prod/@web/themebuilder -FROM packages AS themebuilder +FROM base AS themebuilder COPY --from=themebuilder-build /prod/@web/themebuilder /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 From efa56aef47d9f6244e0208e2ee12f6a090b169fa Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 7 May 2026 16:50:08 +0200 Subject: [PATCH 3/8] add missing workdir --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5575458b07..9ae56d9c8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN corepack enable RUN corepack install FROM base AS packages +WORKDIR /usr/src/app RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build From d0121f77de56507b06b5d13b81c5b08807f9767c Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Fri, 8 May 2026 08:36:33 +0200 Subject: [PATCH 4/8] does this make a difference? --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec63093064..0c995631cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,15 @@ ARG APP_ENV FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f2773447d8da26c AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -COPY . /usr/src/app -WORKDIR /usr/src/app +COPY ./package.json /usr/src/app +COPY ./pnpm-lock.yaml /usr/src/app +COPY ./pnpm-workspace.yaml /usr/src/app ENV CI=true RUN corepack enable -RUN corepack install -g pnpm@10.33.2 +RUN corepack install FROM base AS packages +COPY . /usr/src/app WORKDIR /usr/src/app RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build @@ -26,6 +28,7 @@ RUN pnpm build:www RUN pnpm deploy --filter=@web/www --prod /prod/@web/www FROM base AS www + COPY --from=www-build /prod/@web/www /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 From cd46c21af3cf36ce1752edb12df5a008e41159e5 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Fri, 8 May 2026 08:44:46 +0200 Subject: [PATCH 5/8] how does this work --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c995631cc..797c6161f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,13 @@ ARG APP_ENV FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f2773447d8da26c AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -COPY ./package.json /usr/src/app -COPY ./pnpm-lock.yaml /usr/src/app -COPY ./pnpm-workspace.yaml /usr/src/app ENV CI=true +COPY . /usr/src/app +WORKDIR /usr/src/app RUN corepack enable RUN corepack install FROM base AS packages -COPY . /usr/src/app WORKDIR /usr/src/app RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build From b2cbd19defa7c46bd15bb7e90da2652f543c06e0 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Fri, 8 May 2026 09:09:00 +0200 Subject: [PATCH 6/8] only copy needed files to base --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 797c6161f8..b7cf18d171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,13 @@ FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" ENV CI=true -COPY . /usr/src/app -WORKDIR /usr/src/app +COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ RUN corepack enable RUN corepack install FROM base AS packages +COPY . /usr/src/app +WORKDIR /usr/src/app WORKDIR /usr/src/app RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build @@ -26,7 +27,6 @@ RUN pnpm build:www RUN pnpm deploy --filter=@web/www --prod /prod/@web/www FROM base AS www - COPY --from=www-build /prod/@web/www /srv/app WORKDIR /srv/app ENV NODE_ENV=production HOST=0.0.0.0 PORT=8000 From 86629b43b6caa14a667562760d5bb3ed2c7f2db0 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Fri, 8 May 2026 09:26:50 +0200 Subject: [PATCH 7/8] remove double workdir --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7cf18d171..6eb8a08f57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,11 @@ ARG APP_ENV FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f2773447d8da26c AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -ENV CI=true -COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ RUN corepack enable -RUN corepack install FROM base AS packages COPY . /usr/src/app WORKDIR /usr/src/app -WORKDIR /usr/src/app RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile RUN pnpm build From e2afba686f6827d484a6d225dba9fd1181644a09 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Fri, 8 May 2026 09:27:44 +0200 Subject: [PATCH 8/8] wups --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6eb8a08f57..1d31eeac10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,10 @@ ARG APP_ENV FROM node:24.14.1-slim@sha256:b506e7321f176aae77317f99d67a24b272c1f09f1d10f1761f2773447d8da26c AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" +ENV CI=true +COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ RUN corepack enable +RUN corepack install FROM base AS packages COPY . /usr/src/app