Bot Updating Package Versions

Dockerfile

@@ -1,44 +1,47 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- echo "**** install nzbhydra2 ****" && \
- if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
-	NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-	| jq -r '.[0] | .tag_name'); \
- fi && \
- NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
- curl -o \
- /tmp/nzbhydra2.zip -L \
-	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2/bin && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
- chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install packages ****" && \
+  apk add -U --no-cache --virtual=build-dependencies \
+    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'); \
+  fi && \
+  NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
+  curl -o \
+  /tmp/nzbhydra2.zip -L \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+  mkdir -p /app/nzbhydra2/bin && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+  rm -rf \
+    /app/nzbhydra2/bin/upstart/ \
+    /app/nzbhydra2/bin/rc.d/ \
+    /app/nzbhydra2/bin/sysv/ \
+    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*
 
 # copy local files
 COPY root/ /

Dockerfile.aarch64

@@ -1,44 +1,47 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- echo "**** install nzbhydra2 ****" && \
- if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
-	NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-	| jq -r '.[0] | .tag_name'); \
- fi && \
- NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
- curl -o \
- /tmp/nzbhydra2.zip -L \
-	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2/bin && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
- chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install packages ****" && \
+  apk add -U --no-cache --virtual=build-dependencies \
+    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'); \
+  fi && \
+  NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
+  curl -o \
+  /tmp/nzbhydra2.zip -L \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+  mkdir -p /app/nzbhydra2/bin && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+  rm -rf \
+    /app/nzbhydra2/bin/upstart/ \
+    /app/nzbhydra2/bin/rc.d/ \
+    /app/nzbhydra2/bin/sysv/ \
+    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*
 
 # copy local files
 COPY root/ /

Dockerfile.armhf

@@ -1,44 +1,47 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca,nemchik"
+LABEL maintainer="nemchik"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	curl \
-	jq \
-	unzip && \
- apt-get install --no-install-recommends -y \
-	openjdk-11-jre-headless \
-	python3 && \
- echo "**** install nzbhydra2 ****" && \
- if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
-	NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases" \
-	| jq -r '.[0] | .tag_name'); \
- fi && \
- NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
- curl -o \
- /tmp/nzbhydra2.zip -L \
-	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2/bin && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
- chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
- echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install packages ****" && \
+  apk add -U --no-cache --virtual=build-dependencies \
+    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'); \
+  fi && \
+  NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
+  curl -o \
+  /tmp/nzbhydra2.zip -L \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+  mkdir -p /app/nzbhydra2/bin && \
+  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+  rm -rf \
+    /app/nzbhydra2/bin/upstart/ \
+    /app/nzbhydra2/bin/rc.d/ \
+    /app/nzbhydra2/bin/sysv/ \
+    /app/nzbhydra2/bin/systemd/ && \
+  chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+  echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*
 
 # copy local files
 COPY root/ /

Jenkinsfile

@@ -27,7 +27,7 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
     PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
-    DIST_IMAGE = 'ubuntu'
+    DIST_IMAGE = 'alpine'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
@@ -128,12 +128,11 @@ pipeline {
             script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
             returnStdout: true).trim()
 
-          env.SEMVER = (new Date()).format('YYYY.MM.dd')
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
           if (semver.find()) {
             env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
           } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
             if (semver.find()) {
               if (semver[0][3]) {
                 env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -143,7 +142,15 @@ pipeline {
             }
           }
 
-          println("SEMVER: ${env.SEMVER}")
+          if (env.SEMVER != null) {
+            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
+            }
+            println("SEMVER: ${env.SEMVER}")
+          } else {
+            println("No SEMVER detected")
+          }
+
         }
       }
     }
@@ -346,9 +353,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml
@@ -412,10 +421,10 @@ pipeline {
       steps{
         sh '''#! /bin/bash
               set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/nzbhydra2") | .uuid')
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/nzbhydra2") | .uuid')
               if [ -z "${PACKAGE_UUID}" ]; then
                 echo "Adding package to Scarf.sh"
-                PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
+                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
                   -H "Authorization: Bearer ${SCARF_TOKEN}" \
                   -H "Content-Type: application/json" \
                   -d '{"name":"linuxserver/nzbhydra2",\
@@ -423,22 +432,10 @@ pipeline {
                        "libraryType":"docker",\
                        "website":"https://github.com/linuxserver/docker-nzbhydra2",\
                        "backendUrl":"https://ghcr.io/linuxserver/nzbhydra2",\
-                       "publicUrl":"https://lscr.io/linuxserver/nzbhydra2"}' \
-                  | jq -r .uuid)
+                       "publicUrl":"https://lscr.io/linuxserver/nzbhydra2"}' || :
               else
                 echo "Package already exists on Scarf.sh"
               fi
-              echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
-              curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
-                -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                -H "Content-Type: application/json" \
-                -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
-                     {"userQuery":"roxedus","permissionLevel":"admin"},\
-                     {"userQuery":"nemchik","permissionLevel":"admin"},\
-                     {"userQuery":"driz","permissionLevel":"admin"},\
-                     {"userQuery":"aptalca","permissionLevel":"admin"},\
-                     {"userQuery":"saarg","permissionLevel":"admin"},\
-                     {"userQuery":"Stark","permissionLevel":"admin"}]'
            '''
       } 
     }
