Skip to content

Commit 2d1ef9f

Browse files
authored
Merge pull request #3 from linuxserver-labs/actionsv7
2 parents e18c208 + 4b18ee6 commit 2d1ef9f

File tree

9 files changed

+722
-17
lines changed

9 files changed

+722
-17
lines changed

.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file is globally distributed to all container image projects from
2+
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
3+
4+
# top-most EditorConfig file
5+
root = true
6+
7+
# Unix-style newlines with a newline ending every file
8+
[*]
9+
end_of_line = lf
10+
insert_final_newline = true
11+
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
12+
trim_trailing_whitespace = false
13+
14+
[{Dockerfile*,**.yml}]
15+
indent_style = space
16+
indent_size = 2
17+
18+
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**,root/etc/s6-overlay/s6-rc.d/**}]
19+
indent_style = space
20+
indent_size = 4

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "daily"

.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@v6
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v7.0.2
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
baseimage: "alpine"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6
10+
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v7.0.2
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "webhook"
1414
release_type: "github"
1515
release_url: "https://api.github.com/repos/adnanh/webhook"
1616
target-arch: "64"
1717
secrets:
18-
scarf_token: ${{ secrets.SCARF_TOKEN }}
18+
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_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@v6
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v7.0.2
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "webhook"

.github/workflows/permissions.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Permission check
2+
on:
3+
pull_request_target:
4+
paths:
5+
- '**/run'
6+
- '**/finish'
7+
- '**/check'
8+
jobs:
9+
permission_check:
10+
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/stale@v1
13+
- uses: actions/stale@v9
1414
with:
1515
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
1616
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

LICENSE

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

docker-bake.hcl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ target "arm64v8" {
2929
]
3030
}
3131

32-
target "arm32v7" {
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)