Merge pull request #34 from linuxserver/revert-33-revert-30-dev-v5

Dockerfile

@@ -17,27 +17,28 @@ RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
+    libfreetype6 \
     openjdk-17-jre-headless \
     python3 \
     unzip && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-      | jq -r '.[0] | .tag_name'); \
+    | jq -r '.[0] | .tag_name'); \
   fi && \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   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/bin && \
-  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+    "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 && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
     /defaults/nzbhydra.yml -L \
-      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+    "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
   sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
   rm -rf \
@@ -45,7 +46,10 @@ RUN \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /var/log/* \
-    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd
 
 # copy local files
 COPY root/ /

Dockerfile.aarch64

@@ -17,27 +17,28 @@ RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
+    libfreetype6 \
     openjdk-17-jre-headless \
     python3 \
     unzip && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-      | jq -r '.[0] | .tag_name'); \
+    | jq -r '.[0] | .tag_name'); \
   fi && \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   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/bin && \
-  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+    "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 && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
     /defaults/nzbhydra.yml -L \
-      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+    "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
   sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
   rm -rf \
@@ -45,7 +46,10 @@ RUN \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /var/log/* \
-    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd
 
 # copy local files
 COPY root/ /

Dockerfile.armhf

@@ -17,27 +17,28 @@ RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
+    libfreetype6 \
     openjdk-17-jre-headless \
     python3 \
     unzip && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-      | jq -r '.[0] | .tag_name'); \
+    | jq -r '.[0] | .tag_name'); \
   fi && \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   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/bin && \
-  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
-  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+    "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 && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
     /defaults/nzbhydra.yml -L \
-      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+    "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
   sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
   rm -rf \
@@ -45,7 +46,10 @@ RUN \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /var/log/* \
-    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd
 
 # copy local files
 COPY root/ /

README.md

@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.01.23:** - Update dependencies for v5.
 * **03.23.22:** - Upgrade JRE to 17, rebase to ubuntu.
 * **18.04.22:** - Rebase to Alpine 3.15.
 * **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.

package_versions.txt

@@ -6,9 +6,9 @@ base-passwd3.5.52build1
 bash5.1-6ubuntu1
 bsdutils1:2.37.2-4ubuntu3
 ca-certificates20211016ubuntu0.22.04.1
-ca-certificates-java20190909
+ca-certificates-java20190909ubuntu1.1
 coreutils8.32-4.1ubuntu1
-curl7.81.0-1ubuntu1.6
+curl7.81.0-1ubuntu1.7
 dash0.5.11+git20210903+057cd650a4ed-3build1
 debconf1.5.79ubuntu1
 debianutils5.5-1ubuntu2
@@ -58,7 +58,7 @@ libc-bin2.35-0ubuntu3.1
 libcom-err21.46.5-2ubuntu1.1
 libcrypt11:4.4.27-1
 libcups22.4.1op1-1ubuntu4.1
-libcurl47.81.0-1ubuntu1.6
+libcurl47.81.0-1ubuntu1.7
 libdb5.35.3.28+dfsg1-0.8ubuntu3
 libdbus-1-31.12.20-2ubuntu4.1
 libdebconfclient00.261ubuntu1
@@ -85,7 +85,7 @@ libk5crypto31.19.2-2
 libkeyutils11.6.1-2ubuntu3
 libkrb5-31.19.2-2
 libkrb5support01.19.2-2
-libksba81.6.0-2ubuntu0.1
+libksba81.6.0-2ubuntu0.2
 liblcms2-22.12~rc1-2build2
 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1
 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1
@@ -119,9 +119,9 @@ libpython3.10-stdlib3.10.6-1~22.04.2
 libpython3-stdlib3.10.6-1~22.04
 libreadline88.1.2-1
 librtmp12.4+20151223.gitfa8646d.1-2build4
-libsasl2-22.1.27+dfsg2-3ubuntu1
-libsasl2-modules2.1.27+dfsg2-3ubuntu1
-libsasl2-modules-db2.1.27+dfsg2-3ubuntu1
+libsasl2-22.1.27+dfsg2-3ubuntu1.1
+libsasl2-modules2.1.27+dfsg2-3ubuntu1.1
+libsasl2-modules-db2.1.27+dfsg2-3ubuntu1.1
 libseccomp22.5.3-2ubuntu2
 libselinux13.3-1build2
 libsemanage23.3-1build2

readme-vars.yml

@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "20.01.23:", desc: "Update dependencies for v5." }
   - { date: "03.23.22:", desc: "Upgrade JRE to 17, rebase to ubuntu." }
   - { 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." }

root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make our folders
 mkdir -p /config/logs
@@ -8,4 +9,5 @@ if [[ ! -f /config/nzbhydra.yml ]]; then
 fi
 
 # permissions
-lsiown -R abc:abc /config
+lsiown -R abc:abc \
+    /config

root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/type

@@ -1 +1 @@
-oneshot
+oneshot

root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/up

@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run
+/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run

root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd

@@ -1 +1 @@
-3
+3

root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # 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/bin s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config
+        cd /app/nzbhydra2 s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config

root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type

@@ -1 +1 @@
-longrun
+longrun