Merge pull request #2 from linuxserver-labs/actions-v6

linuxserver-labs · Apr 12, 2022 · c9762de · c9762de
2 parents a8bebf2 + 0d580bd
commit c9762de
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v5
+    uses: linuxserver-labs/docker-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
@@ -7,10 +7,11 @@ on:
 
 jobs:
   call-workflow:
-    uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v5
+    uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "plextraktsync"
       release_type: "script"
+      target-arch: "all"
     secrets:
       scarf_token: ${{ secrets.SCARF_TOKEN }}
diff --git 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: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v5
+    uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v6
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "plextraktsync"

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 "arm64v8" {
+  inherits = ["image"]
+  dockerfile = "Dockerfile.aarch64"
+  platforms = [
+    "linux/arm64"
+  ]
+}
+
+target "arm32v7" {
+  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",