Bot Updating Package Versions

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs nzbhydra2"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs nzbhydra2`
       render: bash
     validations:
       required: true

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-dev:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/dev'

.github/workflows/external_trigger_scheduler.yml

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

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-dev:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - 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@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

.github/workflows/permissions.yml

@@ -5,6 +5,8 @@ on:
       - '**/run'
       - '**/finish'
       - '**/check'
+      - 'root/migrations/*'
+
 jobs:
   permission_check:
     uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 
 # set version label
 ARG BUILD_DATE
@@ -10,15 +10,14 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
+ENV NZBHYDRA2_RELEASE_TYPE="Release" \
+  DEBIAN_FRONTEND="noninteractive"
 
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
     libfreetype6 \
-    openjdk-17-jre-headless \
     python3 \
     unzip && \
   echo "**** install nzbhydra2 ****" && \
@@ -40,6 +39,7 @@ RUN \
     /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 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Dockerfile.aarch64

@@ -10,15 +10,14 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
+ENV NZBHYDRA2_RELEASE_TYPE="Release" \
+  DEBIAN_FRONTEND="noninteractive"
 
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
     libfreetype6 \
-    openjdk-17-jre-headless \
     python3 \
     unzip && \
   echo "**** install nzbhydra2 ****" && \
@@ -40,6 +39,7 @@ RUN \
     /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 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='5076'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH='/system/about'
   }
   stages {
@@ -255,9 +255,11 @@ pipeline {
                   -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 && \
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache python3 && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir 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" || :'''
         }
       }
@@ -272,150 +274,178 @@ pipeline {
         }
       }
       steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=dev -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-                # Stage 1 - Jenkinsfile update
-                if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-                  mkdir -p ${TEMPDIR}/repo
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
-                  git checkout -f dev
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                  git add Jenkinsfile
-                  git commit -m 'Bot Updating Templated Files'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  echo "Updating Jenkinsfile"
-                  rm -Rf ${TEMPDIR}
-                  exit 0
-                else
-                  echo "Jenkinsfile is up to date."
+        sh '''#! /bin/bash
+              set -e
+              TEMPDIR=$(mktemp -d)
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              # Cloned repo paths for templating:
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch dev of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch dev of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch dev --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f dev
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                git add Jenkinsfile
+                git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "Jenkinsfile is up to date."
+              fi
+              echo "Starting Stage 2 - Delete old templates"
+              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}"
                 fi
-                # Stage 2 - Delete old templates
-                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 Dockerfile.armhf"
-                for i in ${OLD_TEMPLATES}; do
-                  if [[ -f "${i}" ]]; then
-                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
-                  fi
+              done
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f dev
+                for i in ${TEMPLATES_TO_DELETE}; do
+                  git rm "${i}"
                 done
-                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                  mkdir -p ${TEMPDIR}/repo
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
-                  git checkout -f dev
-                  for i in ${TEMPLATES_TO_DELETE}; do
-                    git rm "${i}"
-                  done
-                  git commit -m 'Bot Updating Templated Files'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  echo "Deleting old and deprecated templates"
-                  rm -Rf ${TEMPDIR}
-                  exit 0
-                else
-                  echo "No templates to delete"
-                fi
-                # Stage 3 - Update templates
-                CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+                git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "No templates to delete"
+              fi
+              echo "Starting Stage 3 - Update templates"
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f dev
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
-                  mkdir -p ${TEMPDIR}/repo
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
-                  git checkout -f dev
-                  cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                  cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  cd ${TEMPDIR}/repo/${LS_REPO}/
-                  if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                    echo ".jenkins-external" >> .gitignore
-                    git add .gitignore
-                  fi
-                  git add readme-vars.yml ${TEMPLATED_FILES}
-                  git commit -m 'Bot Updating Templated Files'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cd ${TEMPDIR}/repo/${LS_REPO}/
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                  echo ".jenkins-external" >> .gitignore
+                  git add .gitignore
+                fi
+                git add readme-vars.yml ${TEMPLATED_FILES}
+                git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git dev
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
+              fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
+              mkdir -p ${TEMPDIR}/docs
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
+                git commit -m 'Bot Updating Documentation'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
+              fi
+              mkdir -p ${TEMPDIR}/unraid
+              git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -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
+                echo "Updating Unraid template"
+                cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  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
-                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add unraid/${CONTAINER_NAME}.xml
+                  git commit -m 'Bot Updating Unraid Template'
                 fi
-                mkdir -p ${TEMPDIR}/docs
-                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
-                  cd ${TEMPDIR}/docs/docker-documentation
-                  GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                  git add docs/images/docker-${CONTAINER_NAME}.md
-                  git commit -m 'Bot Updating Documentation'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                 fi
-                mkdir -p ${TEMPDIR}/unraid
-                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
-                if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
-                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-                elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
-                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-                fi
-                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -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/
-                  GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                  if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                    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
-                    git commit -m 'Bot Updating Unraid Template'
-                  fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
-                fi
-                # Stage 4 - Sync Readme to Docker Hub
-                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
-                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
-                    echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
-                    DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
-                  else
-                    echo "Syncing readme to Docker Hub"
-                    DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
-                  fi
-                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
                   curl -s \
                     -H "Authorization: JWT ${DH_TOKEN}" \
                     -H "Content-Type: application/json" \
-                    -X PATCH \
-                    -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
-                    https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
-                else
-                  echo "Not the default Github branch. Skipping readme sync to Docker Hub."
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
                 fi
-                rm -Rf ${TEMPDIR}'''
-          script{
-            env.FILES_UPDATED = sh(
-              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
-              returnStdout: true).trim()
-          }
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.FILES_UPDATED = sh(
+            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
         }
       }
     }
