From 5b4be4f1079f5a072184346d4d2be5ddf3c3aeda Mon Sep 17 00:00:00 2001
From: Martin Braun <braun@neuroforge.de>
Date: Fri, 15 Sep 2023 23:08:35 +0200
Subject: [PATCH] use docker manifest to build final docker volume plugin

---
 .github/workflows/main.yaml   |  4 +++-
 .github/workflows/release.yml | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index d91c087..a270e79 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -39,4 +39,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - run: make create ARCH=${{ matrix.arch }}
+      - run: |
+          make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-arm64 ARCH=arm64
+          make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-amd64 ARCH=amd64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68ef527..28fe5b9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,4 +44,13 @@ jobs:
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - run: make push PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-${{ matrix.arch }} ARCH=${{ matrix.arch }}
\ No newline at end of file
+      - run: |
+          make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-arm64 ARCH=arm64
+          make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-amd64 ARCH=amd64
+
+      - run: |
+          docker manifest create ghcr.io/${{ github.repository_owner }}/${{ github.repository }} \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ github.repository }}-$RELEASE_VERSION-arm64 \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ github.repository }}-$RELEASE_VERSION-amd64
+          
+          docker push ghcr.io/${{ github.repository_owner }}/${{ github.repository }}