Build new docker image (#1494)

Build the new combined Docker image that serves both backend and
frontend

Author: evroon

.github/workflows/docker-build.yml

@@ -2,6 +2,7 @@ name: docker
 
 permissions:
   contents: read
+  packages: read
 
 on:
   workflow_dispatch:
@@ -10,6 +11,7 @@ on:
       - '.github/**'
       - 'backend/**'
       - 'frontend/**'
+      - 'Dockerfile'
       - 'docker-compose.yml'
   push:
     branches:
@@ -18,9 +20,6 @@ on:
 jobs:
   build-and-push-image:
     runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      packages: read
 
     steps:
       - name: Checkout repository
@@ -35,8 +34,6 @@ jobs:
           context: frontend
           push: false
           file: frontend/Dockerfile
-          tags: ${{ steps.meta_frontend.outputs.tags }}
-          labels: ${{ steps.meta_frontend.outputs.labels }}
           # Don't build linux/arm64/v8 because it's very slow with QEMU
           platforms: linux/amd64
 
@@ -46,7 +43,14 @@ jobs:
           context: backend
           push: false
           file: backend/Dockerfile
-          tags: ${{ steps.meta_backend.outputs.tags }}
-          labels: ${{ steps.meta_backend.outputs.labels }}
+          # Don't build linux/arm64/v8 because it's very slow with QEMU
+          platforms: linux/amd64
+
+      - name: Build combined Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          push: false
+          file: Dockerfile
           # Don't build linux/arm64/v8 because it's very slow with QEMU
           platforms: linux/amd64

.github/workflows/docker-publish.yml

@@ -13,6 +13,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME_FRONTEND: ${{ github.repository }}-frontend
   IMAGE_NAME_BACKEND: ${{ github.repository }}-backend
+  IMAGE_NAME_COMBINED: ${{ github.repository }}
 
 jobs:
   build-and-push-image:
@@ -50,6 +51,12 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BACKEND }}
 
+      - name: Extract metadata (tags, labels) for combined Docker image
+        id: meta_combined
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_COMBINED }}
+
       - name: Build and push frontend Docker image
         uses: docker/build-push-action@v6
         with:
@@ -69,3 +76,13 @@ jobs:
           tags: ${{ steps.meta_backend.outputs.tags }}
           labels: ${{ steps.meta_backend.outputs.labels }}
           platforms: linux/amd64,linux/arm64/v8
+
+      - name: Build and push combined Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          push: true
+          file: Dockerfile
+          tags: ${{ steps.meta_combined.outputs.tags }}
+          labels: ${{ steps.meta_combined.outputs.labels }}
+          platforms: linux/amd64,linux/arm64/v8