Bot Updating Templated Files

.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/workflows/call_invalid_helper.yml

@@ -1,12 +0,0 @@
-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/call_issue_pr_tracker.yml

@@ -0,0 +1,14 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -0,0 +1,13 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron:  '15 8 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.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.yml) or [feature](https://github.com/linuxserver/docker-nzbhydra2/blob/dev/.github/ISSUE_TEMPLATE/issue.feature.yml) 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_scheduler.yml

@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '01 9 * * 0'
+    - cron:  '57 21 * * 3'
   workflow_dispatch:
 
 jobs:

.github/workflows/permissions.yml

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

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - 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."
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        days-before-stale: 30
-        days-before-close: 365
-        exempt-issue-labels: 'awaiting-approval,work-in-progress'
-        exempt-pr-labels: 'awaiting-approval,work-in-progress'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

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

Dockerfile.aarch64

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

Dockerfile.armhf

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

Jenkinsfile

@@ -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.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'
+          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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.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
@@ -240,17 +240,14 @@ pipeline {
           }
           sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                 docker run --rm \
-                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
-                -e FILE_NAME="shellcheck-result.xml" \
-                -e MIMETYPE="text/xml" \
-                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
-                python /upload.py'''
+                  -v ${WORKSPACE}:/mnt \
+                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
+                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
+                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache py3-pip && \
+                    pip install s3cmd && \
+                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
     }
@@ -287,7 +284,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -304,7 +301,7 @@ pipeline {
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old templates"
+                echo "Deleting old and deprecated templates"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
@@ -452,7 +449,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\" \
@@ -465,7 +463,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} ."
       }
     }
@@ -482,7 +480,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\" \
@@ -495,7 +494,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} ."
           }
         }
@@ -509,7 +508,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\" \
@@ -522,7 +522,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) {
@@ -543,7 +543,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\" \
@@ -556,7 +557,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) {
@@ -585,26 +586,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
@@ -815,19 +802,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}
@@ -835,13 +822,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}
@@ -987,12 +974,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

@@ -58,7 +58,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| armhf | ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
@@ -68,7 +68,6 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | 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.
@@ -89,7 +88,7 @@ services:
     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: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. |
 
@@ -235,6 +235,8 @@ 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.

package_versions.txt

@@ -1,179 +1,183 @@
-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-java20190909
-coreutils8.32-4.1ubuntu1
-curl7.81.0-1ubuntu1.6
-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.6
-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.1
-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
-libsasl2-modules2.1.27+dfsg2-3ubuntu1
-libsasl2-modules-db2.1.27+dfsg2-3ubuntu1
-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
+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.10                       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.10                       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.14+dfsg-0ubuntu0.22.04.1             deb           
+libldap-common           2.5.14+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.2ubuntu1                  deb           
+libpython3.10-stdlib     3.10.6-1~22.04.2ubuntu1                  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.7                        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.7                        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.2ubuntu1                  deb           
+python3.10-minimal       3.10.6-1~22.04.2ubuntu1                  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,8 @@ 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." }

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # unset unraid specific ENV to avoid crashing
 unset HOST_OS
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5076" \
-    cd /app/nzbhydra2/bin s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config
+        cd /app/nzbhydra2 s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config

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

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