From 67b1309d3b2f42ef70a8283e7b53def197110d21 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Tue, 18 Mar 2025 15:03:58 +0100
Subject: [PATCH 01/11] Switch to artifact registry

---
 .github/workflows/build.yml  | 26 +++++++++++++-------------
 .github/workflows/deploy.yml | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02a7c371..f85950c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
         id: docker-metadata
         uses: docker/metadata-action@v4
         with:
-          images: eu.gcr.io/${{ secrets.gke-project }}/website/php
+          images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php
           tags: |
             type=raw,value=${{ github.sha }},priority=9999
             ${{ inputs.tags }}
@@ -78,10 +78,10 @@ jobs:
           tags: ${{ steps.docker-metadata.outputs.tags }}
           labels: ${{ steps.docker-metadata.outputs.labels }}
           cache-from: |
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:latest
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:latest
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:${{ github.sha }}
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
           cache-to: type=inline
     outputs:
       version: ${{ github.sha }}
@@ -115,7 +115,7 @@ jobs:
         id: docker-metadata
         uses: docker/metadata-action@v4
         with:
-          images: eu.gcr.io/${{ secrets.gke-project }}/website/caddy
+          images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy
           tags: |
             type=raw,value=${{ github.sha }},priority=9999
             ${{ inputs.tags }}
@@ -129,10 +129,10 @@ jobs:
           tags: ${{ steps.docker-metadata.outputs.tags }}
           labels: ${{ steps.docker-metadata.outputs.labels }}
           cache-from: |
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:latest
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:latest
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:${{ github.sha }}
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
           cache-to: type=inline
     outputs:
       version: ${{ github.sha }}
@@ -166,7 +166,7 @@ jobs:
         id: docker-metadata
         uses: docker/metadata-action@v4
         with:
-          images: eu.gcr.io/${{ secrets.gke-project }}/website/pwa
+          images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa
           tags: |
             type=raw,value=${{ github.sha }},priority=9999
             ${{ inputs.tags }}
@@ -196,8 +196,8 @@ jobs:
           build-args: |
             NEXT_ROOT_URL=${{ env.URL }} 
           cache-from: |
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/pwa:latest
-            type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/pwa:${{ github.sha }}
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:latest
+            type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:${{ github.sha }}
           cache-to: type=inline
           secrets: |
             "GITHUB_KEY=${{ secrets.gh-key }}"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6f7ba73b..650e2a43 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -111,13 +111,13 @@ jobs:
               --atomic \
               --namespace=${{ env.NAMESPACE }} \
               --set=app.version=${{ github.sha }} \
-              --set=php.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/php \
+              --set=php.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php \
               --set=php.image.tag=${{ inputs.docker-images-version }} \
               --set=php.image.pullPolicy=Always \
-              --set=caddy.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/caddy \
+              --set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \
               --set=caddy.image.tag=${{ inputs.docker-images-version }} \
               --set=caddy.image.pullPolicy=Always \
-              --set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
+              --set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \
               --set=pwa.image.tag=${{ inputs.docker-images-version }} \
               --set=pwa.image.pullPolicy=Always \
               --set=bucket.s3Upstream=storage.googleapis.com \
@@ -150,13 +150,13 @@ jobs:
                 --atomic \
                 --namespace=${{ env.NAMESPACE }} \
                 --set=app.version=${{ github.sha }} \
-                --set=php.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/php \
+                --set=php.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php \
                 --set=php.image.tag=${{ inputs.docker-images-version }} \
                 --set=php.image.pullPolicy=Always \
-                --set=caddy.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/caddy \
+                --set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \
                 --set=caddy.image.tag=${{ inputs.docker-images-version }} \
                 --set=caddy.image.pullPolicy=Always \
-                --set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
+                --set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \
                 --set=pwa.image.tag=${{ inputs.docker-images-version }} \
                 --set=pwa.image.pullPolicy=Always \
                 --set=php.corsAllowOrigin="^$(echo "${{ join(fromJSON(env.CORS), '|') }}" | sed 's/\./\\./g')$" \

