Merge pull request #23 from linuxserver/s6v3-master

2022-09-14 17:52:16 +01:00
parent a90bd77819 c9e8989885
commit 5a98a3bcbd
17 changed files with 18 additions and 13 deletions
@@ -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 ****" && \
@@ -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 ****" && \
@@ -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 ****" && \
@@ -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." }
@@ -0,0 +1 @@
+oneshot
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nzbhydra2/run
@@ -0,0 +1 @@
+3
@@ -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
@@ -0,0 +1 @@
+longrun
@@ -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