Skip to content

Commit 8ac4083

Browse files
authored
Merge pull request #35 from thespad/actionsv8
Bump actions to v8
2 parents 4f8c348 + a7db78f commit 8ac4083

6 files changed

+32
-17
lines changed

.dockerignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.git
2+
.gitignore
3+
.github
4+
.gitattributes
5+
READMETEMPLATE.md
6+
README.md

.editorconfig

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
# Unix-style newlines with a newline ending every file
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
9+
trim_trailing_whitespace = false
10+
11+
[{Dockerfile*,**.yml}]
12+
indent_style = space
13+
indent_size = 2
14+
15+
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
16+
indent_style = space
17+
indent_size = 4

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v7
10+
uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v8.0.0
1111
with:
1212
repo_owner: "thespad"
1313
baseimage: "alpine"

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ on:
44
release:
55
types: [ published ]
66
pull_request:
7+
workflow_dispatch:
78

89
jobs:
910
call-workflow:
10-
uses: thespad/actions/.github/workflows/build-image.yml@v7
11+
uses: thespad/actions/.github/workflows/build-image.yml@v8.0.0
1112
with:
1213
repo_owner: "thespad"
1314
app_name: "py-kms"
1415
release_type: "github_commit"
1516
release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms/commits/master"
1617
dockerhub_user: "thespad"
17-
target-arch: "64"
18+
target-arch: "64"
19+
sign_image: false
1820
secrets:
1921
dockerhub_password: ${{ secrets.DOCKER_PASSWORD }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check for update and release
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '0 11 * * *'
6+
- cron: '30 1 * * *'
77

88
jobs:
99
call-workflow:

docker-bake.hcl

+3-13
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,14 @@ target "amd64" {
2121
]
2222
}
2323

24-
target "aarch64" {
24+
target "arm64v8" {
2525
inherits = ["image"]
2626
dockerfile = "Dockerfile.aarch64"
2727
platforms = [
2828
"linux/arm64"
2929
]
3030
}
3131

32-
target "armhf" {
33-
inherits = ["image"]
34-
dockerfile = "Dockerfile.armhf"
35-
platforms = [
36-
"linux/arm/v7"
37-
]
38-
}
39-
4032
target "64" {
4133
inherits = ["image"]
4234
platforms = [
@@ -48,16 +40,14 @@ target "64" {
4840
target "arm" {
4941
inherits = ["image"]
5042
platforms = [
51-
"linux/arm64",
52-
"linux/arm/v7"
43+
"linux/arm64"
5344
]
5445
}
5546

5647
target "all" {
5748
inherits = ["image"]
5849
platforms = [
5950
"linux/amd64",
60-
"linux/arm64",
61-
"linux/arm/v7"
51+
"linux/arm64"
6252
]
6353
}

0 commit comments

Comments
 (0)