From e1db8ea5139d543be00971b48b6c1f445d6683ea Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 16 Dec 2025 23:51:34 +0000 Subject: [PATCH] debian --- .github/workflows/deploy-images-feat-saas.yml | 2 +- client/Dockerfile | 2 +- server/Dockerfile | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-images-feat-saas.yml b/.github/workflows/deploy-images-feat-saas.yml index a666430f7..5608c6db9 100644 --- a/.github/workflows/deploy-images-feat-saas.yml +++ b/.github/workflows/deploy-images-feat-saas.yml @@ -57,7 +57,7 @@ jobs: platforms: ${{ env.PLATFORMS }} push: true tags: ${{ env.IMAGE_SERVER }}:${{ env.TAG }} - deploy-to-staging: + deploy-to-ajhollid: needs: build-and-push runs-on: ubuntu-latest steps: diff --git a/client/Dockerfile b/client/Dockerfile index c26d036a1..b9cfc303b 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -2,7 +2,7 @@ ARG NODE_VERSION=20 -FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-slim AS build +FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS build ENV NODE_OPTIONS="--max-old-space-size=4096" WORKDIR /app COPY package*.json ./ diff --git a/server/Dockerfile b/server/Dockerfile index 7abde1c67..cefe2cab6 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -3,7 +3,7 @@ ARG NODE_VERSION=20 ## Build stage (with dev deps, native to build platform) -FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-alpine AS build +FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS build WORKDIR /app COPY package*.json ./ RUN npm ci @@ -11,15 +11,13 @@ COPY . . RUN npm run build ## Production deps (native to target platform) -FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-alpine AS deps +FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-bookworm-slim AS deps WORKDIR /app COPY package*.json ./ -# For arm64 under QEMU, alpine + musl can trigger Illegal instruction with npm ci. -# Use npm install for broader compatibility. -RUN npm install --omit=dev +RUN npm ci --omit=dev ## Runtime image (target platform) -FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-alpine +FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-bookworm-slim ENV NODE_ENV=production WORKDIR /app COPY --from=deps /app/node_modules ./node_modules