From 97f7ca654e1437b07f8183df730713610330cfc3 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 1 Apr 2022 20:33:52 +0100
Subject: [PATCH 1/3] Bump actions to v6

---
 .github/workflows/call-baseimage-update.yml  | 2 +-
 .github/workflows/call-build-image.yml       | 3 ++-
 .github/workflows/call-check-and-release.yml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
index 8a72561..663398d 100644
--- a/.github/workflows/call-baseimage-update.yml
+++ b/.github/workflows/call-baseimage-update.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v5
+    uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v6
     with:
       repo_owner: ${{ github.repository_owner }}
       baseimage: "alpine"
diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml
index 07ef348..52eec7e 100644
--- a/.github/workflows/call-build-image.yml
+++ b/.github/workflows/call-build-image.yml
@@ -7,12 +7,13 @@ on:
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/build-image.yml@v5
+    uses: thespad/actions/.github/workflows/build-image.yml@v6
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "dive"
       release_type: "github"
       release_url: "https://api.github.com/repos/wagoodman/dive"
       dockerhub_user: "thespad"
+      target-arch: "all"      
     secrets:
       dockerhub_password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/call-check-and-release.yml b/.github/workflows/call-check-and-release.yml
index 8e0098f..6f1408b 100644
--- a/.github/workflows/call-check-and-release.yml
+++ b/.github/workflows/call-check-and-release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/check-and-release.yml@v5
+    uses: thespad/actions/.github/workflows/check-and-release.yml@v6
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "dive"

From e068c12c806bef991dd1b58e4a0da4bb8125f55b Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 6 Apr 2022 21:12:37 +0100
Subject: [PATCH 2/3] Update bake definition file

---
 docker-bake.hcl | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5b9e811..9da8d98 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -13,7 +13,47 @@ target "image-local" {
   output = ["type=docker"]
 }
 
-target "image-all" {
+target "amd64" {
+  inherits = ["image"]
+  dockerfile = "Dockerfile"
+  platforms = [
+    "linux/amd64"
+  ]
+}
+
+target "aarch64" {
+  inherits = ["image"]
+  dockerfile = "Dockerfile.aarch64"
+  platforms = [
+    "linux/arm64"
+  ]
+}
+
+target "armhf" {
+  inherits = ["image"]
+  dockerfile = "Dockerfile.armhf"
+  platforms = [
+    "linux/arm/v7"
+  ]
+}
+
+target "64" {
+  inherits = ["image"]
+  platforms = [
+    "linux/amd64",
+    "linux/arm64"
+  ]
+}
+
+target "arm" {
+  inherits = ["image"]
+  platforms = [
+    "linux/arm64",
+    "linux/arm/v7"
+  ]
+}
+
+target "all" {
   inherits = ["image"]
   platforms = [
     "linux/amd64",

From 58a77f5433a3b3d93b6d75593b96c548b5dee981 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 6 Apr 2022 21:13:02 +0100
Subject: [PATCH 3/3] Update workflows for new v6 changes

---
 .github/workflows/call-baseimage-update.yml  | 2 +-
 .github/workflows/call-build-image.yml       | 2 +-
 .github/workflows/call-check-and-release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
index 663398d..fda7118 100644
--- a/.github/workflows/call-baseimage-update.yml
+++ b/.github/workflows/call-baseimage-update.yml
@@ -8,7 +8,7 @@ jobs:
   call-workflow:
     uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v6
     with:
-      repo_owner: ${{ github.repository_owner }}
+      repo_owner: "thespad"
       baseimage: "alpine"
       basebranch: "3.15"
       app_name: "dive"
diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml
index 52eec7e..39d3e32 100644
--- a/.github/workflows/call-build-image.yml
+++ b/.github/workflows/call-build-image.yml
@@ -9,7 +9,7 @@ jobs:
   call-workflow:
     uses: thespad/actions/.github/workflows/build-image.yml@v6
     with:
-      repo_owner: ${{ github.repository_owner }}
+      repo_owner: "thespad"
       app_name: "dive"
       release_type: "github"
       release_url: "https://api.github.com/repos/wagoodman/dive"
diff --git a/.github/workflows/call-check-and-release.yml b/.github/workflows/call-check-and-release.yml
index 6f1408b..e4331a3 100644
--- a/.github/workflows/call-check-and-release.yml
+++ b/.github/workflows/call-check-and-release.yml
@@ -9,7 +9,7 @@ jobs:
   call-workflow:
     uses: thespad/actions/.github/workflows/check-and-release.yml@v6
     with:
-      repo_owner: ${{ github.repository_owner }}
+      repo_owner: "thespad"
       app_name: "dive"
       release_type: "github"
       release_url: "https://api.github.com/repos/wagoodman/dive"