Bot Updating Package Versions

closes https://github.com/linuxserver/docker-nzbhydra2/issues/25

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- Provide a general summary of the bug in the Title above -->
-
-------------------------------
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Environment
-**OS:**
-**CPU architecture:** x86_64/arm32/arm64
-**How docker service was installed:**
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Command used to create docker container (run/create/compose/screenshot)
-<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
-
-## Docker logs
-<!--- Provide a full docker log, output of "docker logs nzbhydra2" -->

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -0,0 +1,77 @@
+# Based on the issue template
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG] <title>"
+labels: [Bug]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Tell us what should happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **How docker service was installed**: distro's packagemanager
+      value: |
+        - OS:
+        - How docker service was installed:
+      render: markdown
+    validations:
+      required: false
+  - type: dropdown
+    attributes:
+      label: CPU architecture
+      options:
+        - x86-64
+        - arm64
+        - armhf
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Docker creation
+      description: |
+        Command used to create docker container
+        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      description: |
+        Provide a full docker log, output of "docker logs linuxserver.io"
+      label: Container logs
+      placeholder: |
+        Output of `docker logs linuxserver.io`
+      render: bash
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
-<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
-
-<!--- Provide a general summary of the request in the Title above -->
-
-------------------------------
-
-## Desired Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Alternatives Considered
-<!--- Tell us what other options you have tried or considered -->

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -0,0 +1,31 @@
+# Based on the issue template
+name: Feature request
+description: Suggest an idea for this project
+title: "[FEAT] <title>"
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this a new feature request?
+      description: Please search to see if a feature request already exists.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Wanted change
+      description: Tell us what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reason for change
+      description: Justify your request, why do you want it, what is the benefit.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed code change
+      description: Do you have a potential code change in mind?
+    validations:
+      required: false

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-dev:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: External Trigger
         if: github.ref == 'refs/heads/dev'
@@ -48,8 +48,12 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
         pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-dev:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/dev'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.github/workflows/permissions.yml

@@ -0,0 +1,9 @@
+name: Permission check
+on:
+  pull_request:
+    paths:
+      - '**/run'
+      - '**/finish'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v6.0.1
       with:
         stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
         stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

Dockerfile

@@ -1,48 +1,60 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- 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'); \
- 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/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  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'); \
+  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}-amd64-linux.zip" && \
+  mkdir -p /app/nzbhydra2 && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
+  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
+  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" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,48 +1,60 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- 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'); \
- 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/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  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'); \
+  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}-arm64-linux.zip" && \
+  mkdir -p /app/nzbhydra2 && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
+  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
+  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" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.armhf

@@ -1,48 +1,63 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- 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'); \
- 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/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  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'); \
+  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}-generic.zip" && \
+  mkdir -p /app/nzbhydra2 && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
+  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
+  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" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/upstart \
+    /app/nzbhydra2/rc.d \
+    /app/nzbhydra2/sysv \
+    /app/nzbhydra2/systemd \
+    /app/nzbhydra2/WindowsService \
+    /app/nzbhydra2/NZBHydra2.exe \
+    "/app/nzbhydra2/NZBHydra2 Console.exe"
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Jenkinsfile

