Skip to content

Commit fd4f6cb

Browse files
committed
Rebase to 3.18, as well as s6v3
1 parent 7cab343 commit fd4f6cb

File tree

16 files changed

+29
-10
lines changed

16 files changed

+29
-10
lines changed

.github/workflows/call-baseimage-update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Check for base image updates
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '0 0 * * 0'
6+
- cron: '57 0 * * 0'
77

88
jobs:
99
call-workflow:
1010
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
baseimage: "alpine"
14-
basebranch: "3.15"
14+
basebranch: "3.18"
1515
app_name: "webhook"
1616
secrets:
1717
repo_release_token: ${{ secrets.repo_release_token }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
app_name: "webhook"
1414
release_type: "github"
1515
release_url: "https://api.github.com/repos/adnanh/webhook"
16-
target-arch: "all"
16+
target-arch: "64"
1717
secrets:
1818
scarf_token: ${{ secrets.SCARF_TOKEN }}

.github/workflows/call-check-and-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check for update and release
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: "0 * * * *"
6+
- cron: "6 * * * *"
77

88
jobs:
99
call-workflow:

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage
22

33
# build variables
44
ARG APP_VERSION
@@ -28,7 +28,7 @@ RUN \
2828
go get -d && \
2929
go build -o /app/webhook
3030

31-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
31+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
3232

3333
ARG BUILD_DATE
3434
ARG VERSION
@@ -38,5 +38,5 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
3838
LABEL maintainer="Roxedus"
3939

4040
# copy files from build stage and local files
41-
COPY --from=buildstage /app/webhook /usr/bin/
41+
COPY --from=buildstage /app/webhook /app/webhook
4242
COPY root/ /

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
223223

224224
## Versions
225225

226-
* **14.01.22:** - Initial release.
226+
* **21.09.23:** - Rebase to alpine 3.18, deprecate arm32v7 (armhf) per [this notice](https://info.linuxserver.io/issues/2023-05-06-armhf/).
227+
* **14.01.22:** - Initial release.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
───────────────────────────────────────
2+
3+
██╗ ███████╗██╗ ██████╗
4+
██║ ██╔════╝██║██╔═══██╗
5+
██║ ███████╗██║██║ ██║
6+
██║ ╚════██║██║██║ ██║
7+
███████╗███████║██║╚██████╔╝
8+
╚══════╝╚══════╝╚═╝ ╚═════╝
9+
10+
█ █▀▀▄ █▀▀▄ █▀▀
11+
█ █▄▄█ █▀▀▄ ▀▀▄
12+
▀▀▀ ▀ ▀ ▀▀▀▀ ▀▀▀
13+
14+
Brought to you by linuxserver.io
15+
───────────────────────────────────────

root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webhook

Whitespace-only changes.

root/etc/s6-overlay/s6-rc.d/init-webhook/dependencies.d/init-config

Whitespace-only changes.

root/etc/cont-init.d/40-config renamed to root/etc/s6-overlay/s6-rc.d/init-webhook/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ if [ ! -f "/config/hooks/hooks.json" ]; then
88
cp /defaults/hooks.json /config/hooks/hooks.json
99
fi
1010

11-
chown -R abc:abc \
11+
lsiown -R abc:abc \
1212
/config
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot

0 commit comments

Comments
 (0)