Bot Updating Package Versions

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

.github/ISSUE_TEMPLATE/issue.bug.md

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

.github/ISSUE_TEMPLATE/issue.bug.yml

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

.github/ISSUE_TEMPLATE/issue.feature.md

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

.github/ISSUE_TEMPLATE/issue.feature.yml

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

.github/workflows/call_invalid_helper.yml

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

.github/workflows/external_trigger.yml

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

.github/workflows/external_trigger_scheduler.yml

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

.github/workflows/greetings.yml

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

.github/workflows/package_trigger.yml

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

.github/workflows/package_trigger_scheduler.yml

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

.github/workflows/stale.yml

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

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -8,44 +10,47 @@ 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"
 
 RUN \
   echo "**** install packages ****" && \
-  apk add -U --no-cache --virtual=build-dependencies \
+  apt-get update && \
+  apt-get install --no-install-recommends -y \
+    openjdk-17-jre-headless \
+    python3 \
     unzip && \
-  apk add -U --no-cache \
-    curl \
-    jq \
-    openjdk11-jre-headless \
-    python3 && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-    | jq -r '.[0] | .tag_name'); \
+      | 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" && \
+    /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 && \
-  rm -rf \
-    /app/nzbhydra2/bin/upstart/ \
-    /app/nzbhydra2/bin/rc.d/ \
-    /app/nzbhydra2/bin/sysv/ \
-    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
   chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
-  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  mkdir -p /defaults && \
+  curl -o \
+    /defaults/nzbhydra.yml -L \
+      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -8,44 +10,47 @@ 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"
 
 RUN \
   echo "**** install packages ****" && \
-  apk add -U --no-cache --virtual=build-dependencies \
+  apt-get update && \
+  apt-get install --no-install-recommends -y \
+    openjdk-17-jre-headless \
+    python3 \
     unzip && \
-  apk add -U --no-cache \
-    curl \
-    jq \
-    openjdk11-jre-headless \
-    python3 && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-    | jq -r '.[0] | .tag_name'); \
+      | 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" && \
+    /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 && \
-  rm -rf \
-    /app/nzbhydra2/bin/upstart/ \
-    /app/nzbhydra2/bin/rc.d/ \
-    /app/nzbhydra2/bin/sysv/ \
-    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
   chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
-  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  mkdir -p /defaults && \
+  curl -o \
+    /defaults/nzbhydra.yml -L \
+      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -8,44 +10,47 @@ 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"
 
 RUN \
   echo "**** install packages ****" && \
-  apk add -U --no-cache --virtual=build-dependencies \
+  apt-get update && \
+  apt-get install --no-install-recommends -y \
+    openjdk-17-jre-headless \
+    python3 \
     unzip && \
-  apk add -U --no-cache \
-    curl \
-    jq \
-    openjdk8-jre \
-    python3 && \
   echo "**** install nzbhydra2 ****" && \
   if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
     NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-    | jq -r '.[0] | .tag_name'); \
+      | 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" && \
+    /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 && \
-  rm -rf \
-    /app/nzbhydra2/bin/upstart/ \
-    /app/nzbhydra2/bin/rc.d/ \
-    /app/nzbhydra2/bin/sysv/ \
-    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2 && \
   chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
-  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  mkdir -p /defaults && \
+  curl -o \
+    /defaults/nzbhydra.yml -L \
+      "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
+  sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/* \
+    /app/nzbhydra2/bin/{upstart,rc.d,sysv,systemd}
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
+
 VOLUME /config

Jenkinsfile

@@ -27,7 +27,7 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
     PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
-    DIST_IMAGE = 'alpine'
+    DIST_IMAGE = 'ubuntu'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
@@ -36,7 +36,7 @@ pipeline {
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/about'
   }
   stages {
     // Setup all the basic environment variables needed for the build
@@ -59,7 +59,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -287,7 +287,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -720,7 +720,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.23.22:** - Upgrade JRE to 17, rebase to ubuntu.
 * **18.04.22:** - Rebase to Alpine 3.15.
 * **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.
 * **29.04.20:** - Include stable releases incrementally with dev releases.

jenkins-vars.yml

@@ -1,5 +1,4 @@
 ---
-
 # jenkins variables
 project_name: docker-nzbhydra2
 external_type: github_devel
@@ -17,7 +16,7 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
-  - DIST_IMAGE = 'alpine'
+  - DIST_IMAGE = 'ubuntu'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'
@@ -26,7 +25,6 @@ repo_vars:
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/about'
 sponsor_links:
   - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" }
-  

package_versions.txt

@@ -1,54 +1,179 @@
-alpine-baselayout-3.2.0-r18
-alpine-keys-2.4-r1
-apk-tools-2.12.7-r3
-bash-5.1.16-r0
-brotli-libs-1.0.9-r5
-busybox-1.34.1-r7
-ca-certificates-20220614-r0
-ca-certificates-bundle-20220614-r0
-coreutils-9.0-r2
-curl-7.80.0-r3
-expat-2.4.7-r0
-gdbm-1.22-r0
-java-cacerts-1.0-r1
-java-common-0.5-r0
-jq-1.6-r1
-libacl-2.2.53-r0
-libattr-2.5.1-r1
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1q-r0
-libcurl-7.80.0-r3
-libffi-3.4.2-r1
-libgcc-10.3.1_git20211027-r0
-libintl-0.21-r0
-libproc-3.3.17-r0
-libretls-3.3.4-r3
-libssl1.1-1.1.1q-r0
-libstdc++-10.3.1_git20211027-r0
-libtasn1-4.18.0-r0
-linux-pam-1.5.2-r0
-mpdecimal-2.5.1-r1
-musl-1.2.2-r7
-musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20211120-r1
-ncurses-terminfo-base-6.3_p20211120-r1
-nghttp2-libs-1.46.0-r0
-oniguruma-6.9.7.1-r0
-openjdk11-jre-headless-11.0.15_p10-r0
-p11-kit-0.24.0-r1
-p11-kit-trust-0.24.0-r1
-procps-3.3.17-r0
-python3-3.9.13-r1
-readline-8.1.1-r0
-s6-ipcserver-2.11.0.0-r0
-scanelf-1.3.3-r0
-shadow-4.8.1-r1
-skalibs-2.11.0.0-r0
-sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r7
-tzdata-2022c-r0
-utmps-0.1.0.3-r0
-xz-5.2.5-r1
-xz-libs-5.2.5-r1
-zlib-1.2.12-r3
+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

readme-vars.yml

@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "03.23.22:", desc: "Upgrade JRE to 17, rebase to ubuntu." }
   - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
   - { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." }
   - { date: "29.04.20:", desc: "Include stable releases incrementally with dev releases." }

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

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

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

@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p /config/logs
+
+if [[ ! -f /config/nzbhydra.yml ]]; then
+    cp /defaults/nzbhydra.yml /config/nzbhydra.yml
+fi
+
+# permissions
+lsiown -R abc:abc /config

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

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

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

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

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

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

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

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

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

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

root/etc/services.d/nzbhydra2/run

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# unset unraid specific ENV to avoid crashing
-unset HOST_OS
-
-cd /app/nzbhydra2/bin || exit
-
-exec \
-    s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
-    --nobrowser --datafolder /config