From ebfb7d2cb796bf2b9077439997f4dcd3d99f3fe7 Mon Sep 17 00:00:00 2001
From: Thomas Quandalle <cedric@kerberos.io>
Date: Fri, 17 Jun 2022 20:38:33 +0200
Subject: [PATCH] make multi archbuilds

---
 .github/workflows/docker-dev.yml | 26 +++++++++++++-------------
 .github/workflows/docker.yml     | 29 ++++++++++++++++-------------
 Dockerfile                       |  2 +-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml
index c5646e2..4360022 100644
--- a/.github/workflows/docker-dev.yml
+++ b/.github/workflows/docker-dev.yml
@@ -13,17 +13,17 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build
-      uses: docker/build-push-action@v3
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
       with:
-        push: false
-        tags: kerberos/agent:beta-dev
-    - name: Scan
-      uses: Azure/container-scan@v0
-      with:
-        image-name: kerberos/agent:beta-dev
-    - name: Push
-      uses: docker/build-push-action@v3
-      with:
-        push: true
-        tags: kerberos/agent:beta-dev
+        buildx-version: latest
+        qemu-version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Run Buildx
+      run: docker buildx build --platform linux/amd64 -t kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7) --push . 
+    - name: Create new and append to manifest
+      run: docker buildx imagetools create -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7)
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 65b0fb3..7029fde 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,23 +7,26 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        architecture: [amd64, arm64, armv7, armv6]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build
-      uses: docker/build-push-action@v3
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
       with:
-        push: false
-        tags: kerberos/agent:beta
-    - name: Scan
-      uses: Azure/container-scan@v0
-      with:
-        image-name: kerberos/agent:beta
-    - name: Push
-      uses: docker/build-push-action@v3
-      with:
-        push: true
-        tags: kerberos/agent:beta
+        buildx-version: latest
+        qemu-version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Run Buildx
+      run: docker buildx build --platform linux/amd64 -t kerberos/agent-multiarch:${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7) --push . 
+    - name: Create new and append to manifest
+      run: docker buildx imagetools create -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-multiarch:${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7)
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index f40c327..69cb3fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM kerberos/debian-opencv-ffmpeg:1.0.2309512445 AS builder
+FROM kerberos/base:e4b4057 AS builder
 LABEL AUTHOR=Kerberos.io
 
 ENV GOROOT=/usr/local/go