diff --git a/Dockerfile b/Dockerfile index b5ad1b0..2404c33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -18,6 +18,7 @@ RUN \ curl \ jq \ openjdk-11-jre-headless \ + netcat \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index aa2bfb7..2dff0cf 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -18,6 +18,7 @@ RUN \ curl \ jq \ openjdk-11-jre-headless \ + netcat \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 95b78b3..4396fc0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE @@ -18,6 +18,7 @@ RUN \ curl \ jq \ openjdk-11-jre-headless \ + netcat \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ diff --git a/readme-vars.yml b/readme-vars.yml index f9729f6..bb7b510 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.09.22:", desc: "Migrate to s6v3." } - { date: "03.05.22:", desc: "Rebase to Jammy." } - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." } - { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nzbhydra2 b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nzbhydra2 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/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-nzbhydra2/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-nzbhydra2/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/type b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/up b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/up new file mode 100644 index 0000000..37c00f2 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-nzbhydra2/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d/init-nzbhydra2 b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d/init-nzbhydra2 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run new file mode 100755 index 0000000..8ce8fe4 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bash + +# unset unraid specific ENV to avoid crashing +unset HOST_OS + +s6-notifyoncheck -d -n 60 -w 5000 -c "nc -z 127.0.0.1 5076" \ + cd /app/nzbhydra2/bin s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nzbhydra2 b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nzbhydra2 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nzbhydra2 b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nzbhydra2 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/nzbhydra2/run b/root/etc/services.d/nzbhydra2/run deleted file mode 100755 index b72fc68..0000000 --- a/root/etc/services.d/nzbhydra2/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash - -# unset unraid specific ENV to avoid crashing -unset HOST_OS - -cd /app/nzbhydra2/bin || exit - -exec \ - s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \ - --nobrowser --datafolder /config