From 398bf4b1311340bcca9befb8854b3b9692fb9f96 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 13 Apr 2022 14:58:23 +0100 Subject: [PATCH 1/3] Bump actions to v6 --- .github/workflows/call-baseimage-update.yml | 17 ++++++++ .github/workflows/call-build-image.yml | 6 ++- .github/workflows/call-check-and-release.yml | 3 +- README.md | 3 ++ docker-bake.hcl | 44 +++++++++++++++++++- 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/call-baseimage-update.yml diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml new file mode 100644 index 0000000..7a8bdf7 --- /dev/null +++ b/.github/workflows/call-baseimage-update.yml @@ -0,0 +1,17 @@ +name: Check for base image updates + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 0' + +jobs: + call-workflow: + uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6 + with: + repo_owner: ${{ github.repository_owner }} + baseimage: "alpine" + basebranch: "3.15" + app_name: "webhook" + secrets: + repo_release_token: ${{ secrets.repo_release_token }} diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml index 2e68b1a..9586b97 100644 --- a/.github/workflows/call-build-image.yml +++ b/.github/workflows/call-build-image.yml @@ -3,12 +3,16 @@ name: Build Image On Release on: release: types: [published] + pull_request: jobs: call-workflow: - uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v4 + uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6 with: repo_owner: ${{ github.repository_owner }} app_name: "webhook" + release_type: "github" + release_url: "https://api.github.com/repos/adnanh/webhook" + 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 index ae0386c..15a07c4 100644 --- a/.github/workflows/call-check-and-release.yml +++ b/.github/workflows/call-check-and-release.yml @@ -7,12 +7,11 @@ on: jobs: call-workflow: - uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v4 + uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v6 with: repo_owner: ${{ github.repository_owner }} app_name: "webhook" release_type: "github" release_url: "https://api.github.com/repos/adnanh/webhook" - release_name: "webhook" secrets: repo_release_token: ${{ secrets.repo_release_token }} diff --git a/README.md b/README.md index 0e6a19d..d220316 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,9 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver-labs/docker-webhook.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-webhook) [![GitHub Release](https://img.shields.io/github/release/linuxserver-labs/docker-webhook.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-webhook/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver-labs/docker-webhook/packages) +[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-webhook/Check%20for%20update%20and%20release.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Upstream%20Updates)](https://github.com/linuxserver-labs/docker-webhook/actions/workflows/call-chck-and-release.yml) +[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-webhook/Check%20for%20base%20image%20updates.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Baseimage%20Updates)](https://github.com/linuxserver-labs/docker-webhook/actions/workflows/call-baseimage-update.yml) +[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-webhook/Build%20Image%20On%20Release.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Build%20Image)](https://github.com/linuxserver-labs/docker-webhook/actions/workflows/call-build-image.yml) [webhook](https://github.com/adnanh/webhook) is a lightweight configurable tool written in Go, that allows you to easily create HTTP endpoints (hooks) on your server, which you can use to execute configured commands. You can also pass data from the HTTP request (such as headers, payload or query variables) to your commands. webhook also allows you to specify rules which have to be satisfied in order for the hook to be triggered. diff --git a/docker-bake.hcl b/docker-bake.hcl index b4ec2f7..7e64af8 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -13,11 +13,51 @@ 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" ] -} \ No newline at end of file +} + +target "all" { + inherits = ["image"] + platforms = [ + "linux/amd64", + "linux/arm64", + "linux/arm/v7" + ] +} From 081f486bd1abd4b061672c9811f86ed105e8a15c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 13 Apr 2022 15:09:09 +0100 Subject: [PATCH 2/3] Formatting fixes --- .github/workflows/call-build-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml index 9586b97..5e45c7c 100644 --- a/.github/workflows/call-build-image.yml +++ b/.github/workflows/call-build-image.yml @@ -2,7 +2,7 @@ name: Build Image On Release on: release: - types: [published] + types: [ published ] pull_request: jobs: @@ -13,6 +13,6 @@ jobs: app_name: "webhook" release_type: "github" release_url: "https://api.github.com/repos/adnanh/webhook" - target_arch: "all" + target_arch: "all" secrets: scarf_token: ${{ secrets.SCARF_TOKEN }} From c472484d4a4be3629a2e35b25a21552a96cb5285 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 13 Apr 2022 15:14:04 +0100 Subject: [PATCH 3/3] Fix target-arch --- .github/workflows/call-build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml index 5e45c7c..102e4b3 100644 --- a/.github/workflows/call-build-image.yml +++ b/.github/workflows/call-build-image.yml @@ -13,6 +13,6 @@ jobs: app_name: "webhook" release_type: "github" release_url: "https://api.github.com/repos/adnanh/webhook" - target_arch: "all" + target-arch: "all" secrets: scarf_token: ${{ secrets.SCARF_TOKEN }}