From add684c046d2ce07fe2f3df5696e3a5483b44d98 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Tue, 18 Mar 2025 15:38:28 +0100
Subject: [PATCH 02/11] fix docker auth

---
 .github/workflows/build.yml | 57 +++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f85950c7..47fe2afa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,14 +48,23 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      - name: Auth gcloud
-        uses: google-github-actions/auth@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Auth gcloud
+        id: auth
+        uses: google-github-actions/auth@v2
         with:
+          token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      - name: Setup gcloud
-        uses: google-github-actions/setup-gcloud@v1
+      -
+        name: Login to GAR
+        uses: docker/login-action@v3
         with:
-          project_id: ${{ secrets.gke-project }}
+          registry: europe-west1-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
       - name: Configure gcloud
         run: |
           gcloud --quiet auth configure-docker
@@ -99,14 +108,23 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      - name: Auth gcloud
-        uses: google-github-actions/auth@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Auth gcloud
+        id: auth
+        uses: google-github-actions/auth@v2
         with:
+          token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      - name: Setup gcloud
-        uses: google-github-actions/setup-gcloud@v1
+      -
+        name: Login to GAR
+        uses: docker/login-action@v3
         with:
-          project_id: ${{ secrets.gke-project }}
+          registry: europe-west1-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
       - name: Configure gcloud
         run: |
           gcloud --quiet auth configure-docker
@@ -150,14 +168,23 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      - name: Auth gcloud
-        uses: google-github-actions/auth@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Auth gcloud
+        id: auth
+        uses: google-github-actions/auth@v2
         with:
+          token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      - name: Setup gcloud
-        uses: google-github-actions/setup-gcloud@v1
+      -
+        name: Login to GAR
+        uses: docker/login-action@v3
         with:
-          project_id: ${{ secrets.gke-project }}
+          registry: europe-west1-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
       - name: Configure gcloud
         run: |
           gcloud --quiet auth configure-docker

From 44d6e037d06131d4196ca1f82285735f50732843 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Tue, 18 Mar 2025 16:07:58 +0100
Subject: [PATCH 03/11] Fix build error

---
 pwa/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index 71fb5b55..1684b61d 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -5,6 +5,9 @@ FROM node:18-alpine as builder_base
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat bash git
 
+RUN groupadd -r nodejs || true  
+RUN useradd -r -g nodejs nextjs || true 
+
 WORKDIR /srv/app
 
 RUN npm install --global corepack@latest && \

From db3853b3438dd1f3a8ba227466cb8d0e5eddecda Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Tue, 18 Mar 2025 16:11:15 +0100
Subject: [PATCH 04/11] Fix build error

---
 pwa/Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index 1684b61d..bf5fc623 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -5,9 +5,6 @@ FROM node:18-alpine as builder_base
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat bash git
 
-RUN groupadd -r nodejs || true  
-RUN useradd -r -g nodejs nextjs || true 
-
 WORKDIR /srv/app
 
 RUN npm install --global corepack@latest && \
@@ -50,6 +47,9 @@ RUN pnpm fetch
 COPY --link . .
 RUN pnpm install --offline --frozen-lock
 
+RUN groupadd -r nodejs || true  
+RUN useradd -r -g nodejs nextjs || true 
+
 # Development image
 FROM deps as dev
 COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
@@ -67,6 +67,9 @@ CMD ["sh", "-c", "pnpm install --offline --frozen-lock; pnpm dev"]
 
 FROM builder_base AS builder
 
+RUN groupadd -r nodejs || true  
+RUN useradd -r -g nodejs nextjs || true 
+
 COPY --link . .
 COPY --from=deps --link /srv/app/node_modules ./node_modules
 COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