@@ -762,11 +759,15 @@ pipeline {
                     docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:dev
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
                     docker push ${PUSHIMAGE}:dev
                     docker push ${PUSHIMAGE}:${META_TAG}
                     docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker push ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                     docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                   done
                '''
           }
@@ -775,8 +776,10 @@ pipeline {
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
                   ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:dev \
-                  ${DELETEIMAGE}:${SEMVER} || :
+                  ${DELETEIMAGE}:dev || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
+                  fi
                 done
              '''
         }
@@ -826,9 +829,11 @@ pipeline {
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -838,9 +843,11 @@ pipeline {
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                     docker manifest push --purge ${MANIFESTIMAGE}:dev || :
                     docker manifest create ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm32v7-dev ${MANIFESTIMAGE}:arm64v8-dev
                     docker manifest annotate ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:arm32v7-dev --os linux --arch arm
@@ -853,14 +860,18 @@ pipeline {
                     docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                    docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    fi
                     docker manifest push --purge ${MANIFESTIMAGE}:dev
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                     docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    fi
                   done
                '''
           }
@@ -870,15 +881,18 @@ pipeline {
                   ${DELETEIMAGE}:amd64-${META_TAG} \
                   ${DELETEIMAGE}:amd64-dev \
                   ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:amd64-${SEMVER} \
                   ${DELETEIMAGE}:arm32v7-${META_TAG} \
                   ${DELETEIMAGE}:arm32v7-dev \
                   ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
                   ${DELETEIMAGE}:arm64v8-${META_TAG} \
                   ${DELETEIMAGE}:arm64v8-dev \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi \
+                    ${DELETEIMAGE}:amd64-${SEMVER} \
+                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
+                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  fi
                 done
                 docker rmi \
                 ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

README.md

@@ -29,6 +29,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)
 [![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)
@@ -47,26 +48,26 @@ It provides easy access to a number of raw and newznab based indexers. The appli
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/nzbhydra2` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/nzbhydra2:dev` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
-| Tag | Description |
-| :----: | --- |
-| latest | Stable releases |
-| dev | Prereleases from their GitHub |
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable releases |
+| dev | ✅ | Prereleases from their GitHub |
 
 ## Application Setup
 
@@ -83,7 +84,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   nzbhydra2:
-    image: lscr.io/linuxserver/nzbhydra2
+    image: lscr.io/linuxserver/nzbhydra2:dev
     container_name: nzbhydra2
     environment:
       - PUID=1000
@@ -109,7 +110,7 @@ docker run -d \
   -v <path to data>:/config \
   -v <nzb download>:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/nzbhydra2
+  lscr.io/linuxserver/nzbhydra2:dev
 ```
 
 ## Parameters
@@ -168,7 +169,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nzbhydra2`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nzbhydra2`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nzbhydra2:dev`
 
 ## Updating Info
 
@@ -186,7 +187,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/nzbhydra2`
+* Update the image: `docker pull lscr.io/linuxserver/nzbhydra2:dev`
 * Stop the running container: `docker stop nzbhydra2`
 * Delete the container: `docker rm nzbhydra2`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -221,7 +222,7 @@ cd docker-nzbhydra2
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/nzbhydra2:latest .
+  -t lscr.io/linuxserver/nzbhydra2:dev .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -234,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.04.22:** - Rebase to Alpine 3.15.
 * **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.
 * **29.04.20:** - Include stable releases incrementally with dev releases.
 * **14.04.20:** - Correct Name, Hydra2 -> Nzbhydra2.

jenkins-vars.yml

@@ -17,7 +17,7 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
-  - DIST_IMAGE = 'ubuntu'
+  - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'

package_versions.txt

@@ -1,165 +1,54 @@
-adduser3.116ubuntu1
-apt1.6.14
-apt-utils1.6.14
-base-files10.1ubuntu2.11
-base-passwd3.5.44
-bash4.4.18-2ubuntu1.2
-bsdutils1:2.31.1-0.4ubuntu3.7
-bzip21.0.6-8.1ubuntu0.2
-ca-certificates20210119~18.04.2
-ca-certificates-java20180516ubuntu1~18.04.1
-coreutils8.28-1ubuntu1
-curl7.58.0-2ubuntu3.16
-dash0.5.8-2.10
-debconf1.5.66ubuntu1
-debianutils4.8.4
-diffutils1:3.6-1
-dpkg1.19.0.5ubuntu2.3
-e2fsprogs1.44.1-1ubuntu1.3
-fdisk2.31.1-0.4ubuntu3.7
-findutils4.6.0+git+20170828-2
-fontconfig-config2.12.6-0ubuntu2
-fonts-dejavu-core2.37-1
-gcc-8-base8.4.0-1ubuntu1~18.04
-gpgv2.2.4-1ubuntu1.4
-grep3.1-2build1
-gzip1.6-5ubuntu1.1
-hostname3.20
-init-system-helpers1.51
-java-common0.68ubuntu1~18.04.1
-jq1.5+dfsg-2
-krb5-locales1.16-2ubuntu0.2
-libacl12.2.52-3build1
-libapt-inst2.01.6.14
-libapt-pkg5.01.6.14
-libasn1-8-heimdal7.5.0+dfsg-1
-libasound21.1.3-5ubuntu0.6
-libasound2-data1.1.3-5ubuntu0.6
-libattr11:2.4.47-2build1
-libaudit11:2.8.2-1ubuntu1.1
-libaudit-common1:2.8.2-1ubuntu1.1
-libavahi-client30.7-3.1ubuntu1.3
-libavahi-common30.7-3.1ubuntu1.3
-libavahi-common-data0.7-3.1ubuntu1.3
-libblkid12.31.1-0.4ubuntu3.7
-libbz2-1.01.0.6-8.1ubuntu0.2
-libc62.27-3ubuntu1.4
-libcap-ng00.7.7-3.1
-libc-bin2.27-3ubuntu1.4
-libcom-err21.44.1-1ubuntu1.3
-libcups22.2.7-1ubuntu2.8
-libcurl47.58.0-2ubuntu3.16
-libdb5.35.3.28-13.1ubuntu1.1
-libdbus-1-31.12.2-1ubuntu1.2
-libdebconfclient00.213ubuntu1
-libexpat12.2.5-3ubuntu0.2
-libext2fs21.44.1-1ubuntu1.3
-libfdisk12.31.1-0.4ubuntu3.7
-libffi63.2.1-8
-libfontconfig12.12.6-0ubuntu2
-libfreetype62.8.1-2ubuntu2.1
-libgcc11:8.4.0-1ubuntu1~18.04
-libgcrypt201.8.1-4ubuntu1.3
-libglib2.0-02.56.4-0ubuntu0.18.04.8
-libgmp102:6.1.2+dfsg-2
-libgnutls303.5.18-1ubuntu1.5
-libgpg-error01.27-6
-libgraphite2-31.3.11-2
-libgssapi3-heimdal7.5.0+dfsg-1
-libgssapi-krb5-21.16-2ubuntu0.2
-libharfbuzz0b1.7.2-1ubuntu1
-libhcrypto4-heimdal7.5.0+dfsg-1
-libheimbase1-heimdal7.5.0+dfsg-1
-libheimntlm0-heimdal7.5.0+dfsg-1
-libhogweed43.4.1-0ubuntu0.18.04.1
-libhx509-5-heimdal7.5.0+dfsg-1
-libidn2-02.0.4-1.1ubuntu0.2
-libjpeg88c-2ubuntu8
-libjpeg-turbo81.5.2-0ubuntu5.18.04.4
-libjq11.5+dfsg-2
-libk5crypto31.16-2ubuntu0.2
-libkeyutils11.5.9-9.2ubuntu2
-libkrb5-26-heimdal7.5.0+dfsg-1
-libkrb5-31.16-2ubuntu0.2
-libkrb5support01.16-2ubuntu0.2
-liblcms2-22.9-1ubuntu0.1
-libldap-2.4-22.4.45+dfsg-1ubuntu1.10
-libldap-common2.4.45+dfsg-1ubuntu1.10
-liblz4-10.0~r131-2ubuntu3.1
-liblzma55.2.2-1.3
-libmount12.31.1-0.4ubuntu3.7
-libmpdec22.4.2-1ubuntu1
-libncurses56.1-1ubuntu1.18.04
-libncursesw56.1-1ubuntu1.18.04
-libnettle63.4.1-0ubuntu0.18.04.1
-libnghttp2-141.30.0-1ubuntu1
-libnspr42:4.18-1ubuntu1
-libnss32:3.35-2ubuntu2.13
-libonig46.7.0-1
-libp11-kit00.23.9-2ubuntu0.1
-libpam0g1.1.8-3.6ubuntu2.18.04.3
-libpam-modules1.1.8-3.6ubuntu2.18.04.3
-libpam-modules-bin1.1.8-3.6ubuntu2.18.04.3
-libpam-runtime1.1.8-3.6ubuntu2.18.04.3
-libpcre32:8.39-9
-libpcsclite11.8.23-1
-libpng16-161.6.34-1ubuntu0.18.04.2
-libprocps62:3.3.12-3ubuntu1.2
-libpsl50.19.1-5build1
-libpython3.6-minimal3.6.9-1~18.04ubuntu1.4
-libpython3.6-stdlib3.6.9-1~18.04ubuntu1.4
-libpython3-stdlib3.6.7-1~18.04
-libreadline77.0-3
-libroken18-heimdal7.5.0+dfsg-1
-librtmp12.4+20151223.gitfa8646d.1-1
-libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.3
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.3
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.3
-libseccomp22.5.1-1ubuntu1~18.04.1
-libselinux12.7-2build2
-libsemanage12.7-2build2
-libsemanage-common2.7-2build2
-libsepol12.7-1
-libsmartcols12.31.1-0.4ubuntu3.7
-libsqlite3-03.22.0-1ubuntu0.4
-libss21.44.1-1ubuntu1.3
-libssl1.11.1.1-1ubuntu2.1~18.04.13
-libstdc++68.4.0-1ubuntu1~18.04
-libsystemd0237-3ubuntu10.52
-libtasn1-64.13-2
-libtinfo56.1-1ubuntu1.18.04
-libudev1237-3ubuntu10.52
-libunistring20.9.9-0ubuntu2
-libuuid12.31.1-0.4ubuntu3.7
-libwind0-heimdal7.5.0+dfsg-1
-libzstd11.3.3+dfsg-2ubuntu1.2
-locales2.27-3ubuntu1.4
-login1:4.5-1ubuntu2
-lsb-base9.20170808ubuntu1
-mawk1.3.3-17ubuntu3
-mime-support3.60ubuntu1
-mount2.31.1-0.4ubuntu3.7
-multiarch-support2.27-3ubuntu1.4
-ncurses-base6.1-1ubuntu1.18.04
-ncurses-bin6.1-1ubuntu1.18.04
-openjdk-11-jre-headless11.0.11+9-0ubuntu2~18.04
-openssl1.1.1-1ubuntu2.1~18.04.13
-passwd1:4.5-1ubuntu2
-perl-base5.26.1-6ubuntu0.5
-procps2:3.3.12-3ubuntu1.2
-publicsuffix20180223.1310-1
-python33.6.7-1~18.04
-python3.63.6.9-1~18.04ubuntu1.4
-python3.6-minimal3.6.9-1~18.04ubuntu1.4
-python3-minimal3.6.7-1~18.04
-readline-common7.0-3
-sed4.4-2
-sensible-utils0.0.12
-sysvinit-utils2.88dsf-59.10ubuntu1
-tar1.29b-2ubuntu0.2
-tzdata2021e-0ubuntu0.18.04
-ubuntu-keyring2018.09.18.1~18.04.2
-ucf3.0038
-unzip6.0-21ubuntu1.1
-util-linux2.31.1-0.4ubuntu3.7
-zlib1g1:1.2.11.dfsg-0ubuntu2
+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-r5
+ca-certificates-20211220-r0
+ca-certificates-bundle-20211220-r0
+coreutils-9.0-r2
+curl-7.80.0-r2
+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.1o-r0
+libcurl-7.80.0-r2
+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.1o-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-r0
+ncurses-terminfo-base-6.3_p20211120-r0
+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.7-r4
+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-r5
+tzdata-2022a-r0
+utmps-0.1.0.3-r0
+xz-5.2.5-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r1

readme-vars.yml

@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
   - { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." }
   - { date: "29.04.20:", desc: "Include stable releases incrementally with dev releases." }
   - { date: "14.04.20:", desc: "Correct Name, Hydra2 -> Nzbhydra2." }

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

@@ -3,7 +3,6 @@
 # make our folders
 mkdir -p /config/logs
 
-
 # permissions
 chmod +x /app/nzbhydra2/bin/nzbhydra2
 chown -R abc:abc /config

root/etc/services.d/nzbhydra2/run

@@ -6,5 +6,5 @@ unset HOST_OS
 cd /app/nzbhydra2/bin || exit
 
 exec \
-	s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
-	--nobrowser --datafolder /config
+    s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
+    --nobrowser --datafolder /config