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

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

.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 [bug](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
         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/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,56 @@
-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 \
+    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}-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 && \
+  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/bin/{upstart,rc.d,sysv,systemd}
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,48 +1,56 @@
-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 \
+    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}-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 && \
+  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/bin/{upstart,rc.d,sysv,systemd}
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.armhf

@@ -1,48 +1,56 @@
-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 \
+    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}-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 && \
+  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/bin/{upstart,rc.d,sysv,systemd}
 
 # 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/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -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
@@ -718,7 +720,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'''
         }
       }
     }

README.md

@@ -48,26 +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.
+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 | Description |
-| :----: | --- |
-| latest | Stable releases |
-| dev | Prereleases from their GitHub |
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable releases |
+| dev | ✅ | Prereleases from their GitHub |
 
 ## Application Setup
 
@@ -84,7 +84,7 @@ 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
@@ -110,7 +110,7 @@ docker run -d \
   -v <path to data>:/config \
   -v <nzb download>:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/nzbhydra2
+  lscr.io/linuxserver/nzbhydra2:dev
 ```
 
 ## Parameters
@@ -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,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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,179 @@
-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.4
-libcap-ng00.7.7-3.1
-libc-bin2.27-3ubuntu1.4
-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.2
-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.3
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.3
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.3
-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.14
-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.4
-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.4
-ncurses-base6.1-1ubuntu1.18.04
-ncurses-bin6.1-1ubuntu1.18.04
-openjdk-11-jre-headless11.0.13+8-0ubuntu1~18.04
-openssl1.1.1-1ubuntu2.1~18.04.14
-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.2
-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
+adduser3.118ubuntu5
+apt2.4.8
+apt-utils2.4.8
+base-files12ubuntu4.2
+base-passwd3.5.52build1
+bash5.1-6ubuntu1
+bsdutils1:2.37.2-4ubuntu3
+ca-certificates20211016ubuntu0.22.04.1
+ca-certificates-java20190909ubuntu1.1
+coreutils8.32-4.1ubuntu1
+curl7.81.0-1ubuntu1.7
+dash0.5.11+git20210903+057cd650a4ed-3build1
+debconf1.5.79ubuntu1
+debianutils5.5-1ubuntu2
+diffutils1:3.8-0ubuntu2
+dirmngr2.2.27-3ubuntu2.1
+dpkg1.21.1ubuntu2.1
+e2fsprogs1.46.5-2ubuntu1.1
+findutils4.8.0-1ubuntu3
+fontconfig-config2.13.1-4.2ubuntu5
+fonts-dejavu-core2.37-2build1
+gcc-12-base12.1.0-2ubuntu1~22.04
+gnupg2.2.27-3ubuntu2.1
+gnupg-l10n2.2.27-3ubuntu2.1
+gnupg-utils2.2.27-3ubuntu2.1
+gpg2.2.27-3ubuntu2.1
+gpg-agent2.2.27-3ubuntu2.1
+gpgconf2.2.27-3ubuntu2.1
+gpgsm2.2.27-3ubuntu2.1
+gpgv2.2.27-3ubuntu2.1
+gpg-wks-client2.2.27-3ubuntu2.1
+gpg-wks-server2.2.27-3ubuntu2.1
+grep3.7-1build1
+gzip1.10-4ubuntu4.1
+hostname3.23ubuntu2
+init-system-helpers1.62
+java-common0.72build2
+jq1.6-2.1ubuntu3
+libacl12.3.1-1
+libapt-pkg6.02.4.8
+libasound21.2.6.1-1ubuntu1
+libasound2-data1.2.6.1-1ubuntu1
+libassuan02.5.5-1build1
+libattr11:2.5.1-1build1
+libaudit11:3.0.7-1build1
+libaudit-common1:3.0.7-1build1
+libavahi-client30.8-5ubuntu5
+libavahi-common30.8-5ubuntu5
+libavahi-common-data0.8-5ubuntu5
+libblkid12.37.2-4ubuntu3
+libbrotli11.0.9-2build6
+libbsd00.11.5-1
+libbz2-1.01.0.8-5build1
+libc62.35-0ubuntu3.1
+libcap21:2.44-1build3
+libcap-ng00.7.9-2.2build3
+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.7
+libdb5.35.3.28+dfsg1-0.8ubuntu3
+libdbus-1-31.12.20-2ubuntu4.1
+libdebconfclient00.261ubuntu1
+libexpat12.4.7-1ubuntu0.2
+libext2fs21.46.5-2ubuntu1.1
+libffi83.4.2-4
+libfontconfig12.13.1-4.2ubuntu5
+libfreetype62.11.1+dfsg-1ubuntu0.1
+libgcc-s112.1.0-2ubuntu1~22.04
+libgcrypt201.9.4-3ubuntu3
+libglib2.0-02.72.4-0ubuntu1
+libgmp102:6.2.1+dfsg-3ubuntu1
+libgnutls303.7.3-4ubuntu1.1
+libgpg-error01.43-3
+libgraphite2-31.3.14-1build2
+libgssapi-krb5-21.19.2-2
+libharfbuzz0b2.7.4-1ubuntu3.1
+libhogweed63.7.3-1build2
+libidn2-02.3.2-2build1
+libjpeg88c-2ubuntu10
+libjpeg-turbo82.1.2-0ubuntu1
+libjq11.6-2.1ubuntu3
+libk5crypto31.19.2-2
+libkeyutils11.6.1-2ubuntu3
+libkrb5-31.19.2-2
+libkrb5support01.19.2-2
+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
+liblz4-11.9.3-2build2
+liblzma55.2.5-2ubuntu1
+libmd01.0.4-1build1
+libmount12.37.2-4ubuntu3
+libmpdec32.5.1-2build2
+libncurses66.3-2
+libncursesw66.3-2
+libnettle83.7.3-1build2
+libnghttp2-141.43.0-1build3
+libnpth01.6-3build2
+libnsl21.3.0-2build2
+libnspr42:4.32-3build1
+libnss32:3.68.2-0ubuntu1.1
+libonig56.9.7.1-2build1
+libp11-kit00.24.0-6build1
+libpam0g1.4.0-11ubuntu2
+libpam-modules1.4.0-11ubuntu2
+libpam-modules-bin1.4.0-11ubuntu2
+libpam-runtime1.4.0-11ubuntu2
+libpcre2-8-010.39-3ubuntu0.1
+libpcre32:8.39-13ubuntu0.22.04.1
+libpcsclite11.9.5-3
+libpng16-161.6.37-3build5
+libprocps82:3.3.17-6ubuntu2
+libpsl50.21.0-1.2build2
+libpython3.10-minimal3.10.6-1~22.04.2
+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.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
+libsemanage-common3.3-1build2
+libsepol23.3-1build1
+libsmartcols12.37.2-4ubuntu3
+libsqlite3-03.37.2-2ubuntu0.1
+libss21.46.5-2ubuntu1.1
+libssh-40.9.6-2build1
+libssl33.0.2-0ubuntu1.7
+libstdc++612.1.0-2ubuntu1~22.04
+libsystemd0249.11-0ubuntu3.6
+libtasn1-64.18.0-4build1
+libtinfo66.3-2
+libtirpc31.3.2-2ubuntu0.1
+libtirpc-common1.3.2-2ubuntu0.1
+libudev1249.11-0ubuntu3.6
+libunistring21.0-1
+libuuid12.37.2-4ubuntu3
+libxxhash00.8.1-1
+libzstd11.4.8+dfsg-3build1
+locales2.35-0ubuntu3.1
+login1:4.8.1-2ubuntu2.1
+logsave1.46.5-2ubuntu1.1
+lsb-base11.1.0ubuntu4
+mawk1.3.4.20200120-3
+media-types7.0.0
+mount2.37.2-4ubuntu3
+ncurses-base6.3-2
+ncurses-bin6.3-2
+netcat1.218-4ubuntu1
+netcat-openbsd1.218-4ubuntu1
+openjdk-17-jre-headless17.0.5+8-2ubuntu1~22.04
+openssl3.0.2-0ubuntu1.7
+passwd1:4.8.1-2ubuntu2.1
+perl-base5.34.0-3ubuntu1.1
+pinentry-curses1.1.1-1build2
+procps2:3.3.17-6ubuntu2
+publicsuffix20211207.1025-1
+python3.103.10.6-1~22.04.2
+python3.10-minimal3.10.6-1~22.04.2
+python33.10.6-1~22.04
+python3-minimal3.10.6-1~22.04
+readline-common8.1.2-1
+sed4.8-1ubuntu2
+sensible-utils0.0.17
+sysvinit-utils3.01-1ubuntu1
+tar1.34+dfsg-1build3
+tzdata2022g-0ubuntu0.22.04.1
+ubuntu-keyring2021.03.26
+ucf3.0043
+unzip6.0-26ubuntu3.1
+usrmerge25ubuntu2
+util-linux2.37.2-4ubuntu3
+zlib1g1:1.2.11.dfsg-2ubuntu9.2

readme-vars.yml

@@ -56,6 +56,8 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { 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,11 @@
+#!/usr/bin/with-contenv 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,8 @@
+#!/usr/bin/with-contenv 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

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