From 382b295bc8127e13f044ce2878bd55a3172de100 Mon Sep 17 00:00:00 2001
From: David Thorpe <djt@mutablelogic.com>
Date: Wed, 6 Oct 2021 15:19:22 +0200
Subject: [PATCH] Updated manifest creation

---
 .github/workflows/make-image.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/make-image.yaml b/.github/workflows/make-image.yaml
index 057c700..c85f7e1 100644
--- a/.github/workflows/make-image.yaml
+++ b/.github/workflows/make-image.yaml
@@ -75,8 +75,17 @@ jobs:
         id: tags
         run: |
           echo ::set-output name=manifest::ghcr.io/${{ github.repository_owner }}/runner-image
+      - name: Login
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Manifest
         run: |
-          docker manifest create ${{ steps.tags.outputs.manifest }}
+          docker pull ${{ steps.tags.outputs.manifest }}-arm
+          docker pull ${{ steps.tags.outputs.manifest }}-arm64
+          docker manifest create ${{ steps.tags.outputs.manifest }} \
+            --amend ${{ steps.tags.outputs.manifest }}-arm \
+            --amend ${{ steps.tags.outputs.manifest }}-arm64
           docker push ${{ steps.tags.outputs.manifest }}
-