From aecdff6758b44f12294ae4e24add4c8945fc313f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Birm=C3=A9?= <jonas.birme@eyevinn.se>
Date: Thu, 29 Aug 2024 11:47:26 +0200
Subject: [PATCH 1/3] fix: extract gui version from image tag

---
 .github/workflows/dispatch.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index f539aadb..b71005f6 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -41,12 +41,18 @@ jobs:
             latest=false
           tags: type=sha
 
+      - name: Extract GUI version
+        id: gui
+        env:
+          TAGS: ${{ steps.meta.outputs.tags }}
+        run: echo "::set-output name=version::${TAGS##*:}"
+        
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
           build-args: |
-            GUI_VERSION=${{ steps.meta.outputs.tags }}
+            GUI_VERSION=${{ steps.gui.outputs.version }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

From e09eaa20144aee87953ae3c70f647af48c337aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Birm=C3=A9?= <jonas.birme@eyevinn.se>
Date: Thu, 29 Aug 2024 13:28:32 +0200
Subject: [PATCH 2/3] fix: build arm image in addition

---
 .github/workflows/dispatch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index b71005f6..f45d7293 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -56,3 +56,4 @@ jobs:
             GUI_VERSION=${{ steps.gui.outputs.version }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

From 87321f97f5bcfb538dbda3198c5027c286c9622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Birm=C3=A9?= <jonas.birme@eyevinn.se>
Date: Thu, 29 Aug 2024 14:01:22 +0200
Subject: [PATCH 3/3] fixup! fix: build arm image in addition

---
 .github/workflows/dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index f45d7293..276cbb37 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -46,7 +46,7 @@ jobs:
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
         run: echo "::set-output name=version::${TAGS##*:}"
-        
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with: