From f6fdedf3b41b6ec31a593ce752fc25cc759f3f1d Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Fri, 10 Oct 2025 20:47:02 +0200
Subject: [PATCH] Separate Stages for npm in generation

---
 .github/workflows/docker-image-testing_amd64.yml   |  2 +-
 .github/workflows/docker-image-testing_amd64v2.yml |  2 +-
 .github/workflows/docker-image-testing_amd64v3.yml |  2 +-
 .github/workflows/docker-image-testing_arm64.yml   |  2 +-
 .github/workflows/docker-image-testing_armv7.yml   |  2 +-
 Dockerfile                                         | 14 +++++++++++---
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-image-testing_amd64.yml b/.github/workflows/docker-image-testing_amd64.yml
index a6ed2b2..3f3e13c 100644
--- a/.github/workflows/docker-image-testing_amd64.yml
+++ b/.github/workflows/docker-image-testing_amd64.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: CI amd64
 
 on:
   push:
diff --git a/.github/workflows/docker-image-testing_amd64v2.yml b/.github/workflows/docker-image-testing_amd64v2.yml
index 621bd70..0aa5671 100644
--- a/.github/workflows/docker-image-testing_amd64v2.yml
+++ b/.github/workflows/docker-image-testing_amd64v2.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: CI amd64v2
 
 on:
   push:
diff --git a/.github/workflows/docker-image-testing_amd64v3.yml b/.github/workflows/docker-image-testing_amd64v3.yml
index 7e205f6..f4ce8c3 100644
--- a/.github/workflows/docker-image-testing_amd64v3.yml
+++ b/.github/workflows/docker-image-testing_amd64v3.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: CI amd64v3
 
 on:
   push:
diff --git a/.github/workflows/docker-image-testing_arm64.yml b/.github/workflows/docker-image-testing_arm64.yml
index 0a2dcd9..0ce16ee 100644
--- a/.github/workflows/docker-image-testing_arm64.yml
+++ b/.github/workflows/docker-image-testing_arm64.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: CI arm64
 
 on:
   push:
diff --git a/.github/workflows/docker-image-testing_armv7.yml b/.github/workflows/docker-image-testing_armv7.yml
index c6083cd..ef43c68 100644
--- a/.github/workflows/docker-image-testing_armv7.yml
+++ b/.github/workflows/docker-image-testing_armv7.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: CI armv7
 
 on:
   push:
diff --git a/Dockerfile b/Dockerfile
index e6a0470..8bd1607 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,24 @@
-# Build stage
+# npm packages
 FROM node:20-alpine AS builder
 
 WORKDIR /app
-COPY ./website /app
+COPY ./website/package.json /app
 RUN npm install
+
+# Build stage
+FROM node:20-alpine AS gen
+WORKDIR /app
+
+COPY --from=builder /app /app
+
+COPY ./website /app
 RUN npm run generate
 
 # Serve stage
 FROM nginx:alpine3.17-slim
 
 # Copy built files from Vite's dist folder
-COPY --from=builder /app/.output/public /usr/share/nginx/html
+COPY --from=gen /app/.output/public /usr/share/nginx/html
 #COPY --from=builder /app/tranga-website/media /usr/share/nginx/html/media
 COPY ./nginx /etc/nginx