From b9f7778635a0020268b2079d25cf105f7d8bee0d Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 26 Sep 2022 18:14:50 +0100 Subject: [PATCH] Migrate whisparr to s6v3 (#6) --- Dockerfile | 4 +++- Dockerfile.aarch64 | 4 +++- Dockerfile.armhf | 4 +++- README.md | 1 + .../10-adduser => s6-overlay/s6-rc.d/init-adduser/run} | 2 +- .../init-config-end/dependencies.d/init-whisparr-config | 0 .../s6-rc.d/init-whisparr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-whisparr-config/run} | 0 root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up | 1 + .../s6-rc.d/svc-whisparr/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-whisparr/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/svc-whisparr/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr | 0 root/etc/services.d/whisparr/run | 5 ----- 17 files changed, 21 insertions(+), 9 deletions(-) rename root/etc/{cont-init.d/10-adduser => s6-overlay/s6-rc.d/init-adduser/run} (98%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-whisparr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-whisparr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-whisparr-config/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-whisparr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-whisparr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-whisparr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr delete mode 100644 root/etc/services.d/whisparr/run diff --git a/Dockerfile b/Dockerfile index b37c123..a27e218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -6,6 +6,8 @@ ARG VERSION ARG APP_VERSION LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr" +LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr" # environment settings ARG APP_BRANCH="nightly" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a544fd0..c3b5466 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -6,6 +6,8 @@ ARG VERSION ARG APP_VERSION LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr" +LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr" # environment settings ARG APP_BRANCH="nightly" diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 25c732b..2b1de2a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -6,6 +6,8 @@ ARG VERSION ARG APP_VERSION LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr" +LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr" # environment settings ARG APP_BRANCH="nightly" diff --git a/README.md b/README.md index f505d4b..67b6144 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,5 @@ Container images are configured using parameters passed at runtime (such as thos ## Versions +* **23.09.22:** - Rebase to 3.16, migrate to s6v3. * **01.04.22:** - Initial Release. diff --git a/root/etc/cont-init.d/10-adduser b/root/etc/s6-overlay/s6-rc.d/init-adduser/run old mode 100644 new mode 100755 similarity index 98% rename from root/etc/cont-init.d/10-adduser rename to root/etc/s6-overlay/s6-rc.d/init-adduser/run index 8375854..9e430fe --- a/root/etc/cont-init.d/10-adduser +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -52,4 +52,4 @@ fi chown abc:abc /app chown abc:abc /config -chown abc:abc /defaults \ No newline at end of file +chown abc:abc /defaults diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-whisparr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-whisparr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-whisparr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up new file mode 100644 index 0000000..e7ed64d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-whisparr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/run b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/run new file mode 100755 index 0000000..302c863 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 6969" \ + s6-setuidgid abc /app/whisparr/bin/Whisparr \ + -nobrowser -data=/config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/type b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/whisparr/run b/root/etc/services.d/whisparr/run deleted file mode 100644 index c608d38..0000000 --- a/root/etc/services.d/whisparr/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - s6-setuidgid abc /app/whisparr/bin/Whisparr \ - -nobrowser -data=/config