Bot Updating Templated Files

Add issue note for old kernels

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/unstable/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-qbittorrent)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/unstable/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/unstable/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.github/workflows/external_trigger.yml

@@ -4,36 +4,35 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-unstable:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.3
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/unstable'
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
             exit 0
           fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
+          echo "**** External trigger running off of unstable branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-            && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"
+            FAILURE_REASON="Can't retrieve external version for qbittorrent branch unstable"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-qbittorrent/actions/runs/${{ github.run_id }}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
+          EXT_RELEASE_CLEAN=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
           echo "**** External version: ${EXT_RELEASE} ****"
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/qbittorrent"
-          tag="latest"
+          tag="unstable"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
             | jq -r '.token')
@@ -55,23 +54,29 @@ jobs:
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag unstable"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
           echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
+          if [ "${EXT_RELEASE_CLEAN}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
             exit 0
           else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "**** New version ${EXT_RELEASE_CLEAN} found; old version was ${IMAGE_VERSION}. Checking artifacts. . . ****"
+            EXT_RELEASE_STRIPPED=$(echo ${EXT_RELEASE} | sed 's|^1:||')
+            URL_AMD64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_amd64.deb"
+            URL_ARMHF="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_armhf.deb"
+            URL_ARM64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_arm64.deb"
+            if curl -fL "${URL_AMD64}" >/dev/null && curl -fL "${URL_ARMHF}" >/dev/null && curl -fL "${URL_ARM64}" >/dev/null; then
+              echo "**** All artifacts seem to be published, triggering build ****"
               response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=false \
                 --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
               echo "**** Jenkins job queue url: ${response%$'\r'} ****"
               echo "**** Sleeping 10 seconds until job starts ****"
@@ -86,8 +91,15 @@ jobs:
                 --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
                 --data-urlencode "Submit=Submit"
               echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              TRIGGER_REASON="A version change was detected for qbittorrent tag unstable. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
               curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                 "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            else
+              echo "**** Not all artifacts are published yet, skipping trigger ****"
+              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag unstable is detected, however not all artifacts are uploaded to launchpad yet. Will try again in 1 hr."
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            fi
           fi

.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-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-qbittorrent/blob/unstable/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-qbittorrent/blob/unstable/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/unstable/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -4,25 +4,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-trigger-master:
+  package-trigger-unstable:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.3
 
       - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/unstable'
         run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
             exit 0
           fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
             exit 0
           fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
+          echo "**** Package trigger running off of unstable branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
           response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
           echo "**** Jenkins job queue url: ${response%$'\r'} ****"
           echo "**** Sleeping 10 seconds until job starts ****"

Dockerfile

@@ -1,72 +1,15 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:edge
+FROM ghcr.io/linuxserver/qbittorrent:unstable
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
-
-# environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-XDG_DATA_HOME="/config"
-
-# install runtime packages and qbitorrent-cli
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
-  echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
-    bash \
-    curl \
-    icu-libs \
-    libstdc++ \
-    openssl \
-    p7zip \
-    python3 && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
-  fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
-  mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /root/.cache \
-    /tmp/*
+LABEL maintainer="thelamer"
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 8080 6881 6881/udp
-
+EXPOSE 6881 6881/udp 8080
 VOLUME /config

Dockerfile.aarch64

@@ -1,72 +1,15 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
+FROM ghcr.io/linuxserver/qbittorrent:arm64v8-unstable
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
-
-# environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-XDG_DATA_HOME="/config"
-
-# install runtime packages and qbitorrent-cli
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
-  echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
-    bash \
-    curl \
-    icu-libs \
-    libstdc++ \
-    openssl \
-    p7zip \
-    python3 && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
-  fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
-  mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm64.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /root/.cache \
-    /tmp/*
+LABEL maintainer="thelamer"
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 8080 6881 6881/udp
-
+EXPOSE 6881 6881/udp 8080
 VOLUME /config

Dockerfile.armhf

@@ -1,74 +1,15 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge
+FROM ghcr.io/linuxserver/qbittorrent:arm32v7-unstable
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
-
-# environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-XDG_DATA_HOME="/config"
-
-# install runtime packages and qbitorrent-cli
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
-  echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
-    bash \
-    curl \
-    gcompat \
-    icu-libs \
-    libc6-compat \
-    libstdc++ \
-    openssl \
-    p7zip \
-    python3 && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
-  fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
-  mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /root/.cache \
-    /tmp/*
+LABEL maintainer="thelamer"
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 8080 6881 6881/udp
-
+EXPOSE 6881 6881/udp 8080
 VOLUME /config

Jenkinsfile

@@ -24,10 +24,7 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
-    DIST_IMAGE = 'alpine'
-    DIST_TAG = 'edge'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-    DIST_REPO_PACKAGES = 'qbittorrent-nox'
+    DIST_IMAGE = 'ubuntu'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
@@ -45,7 +42,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':unstable 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -59,7 +56,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'
+          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/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -102,15 +99,14 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is an alpine repo change for external version determine an md5 from the version string
-    stage("Set tag Alpine Repo"){
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: '''curl -sL "${DIST_REPO}x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-                       && awk '/^P:'"${DIST_REPO_PACKAGES}"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
-            env.RELEASE_LINK = 'alpine_repo'
+            env.RELEASE_LINK = 'custom_command'
         }
       }
     }
@@ -148,10 +144,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a unstable build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -161,20 +157,20 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "unstable"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -184,13 +180,13 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
         }
       }
@@ -207,13 +203,13 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
         }
@@ -251,7 +247,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -262,13 +258,13 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=unstable -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 master
+                git checkout -f unstable
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
@@ -291,7 +287,7 @@ pipeline {
                 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 master
+                git checkout -f unstable
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
@@ -312,7 +308,7 @@ pipeline {
                 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 master
+                git checkout -f unstable
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -368,7 +364,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -407,7 +403,7 @@ pipeline {
     // Add package to Scarf.sh and set permissions
     stage("Scarf.sh package registry"){
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'EXIT_STATUS', value: ''
       }
       steps{
@@ -564,7 +560,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -601,7 +597,7 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f unstable
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -625,7 +621,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -646,7 +642,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "unstable"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -749,12 +745,12 @@ pipeline {
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                     docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:unstable
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
                     fi
-                    docker push ${PUSHIMAGE}:latest
+                    docker push ${PUSHIMAGE}:unstable
                     docker push ${PUSHIMAGE}:${META_TAG}
                     docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
@@ -768,7 +764,7 @@ pipeline {
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
                   ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
+                  ${DELETEIMAGE}:unstable || :
                   if [ -n "${SEMVER}" ]; then
                     docker rmi ${DELETEIMAGE}:${SEMVER} || :
                   fi
@@ -815,9 +811,9 @@ pipeline {
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                     docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-unstable
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-unstable
                     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}
@@ -829,9 +825,9 @@ pipeline {
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:amd64-unstable
+                    docker push ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker push ${MANIFESTIMAGE}:arm64v8-unstable
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
@@ -840,10 +836,10 @@ pipeline {
                       docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:unstable || :
+                    docker manifest create ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:amd64-unstable ${MANIFESTIMAGE}:arm32v7-unstable ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm32v7-unstable --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm64v8-unstable --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
                     docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
@@ -858,7 +854,7 @@ pipeline {
                       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}:latest
+                    docker manifest push --purge ${MANIFESTIMAGE}:unstable
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                     docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
                     if [ -n "${SEMVER}" ]; then
@@ -871,13 +867,13 @@ pipeline {
                 for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-unstable \
                   ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-unstable \
                   ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
+                  ${DELETEIMAGE}:arm64v8-unstable \
                   ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
                   if [ -n "${SEMVER}" ]; then
                     docker rmi \
@@ -896,7 +892,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "unstable"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -908,17 +904,17 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${META_TAG}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to unstable",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
+              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "unstable",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }

README.md

@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/unstable/.github/CONTRIBUTING.md -->
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
@@ -37,7 +37,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/qbittorrent)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Funstable%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fqbittorrent%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/latest/index.html)
 
 The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
@@ -112,12 +112,12 @@ services:
       - TZ=Europe/London
       - WEBUI_PORT=8080
     volumes:
-      - /path/to/appdata/config:/config
-      - /path/to/downloads:/downloads
+      - </path/to/appdata/config>:/config
+      - </path/to/downloads>:/downloads
     ports:
-      - 8080:8080
       - 6881:6881
       - 6881:6881/udp
+      - 8080:8080
     restart: unless-stopped
 ```
 
@@ -130,11 +130,11 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -e WEBUI_PORT=8080 \
-  -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/appdata/config:/config \
-  -v /path/to/downloads:/downloads \
+  -p 8080:8080 \
+  -v </path/to/appdata/config>:/config \
+  -v </path/to/downloads>:/downloads \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent
 ```
@@ -145,9 +145,9 @@ Container images are configured using parameters passed at runtime (such as thos
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8080` | WebUI |
 | `-p 6881` | tcp connection port |
 | `-p 6881/udp` | udp connection port |
+| `-p 8080` | http gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
@@ -264,16 +264,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
-* **01.03.22:** - Add python for search plugin support.
-* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
-* **19.02.22:** - Add jq to build-stage
-* **07.01.22:** - Rebase to Alpine, build from source.
 * **06.01.22:** - Deprecate unstable branch.
-* **10.02.21:** - Rebase to focal.
+* **24.03.21:** - Rebase to focal.
 * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
-* **12.11.20:** - Stop creating /config/data directory on startup
-* **03.04.20:** - Fix adding search engine plugin
+* **05.07.20:** - Shift to Python3
+* **31.10.19:** - Adding unstable tag.
 * **02.08.19:** - Add qbitorrent-cli for processing scripts.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.

jenkins-vars.yml

@@ -2,10 +2,12 @@
 
 # jenkins variables
 project_name: docker-qbittorrent
-external_type: alpine_repo
-release_type: stable
-release_tag: latest
-ls_branch: master
+external_type: na
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
+release_type: prerelease
+release_tag: unstable
+ls_branch: unstable
+custom_external_trigger: true
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -14,10 +16,7 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
-  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = 'edge'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-  - DIST_REPO_PACKAGES = 'qbittorrent-nox'
+  - DIST_IMAGE = 'ubuntu'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'

package_versions.txt

@@ -1,79 +1,193 @@
-alpine-baselayout-3.2.0-r20
-alpine-baselayout-data-3.2.0-r20
-alpine-keys-2.4-r1
-apk-tools-2.12.9-r1
-bash-5.1.16-r0
-brotli-libs-1.0.9-r6
-busybox-1.35.0-r8
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
-coreutils-9.0-r3
-curl-7.82.0-r0
-dbus-libs-1.12.22-r0
-double-conversion-3.1.5-r0
-expat-2.4.8-r0
-file-5.41-r0
-gdbm-1.23-r0
-glib-2.72.0-r0
-icu-libs-70.1-r0
-libacl-2.2.53-r0
-libattr-2.5.1-r1
-libb2-0.98.1-r2
-libblkid-2.38-r0
-libbsd-0.11.5-r0
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1n-r0
-libcurl-7.82.0-r0
-libexecinfo-1.1-r1
-libffi-3.4.2-r1
-libgcc-11.2.1_git20220219-r1
-libgomp-11.2.1_git20220219-r1
-libice-1.0.10-r0
-libintl-0.21-r1
-libmagic-5.41-r0
-libmd-1.0.3-r0
-libmount-2.38-r0
-libpcre2-16-10.39-r0
-libproc-3.3.17-r1
-libsm-1.2.3-r0
-libssl1.1-1.1.1n-r0
-libstdc++-11.2.1_git20220219-r1
-libtorrent-rasterbar-2.0.5-r3
-libuuid-2.38-r0
-libx11-1.7.5-r0
-libxau-1.0.9-r0
-libxcb-1.14-r2
-libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxmu-1.1.3-r0
-libxt-1.2.1-r0
-linux-pam-1.5.2-r0
-mpdecimal-2.5.1-r1
-musl-1.2.3-r0
-musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20220402-r0
-ncurses-terminfo-base-6.3_p20220402-r0
-nghttp2-libs-1.47.0-r0
-openssl-1.1.1n-r0
-p7zip-17.04-r2
-pcre-8.45-r2
-procps-3.3.17-r1
-python3-3.10.3-r0
-qbittorrent-nox-4.4.2-r3
-qt6-qtbase-6.2.4-r0
-readline-8.1.2-r0
-scanelf-1.3.3-r0
-shadow-4.10-r3
-skalibs-2.11.2.0-r0
-sqlite-libs-3.37.2-r0
-ssl_client-1.35.0-r8
-tzdata-2022a-r0
-utmps-libs-0.1.2.0-r0
-xdg-utils-1.1.3-r3
-xprop-1.2.5-r0
-xset-1.2.4-r0
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.12-r0
-zstd-libs-1.5.2-r0
+adduser3.118ubuntu2
+apt2.0.6
+apt-utils2.0.6
+base-files11ubuntu5.4
+base-passwd3.5.47
+bash5.0-6ubuntu1.1
+bsdutils1:2.34-0.1ubuntu9.1
+bzip21.0.8-2
+ca-certificates20210119~20.04.2
+coreutils8.30-3ubuntu2
+curl7.68.0-1ubuntu2.7
+dash0.5.10.2-6
+dbus1.12.16-2ubuntu2.1
+debconf1.5.73
+debianutils4.9.1
+diffutils1:3.7-3
+dirmngr2.2.19-3ubuntu2.1
+dpkg1.19.7ubuntu3
+e2fsprogs1.45.5-2ubuntu1
+fdisk2.34-0.1ubuntu9.1
+file1:5.38-4
+findutils4.7.0-1ubuntu1
+gcc-10-base10.3.0-1ubuntu1~20.04
+geoip-bin1.6.12-6build1
+geoip-database20191224-2
+gnupg2.2.19-3ubuntu2.1
+gnupg-l10n2.2.19-3ubuntu2.1
+gnupg-utils2.2.19-3ubuntu2.1
+gpg2.2.19-3ubuntu2.1
+gpg-agent2.2.19-3ubuntu2.1
+gpgconf2.2.19-3ubuntu2.1
+gpgsm2.2.19-3ubuntu2.1
+gpgv2.2.19-3ubuntu2.1
+gpg-wks-client2.2.19-3ubuntu2.1
+gpg-wks-server2.2.19-3ubuntu2.1
+grep3.4-1
+gzip1.10-0ubuntu4
+hostname3.23
+init-system-helpers1.57
+krb5-locales1.17-6ubuntu4.1
+libacl12.2.53-6
+libapparmor12.13.3-7ubuntu5.1
+libapt-pkg6.02.0.6
+libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
+libassuan02.5.3-7ubuntu2
+libattr11:2.4.48-5
+libaudit11:2.8.5-2ubuntu6
+libaudit-common1:2.8.5-2ubuntu6
+libblkid12.34-0.1ubuntu9.1
+libbrotli11.0.7-6ubuntu0.1
+libbz2-1.01.0.8-2
+libc62.31-0ubuntu9.2
+libcap-ng00.7.9-2.1build1
+libc-bin2.31-0ubuntu9.2
+libcom-err21.45.5-2ubuntu1
+libcrypt11:4.4.10-10ubuntu4
+libcurl47.68.0-1ubuntu2.7
+libdb5.35.3.28+dfsg1-0.6ubuntu2
+libdbus-1-31.12.16-2ubuntu2.1
+libdebconfclient00.251ubuntu1
+libdouble-conversion33.1.5-4ubuntu1
+libexpat12.2.9-1build1
+libext2fs21.45.5-2ubuntu1
+libfdisk12.34-0.1ubuntu9.1
+libffi73.3-4
+libgcc-s110.3.0-1ubuntu1~20.04
+libgcrypt201.8.5-5ubuntu1.1
+libgdbm61.18.1-5
+libgdbm-compat41.18.1-5
+libgeoip11.6.12-6build1
+libglib2.0-02.64.6-1~ubuntu20.04.4
+libglib2.0-data2.64.6-1~ubuntu20.04.4
+libgmp102:6.2.0+dfsg-4
+libgnutls303.6.13-2ubuntu1.6
+libgpg-error01.37-1
+libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
+libgssapi-krb5-21.17-6ubuntu4.1
+libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
+libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
+libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
+libhogweed53.5.1+really3.5.1-2ubuntu0.2
+libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
+libicu6666.1-2ubuntu2
+libidn2-02.2.0-2
+libk5crypto31.17-6ubuntu4.1
+libkeyutils11.6-6ubuntu1
+libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
+libkrb5-31.17-6ubuntu4.1
+libkrb5support01.17-6ubuntu4.1
+libksba81.3.5-2
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
+libldap-common2.4.49+dfsg-2ubuntu1.8
+liblz4-11.9.2-2ubuntu0.20.04.1
+liblzma55.2.4-1ubuntu1
+libmagic11:5.38-4
+libmagic-mgc1:5.38-4
+libmount12.34-0.1ubuntu9.1
+libmpdec22.4.2-3
+libncurses66.2-0ubuntu2
+libncursesw66.2-0ubuntu2
+libnetaddr-ip-perl4.079+dfsg-1build4
+libnettle73.5.1+really3.5.1-2ubuntu0.2
+libnghttp2-141.40.0-1build1
+libnpth01.6-1
+libp11-kit00.23.20-1ubuntu0.1
+libpam0g1.3.1-5ubuntu4.2
+libpam-modules1.3.1-5ubuntu4.2
+libpam-modules-bin1.3.1-5ubuntu4.2
+libpam-runtime1.3.1-5ubuntu4.2
+libpcre2-16-010.34-7
+libpcre2-8-010.34-7
+libpcre32:8.39-12build1
+libperl5.305.30.0-9ubuntu0.2
+libprocps82:3.3.16-1ubuntu2.3
+libpsl50.21.0-1ubuntu1
+libpython3.8-minimal3.8.10-0ubuntu1~20.04.1
+libpython3.8-stdlib3.8.10-0ubuntu1~20.04.1
+libpython3-stdlib3.8.2-0ubuntu2
+libqt5core5a5.12.8+dfsg-0ubuntu1
+libqt5dbus55.12.8+dfsg-0ubuntu1
+libqt5network55.12.8+dfsg-0ubuntu1
+libqt5sql55.12.8+dfsg-0ubuntu1
+libqt5sql5-sqlite5.12.8+dfsg-0ubuntu1
+libqt5xml55.12.8+dfsg-0ubuntu1
+libreadline88.0-4
+libroken18-heimdal7.7.0+dfsg-1ubuntu1
+librtmp12.4+20151223.gitfa8646d.1-2build1
+libsasl2-22.1.27+dfsg-2
+libsasl2-modules2.1.27+dfsg-2
+libsasl2-modules-db2.1.27+dfsg-2
+libseccomp22.5.1-1ubuntu1~20.04.1
+libselinux13.0-1build2
+libsemanage13.0-1build2
+libsemanage-common3.0-1build2
+libsepol13.0-1
+libsmartcols12.34-0.1ubuntu9.1
+libsocket6-perl0.29-1build1
+libsqlite3-03.31.1-4ubuntu0.2
+libss21.45.5-2ubuntu1
+libssh-40.9.3-2ubuntu2.2
+libssl1.11.1.1f-1ubuntu2.8
+libstdc++610.3.0-1ubuntu1~20.04
+libsystemd0245.4-4ubuntu3.13
+libtasn1-64.16.0-2
+libtinfo66.2-0ubuntu2
+libtorrent-rasterbar101.2.14+git20210623.c996ed7ef7-1ppa1~20.04
+libudev1245.4-4ubuntu3.13
+libunistring20.9.10-2
+libuuid12.34-0.1ubuntu9.1
+libwind0-heimdal7.7.0+dfsg-1ubuntu1
+libxml22.9.10+dfsg-5ubuntu0.20.04.1
+libzstd11.4.4+dfsg-3ubuntu0.1
+locales2.31-0ubuntu9.2
+login1:4.8.1-1ubuntu5.20.04.1
+logsave1.45.5-2ubuntu1
+lsb-base11.1.0ubuntu2
+mawk1.3.4.20200120-2
+mime-support3.64ubuntu1
+mount2.34-0.1ubuntu9.1
+ncurses-base6.2-0ubuntu2
+ncurses-bin6.2-0ubuntu2
+netbase6.1
+openssl1.1.1f-1ubuntu2.8
+p7zip16.02+dfsg-7build1
+p7zip-full16.02+dfsg-7build1
+passwd1:4.8.1-1ubuntu5.20.04.1
+perl5.30.0-9ubuntu0.2
+perl-base5.30.0-9ubuntu0.2
+perl-modules-5.305.30.0-9ubuntu0.2
+pinentry-curses1.1.0-3build1
+procps2:3.3.16-1ubuntu2.3
+publicsuffix20200303.0012-1
+python33.8.2-0ubuntu2
+python3.83.8.10-0ubuntu1~20.04.1
+python3.8-minimal3.8.10-0ubuntu1~20.04.1
+python3-minimal3.8.2-0ubuntu2
+qbittorrent-cli1.7.21116-1
+qbittorrent-nox4.4.0~202106140855-7320-2bd5aca3a~ubuntu20.04.1
+qttranslations5-l10n5.12.8-0ubuntu1
+readline-common8.0-4
+sed4.7-1
+sensible-utils0.0.12+nmu1
+shared-mime-info1.15-1
+sysvinit-utils2.96-2.1ubuntu1
+tar1.30+dfsg-7ubuntu0.20.04.1
+tzdata2021a-2ubuntu0.20.04
+ubuntu-keyring2020.02.11.4
+unrar1:5.6.6-2build1
+unzip6.0-25ubuntu1
+util-linux2.34-0.1ubuntu9.1
+xdg-user-dirs0.17-2ubuntu1
+xz-utils5.2.4-1ubuntu1
+zlib1g1:1.2.11.dfsg-2ubuntu1.2

readme-vars.yml

@@ -23,13 +23,13 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
-  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/downloads", vol_host_path: "</path/to/downloads>", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
   - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
   - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
+  - { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
@@ -69,16 +69,11 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
-  - { date: "01.03.22:", desc: "Add python for search plugin support." }
-  - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
-  - { date: "19.02.22:", desc: "Add jq to build-stage" }
-  - { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
   - { date: "06.01.22:", desc: "Deprecate unstable branch." }
-  - { date: "10.02.21:", desc: "Rebase to focal." }
+  - { date: "24.03.21:", desc: "Rebase to focal." }
   - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
-  - { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
-  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
+  - { date: "05.07.20:", desc: "Shift to Python3" }
+  - { date: "31.10.19:", desc: "Adding unstable tag." }
   - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
   - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }

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

@@ -1,20 +1,15 @@
 #!/usr/bin/with-contenv bash
 
-# make our folder
-mkdir -p /config/qBittorrent
+# make our folders
+mkdir -p \
+	/config/qBittorrent \
+	/config/data
 
 # copy config
 [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
 	cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
 
-# v4.3.3 BT_backup migration
-[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
-    mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \
-    mkdir /config/qBittorrent/BT_backup/ && \
-    cp -a /config/data/qBittorrent/BT_backup/.  /config/qBittorrent/BT_backup/ && \
-    mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
-
-# chown download directory if currently not set to abc
+# chown download directory if currently set to root
 if [[ -d /downloads ]]; then
   if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
     chown -R abc:abc /downloads

root/etc/cont-init.d/99-deprecate

@@ -0,0 +1,21 @@
+#! /usr/bin/with-contenv bash
+
+echo '
+******************************************************
+******************************************************
+*                                                    *
+*                                                    *
+*             This image is deprecated.              *
+*      We will not offer support for this image      *
+*             and it will not be updated.            *
+*                                                    *
+*                                                    *
+******************************************************
+******************************************************
+
+We recommend our stable qbittorrent branch instead:
+https://github.com/linuxserver/docker-qbittorrent
+
+
+******************************************************
+******************************************************'

root/etc/services.d/qbittorrent/run

@@ -2,5 +2,10 @@
 
 WEBUI_PORT=${WEBUI_PORT:-8080}
 
+if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
+  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
+  umask ${UMASK_SET}
+fi
+
 exec \
 	s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"

root/usr/bin/qbt

@@ -1,14 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# qbt bash wrapper to prompt user when trying to save password
-if [[ "$@" == "settings set password" ]]; then
-  echo "Setting password is not supported"
-  echo "Please use --ask-for-password or --password"
-elif [[ "$@" == "settings set"* ]]; then
-  /qbt/qbt "$@"
-elif [[ "$@" != *"--ask-for-password"* ]] && [[ "$@" != *"--password"* ]];then
-  echo "Please use --ask-for-password or --password and ensure username/url are set"
-  /qbt/qbt "$@"
-else
-  /qbt/qbt "$@"
-fi