From b307041393ee74bd5cb3832fe01c44641335e691 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 21 May 2025 10:17:14 +0200 Subject: [PATCH] Revert "feat: improve docker layers (#803)" This reverts commit 75db48348a2d4c8354c9b9003c619b2312f31487. --- .dockerignore | 11 ----------- Dockerfile | 12 ++++-------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.dockerignore b/.dockerignore index fae5509f9..5026e6472 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,10 +1,3 @@ -# Source-control & editors -.git -.github -.vscode -.idea -*.swp - files/ dist/ logs/ @@ -23,7 +16,3 @@ docker-manifest-unstable.tmpl /frontend/node_modules/ /frontend/.direnv /frontend/dist - -# OS -.DS_Store -Thumbs.db diff --git a/Dockerfile b/Dockerfile index ac54cc98d..37391210c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,15 +7,11 @@ ENV PNPM_CACHE_FOLDER=.cache/pnpm/ ENV PUPPETEER_SKIP_DOWNLOAD=true ENV CYPRESS_INSTALL_BINARY=0 -# First copy lockfile & manifest => they rarely change -COPY frontend/pnpm-lock.yaml frontend/package.json ./ -RUN npm install -g corepack && corepack enable && \ - pnpm fetch --prod # installs into cache only - -# Copy the rest => invalidates only when code changes COPY frontend/ ./ -RUN pnpm install --frozen-lockfile --offline && \ - pnpm run build + +RUN npm install -g corepack && corepack enable && \ + pnpm install --frozen-lockfile --prefer-offline && \ + pnpm run build FROM --platform=$BUILDPLATFORM ghcr.io/techknowlogick/xgo:go-1.23.x@sha256:d45f463381d025efa2fa0fb8617d2b04694e650bfd5d206ae1ef13d0c78fdea6 AS apibuilder