From fd4f6cb2ed223fa8628587533d124400c312b73d Mon Sep 17 00:00:00 2001 From: Roxedus Date: Thu, 21 Sep 2023 10:43:28 +0200 Subject: [PATCH] Rebase to 3.18, as well as s6v3 --- .github/workflows/call-baseimage-update.yml | 4 ++-- .github/workflows/call-build-image.yml | 2 +- .github/workflows/call-check-and-release.yml | 2 +- Dockerfile | 6 +++--- README.md | 3 ++- root/etc/s6-overlay/s6-rc.d/init-adduser/branding | 15 +++++++++++++++ .../init-config-end/dependencies.d/init-webhook | 0 .../init-webhook/dependencies.d/init-config | 0 .../s6-rc.d/init-webhook/run} | 2 +- root/etc/s6-overlay/s6-rc.d/init-webhook/type | 1 + root/etc/s6-overlay/s6-rc.d/init-webhook/up | 1 + .../svc-webhook/dependencies.d/init-services | 0 .../s6-rc.d/svc-webhook}/run | 2 +- root/etc/s6-overlay/s6-rc.d/svc-webhook/type | 1 + .../s6-rc.d/user/contents.d/init-webhook | 0 .../s6-rc.d/user/contents.d/svc-webhook | 0 16 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-adduser/branding create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webhook create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webhook/dependencies.d/init-config rename root/etc/{cont-init.d/40-config => s6-overlay/s6-rc.d/init-webhook/run} (90%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webhook/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webhook/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-webhook/dependencies.d/init-services rename root/etc/{services.d/webhook => s6-overlay/s6-rc.d/svc-webhook}/run (82%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-webhook/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webhook create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-webhook diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml index 7a8bdf7..1a25663 100644 --- a/.github/workflows/call-baseimage-update.yml +++ b/.github/workflows/call-baseimage-update.yml @@ -3,7 +3,7 @@ name: Check for base image updates on: workflow_dispatch: schedule: - - cron: '0 0 * * 0' + - cron: '57 0 * * 0' jobs: call-workflow: @@ -11,7 +11,7 @@ jobs: with: repo_owner: ${{ github.repository_owner }} baseimage: "alpine" - basebranch: "3.15" + basebranch: "3.18" 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 102e4b3..ce95ccb 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: "64" 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 15a07c4..b2bad6b 100644 --- a/.github/workflows/call-check-and-release.yml +++ b/.github/workflows/call-check-and-release.yml @@ -3,7 +3,7 @@ name: Check for update and release on: workflow_dispatch: schedule: - - cron: "0 * * * *" + - cron: "6 * * * *" jobs: call-workflow: diff --git a/Dockerfile b/Dockerfile index 9ab2f8c..e3be5a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage # build variables ARG APP_VERSION @@ -28,7 +28,7 @@ RUN \ go get -d && \ go build -o /app/webhook -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 ARG BUILD_DATE ARG VERSION @@ -38,5 +38,5 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="Roxedus" # copy files from build stage and local files -COPY --from=buildstage /app/webhook /usr/bin/ +COPY --from=buildstage /app/webhook /app/webhook COPY root/ / \ No newline at end of file diff --git a/README.md b/README.md index d220316..49d8c83 100644 --- a/README.md +++ b/README.md @@ -223,4 +223,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **14.01.22:** - Initial release. \ No newline at end of file +* **21.09.23:** - Rebase to alpine 3.18, deprecate arm32v7 (armhf) per [this notice](https://info.linuxserver.io/issues/2023-05-06-armhf/). +* **14.01.22:** - Initial release. diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding new file mode 100644 index 0000000..d7e5dd1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -0,0 +1,15 @@ +─────────────────────────────────────── + + ██╗ ███████╗██╗ ██████╗ + ██║ ██╔════╝██║██╔═══██╗ + ██║ ███████╗██║██║ ██║ + ██║ ╚════██║██║██║ ██║ + ███████╗███████║██║╚██████╔╝ + ╚══════╝╚══════╝╚═╝ ╚═════╝ + + █ █▀▀▄ █▀▀▄ █▀▀ + █ █▄▄█ █▀▀▄ ▀▀▄ + ▀▀▀ ▀ ▀ ▀▀▀▀ ▀▀▀ + + Brought to you by linuxserver.io +─────────────────────────────────────── \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webhook b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webhook new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-webhook/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-webhook/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-config b/root/etc/s6-overlay/s6-rc.d/init-webhook/run old mode 100644 new mode 100755 similarity index 90% rename from root/etc/cont-init.d/40-config rename to root/etc/s6-overlay/s6-rc.d/init-webhook/run index 219273b..4adabde --- a/root/etc/cont-init.d/40-config +++ b/root/etc/s6-overlay/s6-rc.d/init-webhook/run @@ -8,5 +8,5 @@ if [ ! -f "/config/hooks/hooks.json" ]; then cp /defaults/hooks.json /config/hooks/hooks.json fi -chown -R abc:abc \ +lsiown -R abc:abc \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-webhook/type b/root/etc/s6-overlay/s6-rc.d/init-webhook/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-webhook/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-webhook/up b/root/etc/s6-overlay/s6-rc.d/init-webhook/up new file mode 100644 index 0000000..b78e452 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-webhook/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-webhook/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-webhook/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-webhook/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/webhook/run b/root/etc/s6-overlay/s6-rc.d/svc-webhook/run old mode 100644 new mode 100755 similarity index 82% rename from root/etc/services.d/webhook/run rename to root/etc/s6-overlay/s6-rc.d/svc-webhook/run index ec7014a..485dbc1 --- a/root/etc/services.d/webhook/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-webhook/run @@ -3,6 +3,6 @@ # shellcheck disable=SC2086 exec \ - s6-setuidgid abc webhook \ + s6-setuidgid abc /app/webhook \ -hooks /config/hooks/hooks.json \ -ip 0.0.0.0 ${EXTRA_PARAM:=-hotreload} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-webhook/type b/root/etc/s6-overlay/s6-rc.d/svc-webhook/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-webhook/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webhook b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webhook new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-webhook b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-webhook new file mode 100644 index 0000000..e69de29