@@ -465,14 +495,16 @@ pipeline {
       }
       steps{
         sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+            "name":"'${LS_REPO}'",
+            "mirror":true,\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "issues_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
+            "repository_access_level":"enabled",\
+            "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
       } 
     }
     /* ###############
@@ -501,8 +533,9 @@ pipeline {
           --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
           --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.  \" \
+          --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.  \" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -532,8 +565,9 @@ pipeline {
               --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
               --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.  \" \
+              --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.  \" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -560,8 +594,9 @@ pipeline {
               --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
               --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.  \" \
+              --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.  \" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=false --sbom=false \
               --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) {
@@ -588,7 +623,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -678,14 +713,14 @@ pipeline {
                 set -e
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
                 -e PORT=\"${CI_PORT}\" \
@@ -713,12 +748,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -729,7 +758,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -760,12 +789,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -776,12 +799,12 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                     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
@@ -805,35 +828,13 @@ pipeline {
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:dev || :
-                    docker manifest create ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm64v8-dev
-                    docker manifest annotate ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:arm64v8-dev --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                  done
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm64v8-dev
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-dev")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-dev || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-dev ${MANIFESTIMAGE}:amd64-dev
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-dev
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:dev
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                   done
                '''

README.md

@@ -28,7 +28,7 @@ Find us at:
 
 # [linuxserver/nzbhydra2](https://github.com/linuxserver/docker-nzbhydra2)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnzbhydra2?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fnzbhydra2)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnzbhydra2?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nzbhydra2.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nzbhydra2)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nzbhydra2.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nzbhydra2/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-nzbhydra2/packages)
@@ -41,7 +41,7 @@ Find us at:
 
 [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.
+It provides easy access to a number of raw and newznab based indexers.
 
 [![nzbhydra2](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/hydra-icon.png)](https://github.com/theotherp/nzbhydra2)
 
@@ -70,7 +70,7 @@ This image provides various versions that are available via tags. Please read th
 
 ## Application Setup
 
-The web interface is at `<your ip>:5076` , to set up indexers and connections to your nzb download applications.
+The web interface is at `<your ip>:5076`, to set up indexers and connections to your nzb download applications.
 
 ## Usage
 
@@ -89,8 +89,8 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - <path to data>:/config
-      - <nzb download>:/downloads
+      - /path/to/nzbhydra2/data:/config
+      - /path/to/downloads:/downloads #optional
     ports:
       - 5076:5076
     restart: unless-stopped
@@ -105,8 +105,8 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
   -p 5076:5076 \
-  -v <path to data>:/config \
-  -v <nzb download>:/downloads \
+  -v /path/to/nzbhydra2/data:/config \
+  -v /path/to/downloads:/downloads `#optional` \
   --restart unless-stopped \
   lscr.io/linuxserver/nzbhydra2:dev
 ```
@@ -121,7 +121,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-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 /config` | Where nzbhydra2 should store config data. |
 | `-v /downloads` | NZB download folder. |
 
 ## Environment variables from files (Docker secrets)
@@ -285,6 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.07.24:** - Rebase to Ubuntu Noble. Remove standalone JRE ([#47](https://github.com/linuxserver/docker-nzbhydra2/pull/47)).
 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **22.01.23:** - Update release URL for arch-specific packages.
 * **20.01.23:** - Update dependencies for v5.

jenkins-vars.yml

@@ -23,8 +23,8 @@ repo_vars:
   - CI_PORT='5076'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH='/system/about'
 sponsor_links:
   - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" }

package_versions.txt

@@ -1,184 +1,154 @@
-NAME                     VERSION                                  TYPE         
-adduser                  3.118ubuntu5                             deb           
-apt                      2.4.11                                   deb           
-apt-utils                2.4.11                                   deb           
-base-files               12ubuntu4.3                              deb           
-base-passwd              3.5.52build1                             deb           
-bash                     5.1-6ubuntu1                             deb           
-bash                     5.1.16                                   binary        
-bsdutils                 1:2.37.2-4ubuntu3                        deb           
-ca-certificates          20230311ubuntu0.22.04.1                  deb           
-ca-certificates-java                                              java-archive  
-ca-certificates-java     20190909ubuntu1.2                        deb           
-coreutils                8.32-4.1ubuntu1                          deb           
-cron                     3.0pl1-137ubuntu3                        deb           
-curl                     7.81.0-1ubuntu1.15                       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.2                          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.9                                   java-archive  
-libacl1                  2.3.1-1                                  deb           
-libapt-pkg6.0            2.4.11                                   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.2                           deb           
-libavahi-common-data     0.8-5ubuntu5.2                           deb           
-libavahi-common3         0.8-5ubuntu5.2                           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-1ubuntu0.22.04.1                  deb           
-libcom-err2              1.46.5-2ubuntu1.1                        deb           
-libcrypt1                1:4.4.27-1                               deb           
-libcups2                 2.4.1op1-1ubuntu4.7                      deb           
-libcurl4                 7.81.0-1ubuntu1.15                       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.2                   deb           
-libgcc-s1                12.1.0-2ubuntu1~22.04                    deb           
-libgcrypt20              1.9.4-3ubuntu3                           deb           
-libglib2.0-0             2.72.4-0ubuntu2.2                        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.2                        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.2                        deb           
-libkeyutils1             1.6.1-2ubuntu3                           deb           
-libkrb5-3                1.19.2-2ubuntu0.2                        deb           
-libkrb5support0          1.19.2-2ubuntu0.2                        deb           
-libksba8                 1.6.0-2ubuntu0.2                         deb           
-liblcms2-2               2.12~rc1-2build2                         deb           
-libldap-2.5-0            2.5.16+dfsg-0ubuntu0.22.04.2             deb           
-libldap-common           2.5.16+dfsg-0ubuntu0.22.04.2             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-2ubuntu0.1                           deb           
-libncursesw6             6.3-2ubuntu0.1                           deb           
-libnettle8               3.7.3-1build2                            deb           
-libnghttp2-14            1.43.0-1ubuntu0.1                        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-3ubuntu1                           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.12-1~22.04.3                        deb           
-libpython3.10-stdlib     3.10.12-1~22.04.3                        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.3                        deb           
-libss2                   1.46.5-2ubuntu1.1                        deb           
-libssh-4                 0.9.6-2ubuntu0.22.04.3                   deb           
-libssl3                  3.0.2-0ubuntu1.10                        deb           
-libstdc++6               12.1.0-2ubuntu1~22.04                    deb           
-libsystemd0              249.11-0ubuntu3.9                        deb           
-libtasn1-6               4.18.0-4build1                           deb           
-libtinfo6                6.3-2ubuntu0.1                           deb           
-libtirpc-common          1.3.2-2ubuntu0.1                         deb           
-libtirpc3                1.3.2-2ubuntu0.1                         deb           
-libudev1                 249.11-0ubuntu3.9                        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.6                          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-2ubuntu0.1                           deb           
-ncurses-bin              6.3-2ubuntu0.1                           deb           
-netcat                   1.218-4ubuntu1                           deb           
-netcat-openbsd           1.218-4ubuntu1                           deb           
-openjdk-17-jre-headless  17.0.9+9-1~22.04                         deb           
-openssl                  3.0.2-0ubuntu1.14                        deb           
-passwd                   1:4.8.1-2ubuntu2.1                       deb           
-perl-base                5.34.0-3ubuntu1.2                        deb           
-pinentry-curses          1.1.1-1build2                            deb           
-procps                   2:3.3.17-6ubuntu2                        deb           
-publicsuffix             20211207.1025-1                          deb           
-python3                  3.10.6-1~22.04                           deb           
-python3-minimal          3.10.6-1~22.04                           deb           
-python3.10               3.10.12-1~22.04.3                        deb           
-python3.10-minimal       3.10.12-1~22.04.3                        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                   2023d-0ubuntu0.22.04                     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           
+NAME                         VERSION                            TYPE   
+adduser                      3.137ubuntu1                       deb     
+apt                          2.7.14build2                       deb     
+apt-utils                    2.7.14build2                       deb     
+base-files                   13ubuntu10                         deb     
+base-passwd                  3.6.3build1                        deb     
+bash                         5.2.21-2ubuntu4                    deb     
+bsdutils                     1:2.39.3-9ubuntu6                  deb     
+ca-certificates              20240203                           deb     
+catatonit                    0.1.7-1                            deb     
+coreutils                    9.4-3ubuntu6                       deb     
+cron                         3.0pl1-184ubuntu2                  deb     
+cron-daemon-common           3.0pl1-184ubuntu2                  deb     
+curl                         8.5.0-2ubuntu10.2                  deb     
+dash                         0.5.12-6ubuntu5                    deb     
+debconf                      1.5.86ubuntu1                      deb     
+debianutils                  5.17build1                         deb     
+diffutils                    1:3.10-1build1                     deb     
+dirmngr                      2.4.4-2ubuntu17                    deb     
+dpkg                         1.22.6ubuntu6                      deb     
+e2fsprogs                    1.47.0-2.4~exp1ubuntu4             deb     
+findutils                    4.9.0-5build1                      deb     
+gcc-14-base                  14-20240412-0ubuntu1               deb     
+gnupg                        2.4.4-2ubuntu17                    deb     
+gnupg-l10n                   2.4.4-2ubuntu17                    deb     
+gnupg-utils                  2.4.4-2ubuntu17                    deb     
+gpg                          2.4.4-2ubuntu17                    deb     
+gpg-agent                    2.4.4-2ubuntu17                    deb     
+gpg-wks-client               2.4.4-2ubuntu17                    deb     
+gpgconf                      2.4.4-2ubuntu17                    deb     
+gpgsm                        2.4.4-2ubuntu17                    deb     
+gpgv                         2.4.4-2ubuntu17                    deb     
+grep                         3.11-4build1                       deb     
+gzip                         1.12-1ubuntu3                      deb     
+hostname                     3.23+nmu2ubuntu2                   deb     
+init-system-helpers          1.66ubuntu1                        deb     
+jq                           1.7.1-3build1                      deb     
+keyboxd                      2.4.4-2ubuntu17                    deb     
+krb5-locales                 1.20.1-6ubuntu2                    deb     
+libacl1                      2.3.2-1build1                      deb     
+libapt-pkg6.0t64             2.7.14build2                       deb     
+libassuan0                   2.5.6-1build1                      deb     
+libattr1                     1:2.5.2-1build1                    deb     
+libaudit-common              1:3.1.2-2.1build1                  deb     
+libaudit1                    1:3.1.2-2.1build1                  deb     
+libblkid1                    2.39.3-9ubuntu6                    deb     
+libbrotli1                   1.1.0-2build2                      deb     
+libbsd0                      0.12.1-1build1                     deb     
+libbz2-1.0                   1.0.8-5.1                          deb     
+libc-bin                     2.39-0ubuntu8.2                    deb     
+libc6                        2.39-0ubuntu8.2                    deb     
+libcap-ng0                   0.8.4-2build2                      deb     
+libcap2                      1:2.66-5ubuntu2                    deb     
+libcom-err2                  1.47.0-2.4~exp1ubuntu4             deb     
+libcrypt1                    1:4.4.36-4build1                   deb     
+libcurl4t64                  8.5.0-2ubuntu10.2                  deb     
+libdb5.3t64                  5.3.28+dfsg2-7                     deb     
+libdebconfclient0            0.271ubuntu3                       deb     
+libexpat1                    2.6.1-2build1                      deb     
+libext2fs2t64                1.47.0-2.4~exp1ubuntu4             deb     
+libffi8                      3.4.6-1build1                      deb     
+libfreetype6                 2.13.2+dfsg-1build3                deb     
+libgcc-s1                    14-20240412-0ubuntu1               deb     
+libgcrypt20                  1.10.3-2build1                     deb     
+libgmp10                     2:6.3.0+dfsg-2ubuntu6              deb     
+libgnutls30t64               3.8.3-1.1ubuntu3.1                 deb     
+libgpg-error0                1.47-3build2                       deb     
+libgssapi-krb5-2             1.20.1-6ubuntu2                    deb     
+libhogweed6t64               3.9.1-2.2build1                    deb     
+libidn2-0                    2.3.7-2build1                      deb     
+libjq1                       1.7.1-3build1                      deb     
+libk5crypto3                 1.20.1-6ubuntu2                    deb     
+libkeyutils1                 1.6.3-3build1                      deb     
+libkrb5-3                    1.20.1-6ubuntu2                    deb     
+libkrb5support0              1.20.1-6ubuntu2                    deb     
+libksba8                     1.6.6-1build1                      deb     
+libldap-common               2.6.7+dfsg-1~exp1ubuntu8           deb     
+libldap2                     2.6.7+dfsg-1~exp1ubuntu8           deb     
+liblz4-1                     1.9.4-1build1                      deb     
+liblzma5                     5.6.1+really5.4.5-1                deb     
+libmd0                       1.1.0-2build1                      deb     
+libmount1                    2.39.3-9ubuntu6                    deb     
+libncursesw6                 6.4+20240113-1ubuntu2              deb     
+libnettle8t64                3.9.1-2.2build1                    deb     
+libnghttp2-14                1.59.0-1ubuntu0.1                  deb     
+libnpth0t64                  1.6-3.1build1                      deb     
+libonig5                     6.9.9-1build1                      deb     
+libp11-kit0                  0.25.3-4ubuntu2                    deb     
+libpam-modules               1.5.3-5ubuntu5.1                   deb     
+libpam-modules-bin           1.5.3-5ubuntu5.1                   deb     
+libpam-runtime               1.5.3-5ubuntu5.1                   deb     
+libpam0g                     1.5.3-5ubuntu5.1                   deb     
+libpcre2-8-0                 10.42-4ubuntu2                     deb     
+libpng16-16t64               1.6.43-5build1                     deb     
+libproc2-0                   2:4.0.4-4ubuntu3                   deb     
+libpsl5t64                   0.21.2-1.1build1                   deb     
+libpython3-stdlib            3.12.3-0ubuntu1                    deb     
+libpython3.12-minimal        3.12.3-1ubuntu0.1                  deb     
+libpython3.12-stdlib         3.12.3-1ubuntu0.1                  deb     
+libreadline8t64              8.2-4build1                        deb     
+librtmp1                     2.4+20151223.gitfa8646d.1-2build7  deb     
+libsasl2-2                   2.1.28+dfsg1-5ubuntu3              deb     
+libsasl2-modules             2.1.28+dfsg1-5ubuntu3              deb     
+libsasl2-modules-db          2.1.28+dfsg1-5ubuntu3              deb     
+libseccomp2                  2.5.5-1ubuntu3                     deb     
+libselinux1                  3.5-2ubuntu2                       deb     
+libsemanage-common           3.5-1build5                        deb     
+libsemanage2                 3.5-1build5                        deb     
+libsepol2                    3.5-2build1                        deb     
+libsmartcols1                2.39.3-9ubuntu6                    deb     
+libsqlite3-0                 3.45.1-1ubuntu2                    deb     
+libss2                       1.47.0-2.4~exp1ubuntu4             deb     
+libssh-4                     0.10.6-2build2                     deb     
+libssl3t64                   3.0.13-0ubuntu3.2                  deb     
+libstdc++6                   14-20240412-0ubuntu1               deb     
+libsystemd0                  255.4-1ubuntu8.2                   deb     
+libtasn1-6                   4.19.0-3build1                     deb     
+libtinfo6                    6.4+20240113-1ubuntu2              deb     
+libudev1                     255.4-1ubuntu8.2                   deb     
+libunistring5                1.1-2build1                        deb     
+libuuid1                     2.39.3-9ubuntu6                    deb     
+libxxhash0                   0.8.2-2build1                      deb     
+libzstd1                     1.5.5+dfsg2-2build1                deb     
+locales                      2.39-0ubuntu8.2                    deb     
+login                        1:4.13+dfsg1-4ubuntu3              deb     
+logsave                      1.47.0-2.4~exp1ubuntu4             deb     
+mawk                         1.3.4.20240123-1build1             deb     
+media-types                  10.1.0                             deb     
+mount                        2.39.3-9ubuntu6                    deb     
+ncurses-base                 6.4+20240113-1ubuntu2              deb     
+ncurses-bin                  6.4+20240113-1ubuntu2              deb     
+netbase                      6.4                                deb     
+netcat-openbsd               1.226-1ubuntu2                     deb     
+openssl                      3.0.13-0ubuntu3.2                  deb     
+passwd                       1:4.13+dfsg1-4ubuntu3              deb     
+perl-base                    5.38.2-3.2build2                   deb     
+pinentry-curses              1.2.1-3ubuntu5                     deb     
+procps                       2:4.0.4-4ubuntu3                   deb     
+publicsuffix                 20231001.0357-0.1                  deb     
+python3                      3.12.3-0ubuntu1                    deb     
+python3-minimal              3.12.3-0ubuntu1                    deb     
+python3.12                   3.12.3-1ubuntu0.1                  deb     
+python3.12-minimal           3.12.3-1ubuntu0.1                  deb     
+readline-common              8.2-4build1                        deb     
+sed                          4.9-2build1                        deb     
+sensible-utils               0.0.22                             deb     
+systemd-standalone-sysusers  255.4-1ubuntu8.2                   deb     
+sysvinit-utils               3.08-6ubuntu3                      deb     
+tar                          1.35+dfsg-3build1                  deb     
+tzdata                       2024a-3ubuntu1.1                   deb     
+ubuntu-keyring               2023.11.28.1                       deb     
+unzip                        6.0-28ubuntu4                      deb     
+util-linux                   2.39.3-9ubuntu6                    deb     
+zlib1g                       1:1.3.dfsg-3.1ubuntu2              deb     

readme-vars.yml

@@ -7,9 +7,8 @@ project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/ma
 project_blurb: |
   [{{ project_name|capitalize }}]({{ project_url }}) 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.
+  It provides easy access to a number of raw and newznab based indexers.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_blurb_optional_extras_enabled: false
 # supported architectures
 available_architectures:
   - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -22,32 +21,22 @@ development_versions_items:
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
-param_usage_include_net: false
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "<path to data>", desc: "Where nzbhydra2 should store config files."}
-  - {vol_path: "/downloads", vol_host_path: "<nzb download>", desc: "NZB download folder."}
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Where nzbhydra2 should store config data."}
 param_usage_include_ports: true
 param_ports:
   - {external_port: "5076", internal_port: "5076", port_desc: "WebUI"}
-param_device_map: false
-cap_add_param: false
-# optional container parameters
-opt_param_usage_include_env: false
-opt_param_usage_include_vols: false
-opt_param_usage_include_ports: false
-opt_param_device_map: false
-opt_cap_add_param: false
-optional_block_1: false
+opt_param_usage_include_vols: true
+opt_param_volumes:
+  - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "NZB download folder."}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  The web interface is at `<your ip>:5076` , to set up indexers and connections to your nzb download applications.
+  The web interface is at `<your ip>:5076`, to set up indexers and connections to your nzb download applications.
 # changelog
 changelogs:
+  - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble. Remove standalone JRE ([#47](https://github.com/linuxserver/docker-nzbhydra2/pull/47))."}
   - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "22.01.23:", desc: "Update release URL for arch-specific packages."}
   - {date: "20.01.23:", desc: "Update dependencies for v5."}