Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit ac1f8b4

Browse files
authored
Merge pull request #16 from linuxserver-labs/actions-v6
Bump actions to v6
2 parents 2349e17 + aa50044 commit ac1f8b4

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed

.github/workflows/call-baseimage-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v5
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "omada-controller"

.github/workflows/call-build-image.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ on:
66

77
jobs:
88
call-workflow:
9-
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v5
9+
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6
1010
with:
1111
repo_owner: ${{ github.repository_owner }}
1212
app_name: "omada-controller"
1313
release_type: "script"
14+
target-arch: "64"
1415
secrets:
1516
scarf_token: ${{ secrets.SCARF_TOKEN }}

.github/workflows/call-check-and-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v5
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v6
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "omada-controller"

docker-bake.hcl

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,51 @@ target "image-local" {
1313
output = ["type=docker"]
1414
}
1515

16-
target "image-all" {
16+
target "amd64" {
17+
inherits = ["image"]
18+
dockerfile = "Dockerfile"
19+
platforms = [
20+
"linux/amd64"
21+
]
22+
}
23+
24+
target "arm64v8" {
25+
inherits = ["image"]
26+
dockerfile = "Dockerfile.aarch64"
27+
platforms = [
28+
"linux/arm64"
29+
]
30+
}
31+
32+
target "arm32v7" {
33+
inherits = ["image"]
34+
dockerfile = "Dockerfile.armhf"
35+
platforms = [
36+
"linux/arm/v7"
37+
]
38+
}
39+
40+
target "64" {
1741
inherits = ["image"]
1842
platforms = [
1943
"linux/amd64",
2044
"linux/arm64"
2145
]
2246
}
47+
48+
target "arm" {
49+
inherits = ["image"]
50+
platforms = [
51+
"linux/arm64",
52+
"linux/arm/v7"
53+
]
54+
}
55+
56+
target "all" {
57+
inherits = ["image"]
58+
platforms = [
59+
"linux/amd64",
60+
"linux/arm64",
61+
"linux/arm/v7"
62+
]
63+
}

0 commit comments

Comments
 (0)