@@ -114,6 +117,9 @@ ENV NODE_ENV production
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
+RUN groupadd -r nodejs || true  
+RUN useradd -r -g nodejs nextjs || true 
+
 COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size

From 669722737902c9d9da93cd931445d000d972d443 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 09:52:24 +0100
Subject: [PATCH 05/11] revert dockerfile

---
 pwa/Dockerfile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index bf5fc623..71fb5b55 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -47,9 +47,6 @@ RUN pnpm fetch
 COPY --link . .
 RUN pnpm install --offline --frozen-lock
 
-RUN groupadd -r nodejs || true  
-RUN useradd -r -g nodejs nextjs || true 
-
 # Development image
 FROM deps as dev
 COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
@@ -67,9 +64,6 @@ CMD ["sh", "-c", "pnpm install --offline --frozen-lock; pnpm dev"]
 
 FROM builder_base AS builder
 
-RUN groupadd -r nodejs || true  
-RUN useradd -r -g nodejs nextjs || true 
-
 COPY --link . .
 COPY --from=deps --link /srv/app/node_modules ./node_modules
 COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
@@ -117,9 +111,6 @@ ENV NODE_ENV production
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
-RUN groupadd -r nodejs || true  
-RUN useradd -r -g nodejs nextjs || true 
-
 COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size

From 5defe61e5868a5c90267aa3b2c0ec2cece1d76b4 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 12:30:45 +0100
Subject: [PATCH 06/11] switch on user id in chown

