diff --git a/Dockerfile b/Dockerfile index 4f17e78..caf2bc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ RUN \ echo "**** install packages ****" && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libfreetype6 \ openjdk-17-jre-headless \ python3 \ unzip && \ @@ -30,10 +29,10 @@ RUN \ curl -o \ /tmp/nzbhydra2.zip -L \ "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ - mkdir -p /app/nzbhydra2 && \ - unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ - chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ - chmod +x /app/nzbhydra2/core && \ + mkdir -p /app/nzbhydra2/bin && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2 && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \ mkdir -p /defaults && \ curl -o \ @@ -46,10 +45,7 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* \ /var/log/* \ - /app/nzbhydra2/upstart \ - /app/nzbhydra2/rc.d \ - /app/nzbhydra2/sysv \ - /app/nzbhydra2/systemd + /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd} # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2964507..fc3fcbe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,7 +17,6 @@ RUN \ echo "**** install packages ****" && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libfreetype6 \ openjdk-17-jre-headless \ python3 \ unzip && \ @@ -30,10 +29,10 @@ RUN \ curl -o \ /tmp/nzbhydra2.zip -L \ "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ - mkdir -p /app/nzbhydra2 && \ - unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ - chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ - chmod +x /app/nzbhydra2/core && \ + mkdir -p /app/nzbhydra2/bin && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2 && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \ mkdir -p /defaults && \ curl -o \ @@ -46,10 +45,7 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* \ /var/log/* \ - /app/nzbhydra2/upstart \ - /app/nzbhydra2/rc.d \ - /app/nzbhydra2/sysv \ - /app/nzbhydra2/systemd + /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd} # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index af8d272..8e9f8e6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -17,7 +17,6 @@ RUN \ echo "**** install packages ****" && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libfreetype6 \ openjdk-17-jre-headless \ python3 \ unzip && \ @@ -30,10 +29,10 @@ RUN \ curl -o \ /tmp/nzbhydra2.zip -L \ "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ - mkdir -p /app/nzbhydra2 && \ - unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ - chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ - chmod +x /app/nzbhydra2/core && \ + mkdir -p /app/nzbhydra2/bin && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2 && \ + chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \ mkdir -p /defaults && \ curl -o \ @@ -46,10 +45,7 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* \ /var/log/* \ - /app/nzbhydra2/upstart \ - /app/nzbhydra2/rc.d \ - /app/nzbhydra2/sysv \ - /app/nzbhydra2/systemd + /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd} # copy local files COPY root/ / diff --git a/README.md b/README.md index 699cc9e..acff9a7 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.01.23:** - Update dependencies for v5. * **10.12.22:** - Bump master JRE to v17. Default mapIpToHost to false. * **11.09.22:** - Migrate to s6v3. * **03.05.22:** - Rebase to Jammy. diff --git a/readme-vars.yml b/readme-vars.yml index c172a60..764dd7d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,7 +56,6 @@ app_setup_block: | # changelog changelogs: - - { date: "20.01.23:", desc: "Update dependencies for v5." } - { date: "10.12.22:", desc: "Bump master JRE to v17. Default mapIpToHost to false." } - { date: "11.09.22:", desc: "Migrate to s6v3." } - { date: "03.05.22:", desc: "Rebase to Jammy." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run index 5f3bb45..cb8fdc7 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run @@ -1,13 +1,11 @@ #!/usr/bin/with-contenv bash -# shellcheck shell=bash -# make our folders +# make our folders mkdir -p /config/logs if [[ ! -f /config/nzbhydra.yml ]]; then cp /defaults/nzbhydra.yml /config/nzbhydra.yml fi -# permissions -lsiown -R abc:abc \ - /config +# permissions +lsiown -R abc:abc /config 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 similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d /init-services rename to root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d/init-services diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run index 8dee446..6e5e8fc 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run @@ -1,9 +1,8 @@ #!/usr/bin/with-contenv bash -# shellcheck shell=bash -# unset unraid specific ENV to avoid crashing +# unset unraid specific ENV to avoid crashing unset HOST_OS exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5076" \ - cd /app/nzbhydra2 s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config + cd /app/nzbhydra2/bin s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config