@@ -36,7 +36,7 @@ pipeline {
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/about'
   }
   stages {
     // Setup all the basic environment variables needed for the build
@@ -59,7 +59,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -69,7 +69,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 dev-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -287,7 +287,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -353,9 +353,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml
@@ -450,7 +452,8 @@ pipeline {
       }
       steps {
         echo "Running on node: ${NODE_NAME}"
-        sh "docker build \
+        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+        sh "docker buildx build \
           --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
           --label \"org.opencontainers.image.authors=linuxserver.io\" \
           --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nzbhydra2/packages\" \
@@ -463,7 +466,7 @@ pipeline {
           --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
           --label \"org.opencontainers.image.title=Nzbhydra2\" \
           --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra).    It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version.  \" \
-          --no-cache --pull -t ${IMAGE}:${META_TAG} \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -480,7 +483,8 @@ pipeline {
         stage('Build X86') {
           steps {
             echo "Running on node: ${NODE_NAME}"
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nzbhydra2/packages\" \
@@ -493,7 +497,7 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Nzbhydra2\" \
               --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra).    It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version.  \" \
-              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -507,7 +511,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
+            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nzbhydra2/packages\" \
@@ -520,7 +525,7 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Nzbhydra2\" \
               --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra).    It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version.  \" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
@@ -541,7 +546,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nzbhydra2/packages\" \
@@ -554,7 +560,7 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Nzbhydra2\" \
               --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra).    It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version.  \" \
-              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
@@ -583,26 +589,12 @@ pipeline {
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
               fi
-              if [ "${DIST_IMAGE}" == "alpine" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apk info -v > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "fedora" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  rpm -qa > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "arch" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  pacman -Q > /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              fi
+              touch ${TEMPDIR}/package_versions.txt
+              docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                -v ${TEMPDIR}:/tmp \
+                ghcr.io/anchore/syft:latest \
+                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
@@ -718,7 +710,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }
@@ -813,19 +805,19 @@ pipeline {
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
                   for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-dev
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-dev
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-dev
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-dev
                     docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-dev
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -833,13 +825,13 @@ pipeline {
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-dev
-                    docker push ${MANIFESTIMAGE}:arm32v7-dev
-                    docker push ${MANIFESTIMAGE}:arm64v8-dev
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-dev
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-dev
                     docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-dev
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -985,12 +977,12 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }

README.md

@@ -48,27 +48,26 @@ It provides easy access to a number of raw and newznab based indexers. The appli
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/nzbhydra2` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/nzbhydra2:dev` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf | ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
-
-| Tag | Description |
-| :----: | --- |
-| latest | Stable releases |
-| dev | Prereleases from their GitHub |
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable releases |
+| dev | ✅ | Prereleases from their GitHub |
 ## Application Setup
 
 The web interface is at `<your ip>:5076` , to set up indexers and connections to your nzb download applications.
@@ -84,12 +83,12 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   nzbhydra2:
-    image: lscr.io/linuxserver/nzbhydra2
+    image: lscr.io/linuxserver/nzbhydra2:dev
     container_name: nzbhydra2
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
     volumes:
       - <path to data>:/config
       - <nzb download>:/downloads
@@ -105,12 +104,13 @@ docker run -d \
   --name=nzbhydra2 \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Europe/London \
+  -e TZ=Etc/UTC \
   -p 5076:5076 \
   -v <path to data>:/config \
   -v <nzb download>:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/nzbhydra2
+  lscr.io/linuxserver/nzbhydra2:dev
+
 ```
 
 ## Parameters
@@ -122,7 +122,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 5076` | WebUI |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
+| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-v /config` | Where nzbhydra2 should store config files. |
 | `-v /downloads` | NZB download folder. |
 
@@ -169,7 +169,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nzbhydra2`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nzbhydra2`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nzbhydra2:dev`
 
 ## Updating Info
 
@@ -187,7 +187,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/nzbhydra2`
+* Update the image: `docker pull lscr.io/linuxserver/nzbhydra2:dev`
 * Stop the running container: `docker stop nzbhydra2`
 * Delete the container: `docker rm nzbhydra2`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -222,7 +222,7 @@ cd docker-nzbhydra2
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/nzbhydra2:latest .
+  -t lscr.io/linuxserver/nzbhydra2:dev .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -235,6 +235,10 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.01.23:** - Update release URL for arch-specific packages.
+* **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.
 * **29.04.20:** - Include stable releases incrementally with dev releases.
 * **14.04.20:** - Correct Name, Hydra2 -> Nzbhydra2.

jenkins-vars.yml

@@ -1,5 +1,4 @@
 ---
-
 # jenkins variables
 project_name: docker-nzbhydra2
 external_type: github_devel
@@ -26,7 +25,6 @@ repo_vars:
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/about'
 sponsor_links:
   - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" }
-  

package_versions.txt

@@ -1,165 +1,183 @@
-adduser3.116ubuntu1
-apt1.6.14
-apt-utils1.6.14
-base-files10.1ubuntu2.11
-base-passwd3.5.44
-bash4.4.18-2ubuntu1.2
-bsdutils1:2.31.1-0.4ubuntu3.7
-bzip21.0.6-8.1ubuntu0.2
-ca-certificates20210119~18.04.2
-ca-certificates-java20180516ubuntu1~18.04.1
-coreutils8.28-1ubuntu1
-curl7.58.0-2ubuntu3.16
-dash0.5.8-2.10
-debconf1.5.66ubuntu1
-debianutils4.8.4
-diffutils1:3.6-1
-dpkg1.19.0.5ubuntu2.3
-e2fsprogs1.44.1-1ubuntu1.3
-fdisk2.31.1-0.4ubuntu3.7
-findutils4.6.0+git+20170828-2
-fontconfig-config2.12.6-0ubuntu2
-fonts-dejavu-core2.37-1
-gcc-8-base8.4.0-1ubuntu1~18.04
-gpgv2.2.4-1ubuntu1.4
-grep3.1-2build1
-gzip1.6-5ubuntu1.1
-hostname3.20
-init-system-helpers1.51
-java-common0.68ubuntu1~18.04.1
-jq1.5+dfsg-2
-krb5-locales1.16-2ubuntu0.2
-libacl12.2.52-3build1
-libapt-inst2.01.6.14
-libapt-pkg5.01.6.14
-libasn1-8-heimdal7.5.0+dfsg-1
-libasound21.1.3-5ubuntu0.6
-libasound2-data1.1.3-5ubuntu0.6
-libattr11:2.4.47-2build1
-libaudit11:2.8.2-1ubuntu1.1
-libaudit-common1:2.8.2-1ubuntu1.1
-libavahi-client30.7-3.1ubuntu1.3
-libavahi-common30.7-3.1ubuntu1.3
-libavahi-common-data0.7-3.1ubuntu1.3
-libblkid12.31.1-0.4ubuntu3.7
-libbz2-1.01.0.6-8.1ubuntu0.2
-libc62.27-3ubuntu1.5
-libcap-ng00.7.7-3.1
-libc-bin2.27-3ubuntu1.5
-libcom-err21.44.1-1ubuntu1.3
-libcups22.2.7-1ubuntu2.8
-libcurl47.58.0-2ubuntu3.16
-libdb5.35.3.28-13.1ubuntu1.1
-libdbus-1-31.12.2-1ubuntu1.2
-libdebconfclient00.213ubuntu1
-libexpat12.2.5-3ubuntu0.7
-libext2fs21.44.1-1ubuntu1.3
-libfdisk12.31.1-0.4ubuntu3.7
-libffi63.2.1-8
-libfontconfig12.12.6-0ubuntu2
-libfreetype62.8.1-2ubuntu2.1
-libgcc11:8.4.0-1ubuntu1~18.04
-libgcrypt201.8.1-4ubuntu1.3
-libglib2.0-02.56.4-0ubuntu0.18.04.9
-libgmp102:6.1.2+dfsg-2
-libgnutls303.5.18-1ubuntu1.5
-libgpg-error01.27-6
-libgraphite2-31.3.11-2
-libgssapi3-heimdal7.5.0+dfsg-1
-libgssapi-krb5-21.16-2ubuntu0.2
-libharfbuzz0b1.7.2-1ubuntu1
-libhcrypto4-heimdal7.5.0+dfsg-1
-libheimbase1-heimdal7.5.0+dfsg-1
-libheimntlm0-heimdal7.5.0+dfsg-1
-libhogweed43.4.1-0ubuntu0.18.04.1
-libhx509-5-heimdal7.5.0+dfsg-1
-libidn2-02.0.4-1.1ubuntu0.2
-libjpeg88c-2ubuntu8
-libjpeg-turbo81.5.2-0ubuntu5.18.04.4
-libjq11.5+dfsg-2
-libk5crypto31.16-2ubuntu0.2
-libkeyutils11.5.9-9.2ubuntu2
-libkrb5-26-heimdal7.5.0+dfsg-1
-libkrb5-31.16-2ubuntu0.2
-libkrb5support01.16-2ubuntu0.2
-liblcms2-22.9-1ubuntu0.1
-libldap-2.4-22.4.45+dfsg-1ubuntu1.10
-libldap-common2.4.45+dfsg-1ubuntu1.10
-liblz4-10.0~r131-2ubuntu3.1
-liblzma55.2.2-1.3
-libmount12.31.1-0.4ubuntu3.7
-libmpdec22.4.2-1ubuntu1
-libncurses56.1-1ubuntu1.18.04
-libncursesw56.1-1ubuntu1.18.04
-libnettle63.4.1-0ubuntu0.18.04.1
-libnghttp2-141.30.0-1ubuntu1
-libnspr42:4.18-1ubuntu1
-libnss32:3.35-2ubuntu2.13
-libonig46.7.0-1
-libp11-kit00.23.9-2ubuntu0.1
-libpam0g1.1.8-3.6ubuntu2.18.04.3
-libpam-modules1.1.8-3.6ubuntu2.18.04.3
-libpam-modules-bin1.1.8-3.6ubuntu2.18.04.3
-libpam-runtime1.1.8-3.6ubuntu2.18.04.3
-libpcre32:8.39-9
-libpcsclite11.8.23-1
-libpng16-161.6.34-1ubuntu0.18.04.2
-libprocps62:3.3.12-3ubuntu1.2
-libpsl50.19.1-5build1
-libpython3.6-minimal3.6.9-1~18.04ubuntu1.6
-libpython3.6-stdlib3.6.9-1~18.04ubuntu1.6
-libpython3-stdlib3.6.7-1~18.04
-libreadline77.0-3
-libroken18-heimdal7.5.0+dfsg-1
-librtmp12.4+20151223.gitfa8646d.1-1
-libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.4
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.4
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.4
-libseccomp22.5.1-1ubuntu1~18.04.2
-libselinux12.7-2build2
-libsemanage12.7-2build2
-libsemanage-common2.7-2build2
-libsepol12.7-1
-libsmartcols12.31.1-0.4ubuntu3.7
-libsqlite3-03.22.0-1ubuntu0.4
-libss21.44.1-1ubuntu1.3
-libssl1.11.1.1-1ubuntu2.1~18.04.15
-libstdc++68.4.0-1ubuntu1~18.04
-libsystemd0237-3ubuntu10.53
-libtasn1-64.13-2
-libtinfo56.1-1ubuntu1.18.04
-libudev1237-3ubuntu10.53
-libunistring20.9.9-0ubuntu2
-libuuid12.31.1-0.4ubuntu3.7
-libwind0-heimdal7.5.0+dfsg-1
-libzstd11.3.3+dfsg-2ubuntu1.2
-locales2.27-3ubuntu1.5
-login1:4.5-1ubuntu2.2
-lsb-base9.20170808ubuntu1
-mawk1.3.3-17ubuntu3
-mime-support3.60ubuntu1
-mount2.31.1-0.4ubuntu3.7
-multiarch-support2.27-3ubuntu1.5
-ncurses-base6.1-1ubuntu1.18.04
-ncurses-bin6.1-1ubuntu1.18.04
-openjdk-11-jre-headless11.0.14+9-0ubuntu2~18.04
-openssl1.1.1-1ubuntu2.1~18.04.15
-passwd1:4.5-1ubuntu2.2
-perl-base5.26.1-6ubuntu0.5
-procps2:3.3.12-3ubuntu1.2
-publicsuffix20180223.1310-1
-python33.6.7-1~18.04
-python3.63.6.9-1~18.04ubuntu1.6
-python3.6-minimal3.6.9-1~18.04ubuntu1.6
-python3-minimal3.6.7-1~18.04
-readline-common7.0-3
-sed4.4-2
-sensible-utils0.0.12
-sysvinit-utils2.88dsf-59.10ubuntu1
-tar1.29b-2ubuntu0.3
-tzdata2021e-0ubuntu0.18.04
-ubuntu-keyring2018.09.18.1~18.04.2
-ucf3.0038
-unzip6.0-21ubuntu1.1
-util-linux2.31.1-0.4ubuntu3.7
-zlib1g1:1.2.11.dfsg-0ubuntu2
+NAME                     VERSION                                  TYPE         
+adduser                  3.118ubuntu5                             deb           
+apt                      2.4.8                                    deb           
+apt-utils                2.4.8                                    deb           
+base-files               12ubuntu4.3                              deb           
+base-passwd              3.5.52build1                             deb           
+bash                     5.1-6ubuntu1                             deb           
+bsdutils                 1:2.37.2-4ubuntu3                        deb           
+ca-certificates          20211016ubuntu0.22.04.1                  deb           
+ca-certificates-java                                              java-archive  
+ca-certificates-java     20190909ubuntu1.1                        deb           
+coreutils                8.32-4.1ubuntu1                          deb           
+curl                     7.81.0-1ubuntu1.8                        deb           
+dash                     0.5.11+git20210903+057cd650a4ed-3build1  deb           
+debconf                  1.5.79ubuntu1                            deb           
+debianutils              5.5-1ubuntu2                             deb           
+diffutils                1:3.8-0ubuntu2                           deb           
+dirmngr                  2.2.27-3ubuntu2.1                        deb           
+dpkg                     1.21.1ubuntu2.1                          deb           
+e2fsprogs                1.46.5-2ubuntu1.1                        deb           
+findutils                4.8.0-1ubuntu3                           deb           
+fontconfig-config        2.13.1-4.2ubuntu5                        deb           
+fonts-dejavu-core        2.37-2build1                             deb           
+gcc-12-base              12.1.0-2ubuntu1~22.04                    deb           
+gnupg                    2.2.27-3ubuntu2.1                        deb           
+gnupg-l10n               2.2.27-3ubuntu2.1                        deb           
+gnupg-utils              2.2.27-3ubuntu2.1                        deb           
+gpg                      2.2.27-3ubuntu2.1                        deb           
+gpg-agent                2.2.27-3ubuntu2.1                        deb           
+gpg-wks-client           2.2.27-3ubuntu2.1                        deb           
+gpg-wks-server           2.2.27-3ubuntu2.1                        deb           
+gpgconf                  2.2.27-3ubuntu2.1                        deb           
+gpgsm                    2.2.27-3ubuntu2.1                        deb           
+gpgv                     2.2.27-3ubuntu2.1                        deb           
+grep                     3.7-1build1                              deb           
+gzip                     1.10-4ubuntu4.1                          deb           
+hostname                 3.23ubuntu2                              deb           
+init-system-helpers      1.62                                     deb           
+java-common              0.72build2                               deb           
+jq                       1.6-2.1ubuntu3                           deb           
+jrt-fs                   17.0.6                                   java-archive  
+libacl1                  2.3.1-1                                  deb           
+libapt-pkg6.0            2.4.8                                    deb           
+libasound2               1.2.6.1-1ubuntu1                         deb           
+libasound2-data          1.2.6.1-1ubuntu1                         deb           
+libassuan0               2.5.5-1build1                            deb           
+libattr1                 1:2.5.1-1build1                          deb           
+libaudit-common          1:3.0.7-1build1                          deb           
+libaudit1                1:3.0.7-1build1                          deb           
+libavahi-client3         0.8-5ubuntu5                             deb           
+libavahi-common-data     0.8-5ubuntu5                             deb           
+libavahi-common3         0.8-5ubuntu5                             deb           
+libblkid1                2.37.2-4ubuntu3                          deb           
+libbrotli1               1.0.9-2build6                            deb           
+libbsd0                  0.11.5-1                                 deb           
+libbz2-1.0               1.0.8-5build1                            deb           
+libc-bin                 2.35-0ubuntu3.1                          deb           
+libc6                    2.35-0ubuntu3.1                          deb           
+libcap-ng0               0.7.9-2.2build3                          deb           
+libcap2                  1:2.44-1build3                           deb           
+libcom-err2              1.46.5-2ubuntu1.1                        deb           
+libcrypt1                1:4.4.27-1                               deb           
+libcups2                 2.4.1op1-1ubuntu4.1                      deb           
+libcurl4                 7.81.0-1ubuntu1.8                        deb           
+libdb5.3                 5.3.28+dfsg1-0.8ubuntu3                  deb           
+libdbus-1-3              1.12.20-2ubuntu4.1                       deb           
+libdebconfclient0        0.261ubuntu1                             deb           
+libexpat1                2.4.7-1ubuntu0.2                         deb           
+libext2fs2               1.46.5-2ubuntu1.1                        deb           
+libffi8                  3.4.2-4                                  deb           
+libfontconfig1           2.13.1-4.2ubuntu5                        deb           
+libfreetype6             2.11.1+dfsg-1ubuntu0.1                   deb           
+libgcc-s1                12.1.0-2ubuntu1~22.04                    deb           
+libgcrypt20              1.9.4-3ubuntu3                           deb           
+libglib2.0-0             2.72.4-0ubuntu1                          deb           
+libgmp10                 2:6.2.1+dfsg-3ubuntu1                    deb           
+libgnutls30              3.7.3-4ubuntu1.2                         deb           
+libgpg-error0            1.43-3                                   deb           
+libgraphite2-3           1.3.14-1build2                           deb           
+libgssapi-krb5-2         1.19.2-2ubuntu0.1                        deb           
+libharfbuzz0b            2.7.4-1ubuntu3.1                         deb           
+libhogweed6              3.7.3-1build2                            deb           
+libidn2-0                2.3.2-2build1                            deb           
+libjpeg-turbo8           2.1.2-0ubuntu1                           deb           
+libjpeg8                 8c-2ubuntu10                             deb           
+libjq1                   1.6-2.1ubuntu3                           deb           
+libk5crypto3             1.19.2-2ubuntu0.1                        deb           
+libkeyutils1             1.6.1-2ubuntu3                           deb           
+libkrb5-3                1.19.2-2ubuntu0.1                        deb           
+libkrb5support0          1.19.2-2ubuntu0.1                        deb           
+libksba8                 1.6.0-2ubuntu0.2                         deb           
+liblcms2-2               2.12~rc1-2build2                         deb           
+libldap-2.5-0            2.5.13+dfsg-0ubuntu0.22.04.1             deb           
+libldap-common           2.5.13+dfsg-0ubuntu0.22.04.1             deb           
+liblz4-1                 1.9.3-2build2                            deb           
+liblzma5                 5.2.5-2ubuntu1                           deb           
+libmd0                   1.0.4-1build1                            deb           
+libmount1                2.37.2-4ubuntu3                          deb           
+libmpdec3                2.5.1-2build2                            deb           
+libncurses6              6.3-2                                    deb           
+libncursesw6             6.3-2                                    deb           
+libnettle8               3.7.3-1build2                            deb           
+libnghttp2-14            1.43.0-1build3                           deb           
+libnpth0                 1.6-3build2                              deb           
+libnsl2                  1.3.0-2build2                            deb           
+libnspr4                 2:4.32-3build1                           deb           
+libnss3                  2:3.68.2-0ubuntu1.2                      deb           
+libonig5                 6.9.7.1-2build1                          deb           
+libp11-kit0              0.24.0-6build1                           deb           
+libpam-modules           1.4.0-11ubuntu2.3                        deb           
+libpam-modules-bin       1.4.0-11ubuntu2.3                        deb           
+libpam-runtime           1.4.0-11ubuntu2.3                        deb           
+libpam0g                 1.4.0-11ubuntu2.3                        deb           
+libpcre2-8-0             10.39-3ubuntu0.1                         deb           
+libpcre3                 2:8.39-13ubuntu0.22.04.1                 deb           
+libpcsclite1             1.9.5-3                                  deb           
+libpng16-16              1.6.37-3build5                           deb           
+libprocps8               2:3.3.17-6ubuntu2                        deb           
+libpsl5                  0.21.0-1.2build2                         deb           
+libpython3-stdlib        3.10.6-1~22.04                           deb           
+libpython3.10-minimal    3.10.6-1~22.04.2                         deb           
+libpython3.10-stdlib     3.10.6-1~22.04.2                         deb           
+libreadline8             8.1.2-1                                  deb           
+librtmp1                 2.4+20151223.gitfa8646d.1-2build4        deb           
+libsasl2-2               2.1.27+dfsg2-3ubuntu1.2                  deb           
+libsasl2-modules         2.1.27+dfsg2-3ubuntu1.2                  deb           
+libsasl2-modules-db      2.1.27+dfsg2-3ubuntu1.2                  deb           
+libseccomp2              2.5.3-2ubuntu2                           deb           
+libselinux1              3.3-1build2                              deb           
+libsemanage-common       3.3-1build2                              deb           
+libsemanage2             3.3-1build2                              deb           
+libsepol2                3.3-1build1                              deb           
+libsmartcols1            2.37.2-4ubuntu3                          deb           
+libsqlite3-0             3.37.2-2ubuntu0.1                        deb           
+libss2                   1.46.5-2ubuntu1.1                        deb           
+libssh-4                 0.9.6-2build1                            deb           
+libssl3                  3.0.2-0ubuntu1.8                         deb           
+libstdc++6               12.1.0-2ubuntu1~22.04                    deb           
+libsystemd0              249.11-0ubuntu3.6                        deb           
+libtasn1-6               4.18.0-4build1                           deb           
+libtinfo6                6.3-2                                    deb           
+libtirpc-common          1.3.2-2ubuntu0.1                         deb           
+libtirpc3                1.3.2-2ubuntu0.1                         deb           
+libudev1                 249.11-0ubuntu3.6                        deb           
+libunistring2            1.0-1                                    deb           
+libuuid1                 2.37.2-4ubuntu3                          deb           
+libxxhash0               0.8.1-1                                  deb           
+libzstd1                 1.4.8+dfsg-3build1                       deb           
+locales                  2.35-0ubuntu3.1                          deb           
+login                    1:4.8.1-2ubuntu2.1                       deb           
+logsave                  1.46.5-2ubuntu1.1                        deb           
+lsb-base                 11.1.0ubuntu4                            deb           
+mawk                     1.3.4.20200120-3                         deb           
+media-types              7.0.0                                    deb           
+mount                    2.37.2-4ubuntu3                          deb           
+ncurses-base             6.3-2                                    deb           
+ncurses-bin              6.3-2                                    deb           
+netcat                   1.218-4ubuntu1                           deb           
+netcat-openbsd           1.218-4ubuntu1                           deb           
+openjdk-17-jre-headless  17.0.6+10-0ubuntu1~22.04                 deb           
+openssl                  3.0.2-0ubuntu1.8                         deb           
+passwd                   1:4.8.1-2ubuntu2.1                       deb           
+perl-base                5.34.0-3ubuntu1.1                        deb           
+pinentry-curses          1.1.1-1build2                            deb           
+procps                   2:3.3.17-6ubuntu2                        deb           
+publicsuffix             20211207.1025-1                          deb           
+python                   3.10.6                                   binary        
+python3                  3.10.6-1~22.04                           deb           
+python3-minimal          3.10.6-1~22.04                           deb           
+python3.10               3.10.6-1~22.04.2                         deb           
+python3.10-minimal       3.10.6-1~22.04.2                         deb           
+readline-common          8.1.2-1                                  deb           
+sed                      4.8-1ubuntu2                             deb           
+sensible-utils           0.0.17                                   deb           
+sysvinit-utils           3.01-1ubuntu1                            deb           
+tar                      1.34+dfsg-1ubuntu0.1.22.04.1             deb           
+tzdata                   2022g-0ubuntu0.22.04.1                   deb           
+ubuntu-keyring           2021.03.26                               deb           
+ucf                      3.0043                                   deb           
+unzip                    6.0-26ubuntu3.1                          deb           
+usrmerge                 25ubuntu2                                deb           
+util-linux               2.37.2-4ubuntu3                          deb           
+zlib1g                   1:1.2.11.dfsg-2ubuntu9.2                 deb           

readme-vars.yml

@@ -56,6 +56,10 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "22.01.23:", desc: "Update release URL for arch-specific packages." }
+  - { 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." }
   - { date: "29.04.20:", desc: "Include stable releases incrementally with dev releases." }
   - { date: "14.04.20:", desc: "Correct Name, Hydra2 -> Nzbhydra2." }

root/etc/cont-init.d/30-config

@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folders
-mkdir -p /config/logs
-
-
-# permissions
-chmod +x /app/nzbhydra2/bin/nzbhydra2
-chown -R abc:abc /config

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

@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# 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

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

@@ -0,0 +1 @@
+oneshot

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

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

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

@@ -0,0 +1 @@
+3

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

@@ -0,0 +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 s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config

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

@@ -0,0 +1 @@
+longrun

root/etc/services.d/nzbhydra2/run

@@ -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