Merge pull request #12 from TheSpad/actions-v6

thespad · Apr 7, 2022 · 632f8e1 · 632f8e1
2 parents b646767 + 58a77f5
commit 632f8e1
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 7 deletions.
diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
@@ -6,9 +6,9 @@ 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 }}
+      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
@@ -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 }}
+      repo_owner: "thespad"
       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
@@ -7,9 +7,9 @@ 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 }}
+      repo_owner: "thespad"
       app_name: "dive"
       release_type: "github"
       release_url: "https://api.github.com/repos/wagoodman/dive"

diff --git 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",