---
 pwa/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index 71fb5b55..975c51da 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -115,9 +115,9 @@ COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/standalone ./
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/public/* ./public/
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/static ./.next/static
+COPY --from=builder --link --chown=1001 /srv/app/.next/standalone ./
+COPY --from=builder --link --chown=1001 /srv/app/public/* ./public/
+COPY --from=builder --link --chown=1001 /srv/app/.next/static ./.next/static
 
 USER nextjs
 

From 4f72635269ef8aeadaeb32360132012a70cb26c3 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 12:55:45 +0100
Subject: [PATCH 07/11] switch on user id in chown

---
 pwa/Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index 975c51da..dc862b21 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -115,9 +115,13 @@ COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --link --chown=1001 /srv/app/.next/standalone ./
-COPY --from=builder --link --chown=1001 /srv/app/public/* ./public/
-COPY --from=builder --link --chown=1001 /srv/app/.next/static ./.next/static
+COPY --from=builder --link /srv/app/.next/standalone ./
+COPY --from=builder --link /srv/app/public/* ./public/
+COPY --from=builder --link /srv/app/.next/static ./.next/static
+
+RUN chown -R 1001:1001 ./
+RUN chown -R 1001:1001 ./public/
+RUN chown -R 1001:1001 ./.next/static
 
 USER nextjs
 

From e3d5b779641bf3008690a93953513ba27dfbafef Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 13:03:47 +0100
Subject: [PATCH 08/11] switch on user id in chown

---
 pwa/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index dc862b21..c1de19f8 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -119,9 +119,9 @@ COPY --from=builder --link /srv/app/.next/standalone ./
 COPY --from=builder --link /srv/app/public/* ./public/
 COPY --from=builder --link /srv/app/.next/static ./.next/static
 
-RUN chown -R 1001:1001 ./
-RUN chown -R 1001:1001 ./public/
-RUN chown -R 1001:1001 ./.next/static
+RUN chown -R nextjs:nodejs ./
+RUN chown -R nextjs:nodejs ./public/
+RUN chown -R nextjs:nodejs ./.next/static
 
 USER nextjs
 

From 6b033a65ca95ef4eed87c28ecd8023e6dbaaef13 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 14:53:47 +0100
Subject: [PATCH 09/11] Fix pwa build

---
 pwa/Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index c1de19f8..71fb5b55 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -115,13 +115,9 @@ COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --link /srv/app/.next/standalone ./
-COPY --from=builder --link /srv/app/public/* ./public/
-COPY --from=builder --link /srv/app/.next/static ./.next/static
-
-RUN chown -R nextjs:nodejs ./
-RUN chown -R nextjs:nodejs ./public/
-RUN chown -R nextjs:nodejs ./.next/static
+COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/standalone ./
+COPY --from=builder --link --chown=nextjs:nodejs /srv/app/public/* ./public/
+COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/static ./.next/static
 
 USER nextjs
 

From 43b0feb876437d4bfa2ebe02e534fce3b78a97e5 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Wed, 19 Mar 2025 14:57:34 +0100
Subject: [PATCH 10/11] Fix pwa build

---
 pwa/Dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pwa/Dockerfile b/pwa/Dockerfile
index 71fb5b55..3f4ce60d 100644
--- a/pwa/Dockerfile
+++ b/pwa/Dockerfile
@@ -49,11 +49,11 @@ RUN pnpm install --offline --frozen-lock
 
 # Development image
 FROM deps as dev
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./public/php-web.wasm
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./app/playground/utils/
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data.js /build/php-web.data.js
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.mjs /build/php-web.mjs
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data ./public/php-web.data
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./public/php-web.wasm
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./app/playground/utils/
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data.js /build/php-web.data.js
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.mjs /build/php-web.mjs
 RUN sed '/--pre-js/r /build/php-web.data.js' /build/php-web.mjs > ./app/playground/utils/php-web.mjs
 
 EXPOSE 3000
@@ -66,11 +66,11 @@ FROM builder_base AS builder
 
 COPY --link . .
 COPY --from=deps --link /srv/app/node_modules ./node_modules
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./public/php-web.wasm
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./app/playground/utils/
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data.js /build/php-web.data.js
-COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.mjs /build/php-web.mjs
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data ./public/php-web.data
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./public/php-web.wasm
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./app/playground/utils/
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data.js /build/php-web.data.js
+COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.mjs /build/php-web.mjs
 RUN sed '/--pre-js/r /build/php-web.data.js' /build/php-web.mjs > ./app/playground/utils/php-web.mjs
 
 ARG NEXT_ROOT_URL
@@ -115,9 +115,9 @@ COPY --from=builder --link /srv/app/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/standalone ./
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/public/* ./public/
-COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/static ./.next/static
+COPY --from=builder --link --chown=1001:1001 /srv/app/.next/standalone ./
+COPY --from=builder --link --chown=1001:1001 /srv/app/public/* ./public/
+COPY --from=builder --link --chown=1001:1001 /srv/app/.next/static ./.next/static
 
 USER nextjs
 

From 8f56726a86763c7c079593716f9bed2a81a6600c Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Tue, 13 May 2025 14:44:05 +0200
Subject: [PATCH 11/11] Fix line break

---
 .github/workflows/build.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47fe2afa..c571360d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,18 +48,15 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Auth gcloud
+      - name: Auth gcloud
         id: auth
         uses: google-github-actions/auth@v2
         with:
           token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      -
-        name: Login to GAR
+      - name: Login to GAR
         uses: docker/login-action@v3
         with:
           registry: europe-west1-docker.pkg.dev
@@ -108,18 +105,15 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Auth gcloud
+      - name: Auth gcloud
         id: auth
         uses: google-github-actions/auth@v2
         with:
           token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      -
-        name: Login to GAR
+      - name: Login to GAR
         uses: docker/login-action@v3
         with:
           registry: europe-west1-docker.pkg.dev
@@ -168,18 +162,15 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9.15
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Auth gcloud
+      - name: Auth gcloud
         id: auth
         uses: google-github-actions/auth@v2
         with:
           token_format: access_token
           credentials_json: ${{ secrets.gke-credentials }}
-      -
-        name: Login to GAR
+      - name: Login to GAR
         uses: docker/login-action@v3
         with:
           registry: europe-west1-docker.pkg.dev