Skip to content

Commit

Permalink
Merge pull request #35 from thespad/actionsv8
Browse files Browse the repository at this point in the history
Bump actions to v8
  • Loading branch information
thespad authored Apr 28, 2024
2 parents 4f8c348 + a7db78f commit 8ac4083
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.git
.gitignore
.github
.gitattributes
READMETEMPLATE.md
README.md
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
trim_trailing_whitespace = false

[{Dockerfile*,**.yml}]
indent_style = space
indent_size = 2

[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
indent_style = space
indent_size = 4
2 changes: 1 addition & 1 deletion .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-workflow:
uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v7
uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v8.0.0
with:
repo_owner: "thespad"
baseimage: "alpine"
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ on:
release:
types: [ published ]
pull_request:
workflow_dispatch:

jobs:
call-workflow:
uses: thespad/actions/.github/workflows/build-image.yml@v7
uses: thespad/actions/.github/workflows/build-image.yml@v8.0.0
with:
repo_owner: "thespad"
app_name: "py-kms"
release_type: "github_commit"
release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms/commits/master"
dockerhub_user: "thespad"
target-arch: "64"
target-arch: "64"
sign_image: false
secrets:
dockerhub_password: ${{ secrets.DOCKER_PASSWORD }}
2 changes: 1 addition & 1 deletion .github/workflows/call-check-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check for update and release
on:
workflow_dispatch:
schedule:
- cron: '0 11 * * *'
- cron: '30 1 * * *'

jobs:
call-workflow:
Expand Down
16 changes: 3 additions & 13 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,14 @@ target "amd64" {
]
}

target "aarch64" {
target "arm64v8" {
inherits = ["image"]
dockerfile = "Dockerfile.aarch64"
platforms = [
"linux/arm64"
]
}

target "armhf" {
inherits = ["image"]
dockerfile = "Dockerfile.armhf"
platforms = [
"linux/arm/v7"
]
}

target "64" {
inherits = ["image"]
platforms = [
Expand All @@ -48,16 +40,14 @@ target "64" {
target "arm" {
inherits = ["image"]
platforms = [
"linux/arm64",
"linux/arm/v7"
"linux/arm64"
]
}

target "all" {
inherits = ["image"]
platforms = [
"linux/amd64",
"linux/arm64",
"linux/arm/v7"
"linux/arm64"
]
}

0 comments on commit 8ac4083

Please sign in to comment.