Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to 3.18, as well as s6v3 #2

Merged
merged 1 commit into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Check for base image updates
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'
- cron: '57 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"
basebranch: "3.18"
app_name: "webhook"
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
2 changes: 1 addition & 1 deletion .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
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 * * * *"
- cron: "6 * * * *"

jobs:
call-workflow:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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/ /
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **14.01.22:** - Initial release.
* **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.
15 changes: 15 additions & 0 deletions root/etc/s6-overlay/s6-rc.d/init-adduser/branding
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
───────────────────────────────────────

██╗ ███████╗██╗ ██████╗
██║ ██╔════╝██║██╔═══██╗
██║ ███████╗██║██║ ██║
██║ ╚════██║██║██║ ██║
███████╗███████║██║╚██████╔╝
╚══════╝╚══════╝╚═╝ ╚═════╝

█ █▀▀▄ █▀▀▄ █▀▀
█ █▄▄█ █▀▀▄ ▀▀▄
▀▀▀ ▀ ▀ ▀▀▀▀ ▀▀▀

Brought to you by linuxserver.io
───────────────────────────────────────
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion root/etc/cont-init.d/40-config → root/etc/s6-overlay/s6-rc.d/init-webhook/run
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-webhook/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-webhook/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-webhook/run
Empty file.
2 changes: 1 addition & 1 deletion root/etc/services.d/webhook/run → root/etc/s6-overlay/s6-rc.d/svc-webhook/run
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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}
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/svc-webhook/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file.
Empty file.