From dc927fab41bf56d028cd3b07991765ec03b16456 Mon Sep 17 00:00:00 2001
From: Tobias Bielohlawek <rngtng@users.noreply.github.com>
Date: Wed, 21 Jun 2023 15:42:45 +0200
Subject: [PATCH] Enable multi arch docker image build

I figured the docker image is only build for amd64 architectures.

With this change, multi arch is enabled by using the official docker build actions for docker login, build & push.
---
 .github/workflows/publish-docker.yml | 32 +++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 2e145347..67ca428e 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
  
 env:
-  DOCKER_TAG_IMAGE: "ghcr.io/github/pages-gem"
+  REGISTRY: ghcr.io
 
 jobs:
   build:
@@ -17,19 +17,27 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get Docker Metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.DOCKER_TAG_IMAGE }}
-
-      - name: Build Docker Image
-        run: |
-          docker build -t ${{ steps.meta.outputs.tags }} -f Dockerfile .
-
-      - name: Push to Container Registry
-        if: github.event_name != 'pull_request'
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} https://ghcr.io --password-stdin
-          docker push ${{ steps.meta.outputs.tags }}
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
 
+      - name: Build Docker Image and Push to Container Registry
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}