From 136a7410bcc78f33238f4d51b1b7cb67ce7783c5 Mon Sep 17 00:00:00 2001
From: Christian Kotzbauer <christian.kotzbauer@gmail.com>
Date: Sat, 11 Dec 2021 15:49:29 +0100
Subject: [PATCH] build: fix arm build

Signed-off-by: Christian Kotzbauer <christian.kotzbauer@gmail.com>
---
 .github/workflows/test.yml | 48 ++++++++++++++++++++++++++++++++------
 e2e/test.sh                |  2 +-
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d03899..27eb2e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,15 +13,19 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: '1.17'
+
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Install Kubebuilder
         uses: RyanSiu1995/kubebuilder-action@v1.2
         with:
           version: 3.1.0
+
       - name: Execute Tests
         run: make test
 
+
   e2e-test:
     runs-on: ubuntu-latest
     strategy:
@@ -36,14 +40,29 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: '1.17'
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Checkout
         uses: actions/checkout@v2
+
       - uses: azure/setup-kubectl@v1
         with:
           version: 'v${{ matrix.kubernetes-version }}'
+
       - name: Execute Tests
         run: make e2e-test -e K8S_VERSION=${{ matrix.kubernetes-version }}
 
+        
   build-image:
     runs-on: ubuntu-latest
     steps:
@@ -51,16 +70,31 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: '1.17'
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Build docker-image
-        uses: elgohr/Publish-Docker-Github-Action@master
+
+      - name: Build image
+        uses: docker/build-push-action@v2
         with:
-          name: ckotzbauer/access-manager
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          tags: "latest"
-          no_push: true
+          context: .
+          push: false
+          load: true
+          platforms: linux/amd64
+          tags: |
+            ckotzbauer/access-manager:latest
+
       - name: Container scan
         uses: azure/container-scan@v0
         with:
diff --git a/e2e/test.sh b/e2e/test.sh
index 2519b8e..44765c4 100644
--- a/e2e/test.sh
+++ b/e2e/test.sh
@@ -10,7 +10,7 @@ ${KIND} create cluster --image kindest/node:v${K8S_VERSION}
 ${KIND} get kubeconfig >e2e/kind-kubeconfig
 export KUBECONFIG=e2e/kind-kubeconfig
 
-docker build -t ckotzbauer/access-manager:latest .
+docker buildx build --platform=linux/amd64 -t ckotzbauer/access-manager:latest .
 ${KIND} load docker-image ckotzbauer/access-manager:latest
 
 make install deploy