Bot Updating Package Versions

2021-04-30 18:03:23 -04:00 · 2021-04-28 16:09:23 +00:00 · 2021-04-26 19:39:15 +00:00 · 2021-04-26 20:31:43 +01:00 · 2021-04-26 19:58:22 +01:00 · 2021-04-26 19:27:58 +01:00
12 changed files with 599 additions and 505 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
 ### Testing your changes
-```
+```bash
 git clone https://github.com/linuxserver/docker-qbittorrent.git
 cd docker-qbittorrent
 docker build \
@@ -106,13 +106,14 @@ docker build \
 ```
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-```
+
 ```bash
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
-## Update the chagelog
+## 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
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -4,35 +4,35 @@ on:
  workflow_dispatch:
 jobs:
-  external-trigger-unstable:
+  external-trigger-master:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
      - name: External Trigger
-        if: github.ref == 'refs/heads/unstable'
+        if: github.ref == 'refs/heads/master'
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
            exit 0
          fi
-          echo "**** External trigger running off of unstable branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
+          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}')
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/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 unstable"
+            FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"
            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="unstable"
+          tag="latest"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
            | jq -r '.token')
@@ -54,39 +54,52 @@ 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 unstable"
+            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
            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/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/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. . . ****"
-            response=$(curl -iX POST \
+            EXT_RELEASE_STRIPPED=$(echo ${EXT_RELEASE} | sed 's|^1:||')
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=false \
+            URL_AMD64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-stable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_amd64.deb"
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+            URL_ARMHF="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-stable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_armhf.deb"
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+            URL_ARM64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-stable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_arm64.deb"
-            echo "**** Sleeping 10 seconds until job starts ****"
+            if curl -fL "${URL_AMD64}" >/dev/null && curl -fL "${URL_ARMHF}" >/dev/null && curl -fL "${URL_ARM64}" >/dev/null; then
-            sleep 10
+              echo "**** All artifacts seem to be published, triggering build ****"
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              response=$(curl -iX POST \
-            buildurl="${buildurl%$'\r'}"
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
-            echo "**** Jenkins job build url: ${buildurl} ****"
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Attempting to change the Jenkins job description ****"
+              echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            curl -iX POST \
+              echo "**** Sleeping 10 seconds until job starts ****"
-              "${buildurl}submitDescription" \
+              sleep 10
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+              buildurl="${buildurl%$'\r'}"
-              --data-urlencode "Submit=Submit"
+              echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "**** Notifying Discord ****"
+              echo "**** Attempting to change the Jenkins job description ****"
-            TRIGGER_REASON="A version change was detected for qbittorrent tag unstable. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              curl -iX POST \
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "${buildurl}submitDescription" \
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+                --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}"
              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 latest 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
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -4,25 +4,25 @@ on:
  workflow_dispatch:
 jobs:
-  package-trigger-unstable:
+  package-trigger-master:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
      - name: Package Trigger
-        if: github.ref == 'refs/heads/unstable'
+        if: github.ref == 'refs/heads/master'
        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
            exit 0
          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/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 unstable branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
+          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/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 ****"
--- a/62
+++ b/62
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 # set version label
 ARG BUILD_DATE
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
+  echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	gnupg \
+    gnupg \
-	python3 && \
+    python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
+  echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
+  fi && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	p7zip-full \
+    p7zip-full \
-	qbittorrent-cli \
+    qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
+    unrar \
-	geoip-bin \
+    geoip-bin \
-	unzip && \
+    unzip && \
- echo "**** cleanup ****" && \
+  echo "**** cleanup ****" && \
- apt-get clean && \
+  apt-get clean && \
- rm -rf \
+  rm -rf \
-	/tmp/* \
+    /tmp/* \
-	/var/lib/apt/lists/* \
+    /var/lib/apt/lists/* \
-	/var/tmp/*
+    /var/tmp/*
 # add local files
 COPY root/ /
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 # set version label
 ARG BUILD_DATE
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
+  echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	gnupg \
+    gnupg \
-	python3 && \
+    python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
+  echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
+  fi && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	p7zip-full \
+    p7zip-full \
-	qbittorrent-cli \
+    qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
+    unrar \
-	geoip-bin \
+    geoip-bin \
-	unzip && \
+    unzip && \
- echo "**** cleanup ****" && \
+  echo "**** cleanup ****" && \
- apt-get clean && \
+  apt-get clean && \
- rm -rf \
+  rm -rf \
-	/tmp/* \
+    /tmp/* \
-	/var/lib/apt/lists/* \
+    /var/lib/apt/lists/* \
-	/var/tmp/*
+    /var/tmp/*
 # add local files
 COPY root/ /
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 # set version label
 ARG BUILD_DATE
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
+  echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	gnupg \
+    gnupg \
-	python3 && \
+    python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
+  echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
+  fi && \
- apt-get update && \
+  apt-get update && \
- apt-get install -y \
+  apt-get install -y \
-	p7zip-full \
+    p7zip-full \
-	qbittorrent-cli \
+    qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
+    unrar \
-	geoip-bin \
+    geoip-bin \
-	unzip && \
+    unzip && \
- echo "**** cleanup ****" && \
+  echo "**** cleanup ****" && \
- apt-get clean && \
+  apt-get clean && \
- rm -rf \
+  rm -rf \
-	/tmp/* \
+    /tmp/* \
-	/var/lib/apt/lists/* \
+    /var/lib/apt/lists/* \
-	/var/tmp/*
+    /var/tmp/*
 # add local files
 COPY root/ /
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config
--- a/184
+++ b/184
@@ -41,7 +41,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}':unstable 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}':latest 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' ''',
@@ -55,7 +55,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 ./.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/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.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(
@@ -103,7 +103,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/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 = 'custom_command'
        }
@@ -119,10 +119,10 @@ pipeline {
        }
      }
    }
-    // If this is a unstable build use live docker endpoints
+    // If this is a master build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -131,20 +131,20 @@ pipeline {
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            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
+            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
          } else {
-            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = 'unstable-' + 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 = 'unstable-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "unstable"}
+        not {branch "master"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -153,13 +153,13 @@ pipeline {
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            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
+            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
          } else {
-            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 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 = 'unstable-' + 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 = 'unstable-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -175,13 +175,13 @@ pipeline {
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            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
+            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
          } else {
-            env.CI_TAGS = 'unstable-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 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 = 'unstable-' + 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 = 'unstable-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = '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/'
        }
@@ -219,7 +219,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -230,13 +230,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=unstable -v ${TEMPDIR}:/ansible/jenkins 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 
              # 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 unstable
+                git checkout -f master
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
@@ -259,7 +259,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 unstable
+                git checkout -f master
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
@@ -281,7 +281,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 unstable
+                git checkout -f master
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -307,22 +307,24 @@ pipeline {
                git commit -m 'Bot Updating Documentation'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
              fi
-              mkdir -p ${TEMPDIR}/unraid 
+              mkdir -p ${TEMPDIR}/unraid
              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
-              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
-                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
              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, skipping Unraid template upload"
+                  echo "Image is on the ignore list, removing Unraid template"
                  git rm unraid/${CONTAINER_NAME}.xml || :
                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
                else
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  cd ${TEMPDIR}/unraid/templates/
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
                fi
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
              fi
              rm -Rf ${TEMPDIR}'''
        script{
@@ -335,7 +337,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -379,8 +381,21 @@ pipeline {
      }
      steps {
        echo "Running on node: ${NODE_NAME}"
-        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
+        sh "docker build \
-        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+          --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
          --label \"org.opencontainers.image.authors=linuxserver.io\" \
          --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
          --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
          --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
          --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
          --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
          --label \"org.opencontainers.image.vendor=linuxserver.io\" \
          --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
          --label \"org.opencontainers.image.title=Qbittorrent\" \
          --label \"org.opencontainers.image.description=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.\" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
@@ -393,8 +408,21 @@ pipeline {
        stage('Build X86') {
          steps {
            echo "Running on node: ${NODE_NAME}"
-            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
+            sh "docker build \
-            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Qbittorrent\" \
              --label \"org.opencontainers.image.description=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.\" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
        stage('Build ARMHF') {
@@ -407,8 +435,21 @@ pipeline {
            sh '''#! /bin/bash
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
               '''
-            sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+            sh "docker build \
-                         --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Qbittorrent\" \
              --label \"org.opencontainers.image.description=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.\" \
              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -428,8 +469,21 @@ pipeline {
            sh '''#! /bin/bash
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
               '''
-            sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+            sh "docker build \
-                         --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Qbittorrent\" \
              --label \"org.opencontainers.image.description=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.\" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -444,7 +498,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -472,7 +526,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 unstable
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -496,7 +550,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -517,7 +571,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "unstable"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -613,9 +667,9 @@ pipeline {
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:unstable
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker push ${PUSHIMAGE}:unstable
+                    docker push ${PUSHIMAGE}:latest
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                  done
@@ -626,7 +680,7 @@ pipeline {
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:unstable || :
+                  ${DELETEIMAGE}:latest || :
                done
             '''
        }
@@ -663,25 +717,25 @@ 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-unstable
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
                    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 push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-unstable
+                    docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker push ${MANIFESTIMAGE}:arm64v8-latest
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest push --purge ${MANIFESTIMAGE}:unstable || :
+                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:amd64-unstable ${MANIFESTIMAGE}:arm32v7-unstable ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm32v7-unstable --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm64v8-unstable --os linux --arch arm64 --variant v8
+                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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
@@ -690,7 +744,7 @@ 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}:unstable
+                    docker manifest push --purge ${MANIFESTIMAGE}:latest
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
                  done
@@ -700,13 +754,13 @@ pipeline {
                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-unstable \
+                  ${DELETEIMAGE}:amd64-latest \
                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-unstable \
+                  ${DELETEIMAGE}:arm32v7-latest \
                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-unstable \
+                  ${DELETEIMAGE}:arm64v8-latest \
                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
                done
                docker rmi \
@@ -719,7 +773,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "unstable"
+        branch "master"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -731,17 +785,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 unstable",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "unstable",\
+                     "target_commitish": "master",\
                     "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": true}' >> releasebody.json
+              printf '","draft": false,"prerelease": false}' >> 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'''
      }
@@ -765,7 +819,7 @@ 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="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
                docker pull ghcr.io/linuxserver/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
@@ -12,13 +12,14 @@
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
- * regular and timely application updates
+* regular and timely application updates
- * easy user mappings (PGID, PUID)
+* easy user mappings (PGID, PUID)
- * custom base image with s6 overlay
+* custom base image with s6 overlay
- * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
- * regular security updates
+* regular security updates
 Find us at:
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
@@ -35,7 +36,7 @@ Find us at:
 [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
 [![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%2Funstable%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/)
+[![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/)
 [![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.
@@ -65,103 +66,6 @@ This image provides various versions that are available via tags. `latest` tag u
 | latest | Stable qbittorrent releases |
 | unstable | Unstable qbittorrent releases |
 ## Usage
 Here are some example snippets to help you get started creating a container.
 ### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
 Compatible with docker-compose v2 schemas.
 ```yaml
 ---
 version: "2.1"
 services:
  qbittorrent:
    image: ghcr.io/linuxserver/qbittorrent
    container_name: qbittorrent
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Europe/London
      - WEBUI_PORT=8080
    volumes:
      - </path/to/appdata/config>:/config
      - </path/to/downloads>:/downloads
    ports:
      - 6881:6881
      - 6881:6881/udp
      - 8080:8080
    restart: unless-stopped
 ```
 ### docker cli
 ```
 docker run -d \
  --name=qbittorrent \
  -e PUID=1000 \
  -e PGID=1000 \
  -e TZ=Europe/London \
  -e WEBUI_PORT=8080 \
  -p 6881:6881 \
  -p 6881:6881/udp \
  -p 8080:8080 \
  -v </path/to/appdata/config>:/config \
  -v </path/to/downloads>:/downloads \
  --restart unless-stopped \
  ghcr.io/linuxserver/qbittorrent
 ```
 ## Parameters
 Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 | Parameter | Function |
 | :----: | --- |
 | `-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 |
 | `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 ## Environment variables from files (Docker secrets)
 You can set any environment variable from a file by using a special prepend `FILE__`.
 As an example:
 ```
 -e FILE__PASSWORD=/run/secrets/mysecretpassword
 ```
 Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 ## Umask for running applications
 For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
 Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
 ## User / Group Identifiers
 When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
 ```
  $ id username
    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
 ```
 &nbsp;
 ## Application Setup
 The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
@@ -187,13 +91,106 @@ WebUI\Address=*
 WebUI\ServerDomains=*
 ```
 ## Usage
 Here are some example snippets to help you get started creating a container.
 ### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
 Compatible with docker-compose v2 schemas.
 ```yaml
 ---
 version: "2.1"
 services:
  qbittorrent:
    image: ghcr.io/linuxserver/qbittorrent
    container_name: qbittorrent
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Europe/London
      - WEBUI_PORT=8080
    volumes:
      - /path/to/appdata/config:/config
      - /path/to/downloads:/downloads
    ports:
      - 6881:6881
      - 6881:6881/udp
      - 8080:8080
    restart: unless-stopped
 ```
 ### docker cli
 ```bash
 docker run -d \
  --name=qbittorrent \
  -e PUID=1000 \
  -e PGID=1000 \
  -e TZ=Europe/London \
  -e WEBUI_PORT=8080 \
  -p 6881:6881 \
  -p 6881:6881/udp \
  -p 8080:8080 \
  -v /path/to/appdata/config:/config \
  -v /path/to/downloads:/downloads \
  --restart unless-stopped \
  ghcr.io/linuxserver/qbittorrent
 ```
 ## Parameters
 Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 | Parameter | Function |
 | :----: | --- |
 | `-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 |
 | `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 ## Environment variables from files (Docker secrets)
 You can set any environment variable from a file by using a special prepend `FILE__`.
 As an example:
 ```bash
 -e FILE__PASSWORD=/run/secrets/mysecretpassword
 ```
 Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 ## Umask for running applications
 For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
 Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
 ## User / Group Identifiers
 When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
 ```bash
  $ id username
    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
 ```
 ## Docker Mods
 [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=qbittorrent&query=%24.mods%5B%27qbittorrent%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
 We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
 ## Support Info
 * Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
@@ -210,6 +207,7 @@ Most of our images are static, versioned, and require an image update and contai
 Below are the instructions for updating containers:
 ### Via Docker Compose
 * Update all images: `docker-compose pull`
  * or update a single image: `docker-compose pull qbittorrent`
 * Let compose update all containers as necessary: `docker-compose up -d`
@@ -217,6 +215,7 @@ Below are the instructions for updating containers:
 * You can also remove the old dangling images: `docker image prune`
 ### Via Docker Run
 * Update the image: `docker pull ghcr.io/linuxserver/qbittorrent`
 * Stop the running container: `docker stop qbittorrent`
 * Delete the container: `docker rm qbittorrent`
@@ -224,24 +223,29 @@ Below are the instructions for updating containers:
 * You can also remove the old dangling images: `docker image prune`
 ### Via Watchtower auto-updater (only use if you don't remember the original parameters)
 * Pull the latest image at its tag and replace it with the same env variables in one run:
-  ```
+
  ```bash
  docker run --rm \
  -v /var/run/docker.sock:/var/run/docker.sock \
  containrrr/watchtower \
  --run-once qbittorrent
  ```
 * You can also remove the old dangling images: `docker image prune`
 **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 ## Building locally
 If you want to make local modifications to these images for development purposes or just to customize the logic:
-```
+
 ```bash
 git clone https://github.com/linuxserver/docker-qbittorrent.git
 cd docker-qbittorrent
 docker build \
@@ -251,7 +255,8 @@ docker build \
 ```
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-```
+
 ```bash
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
@@ -259,9 +264,10 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
 * **10.02.21:** - Rebase to focal.
 * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
-* **05.07.20:** - Shift to Python3
+* **12.11.20:** - Stop creating /config/data directory on startup
-* **31.10.19:** - Adding unstable tag.
+* **03.04.20:** - Fix adding search engine plugin
 * **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.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,10 +3,11 @@
 # jenkins variables
 project_name: docker-qbittorrent
 external_type: na
-custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/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_type: stable
-release_tag: unstable
+release_tag: latest
-ls_branch: unstable
+ls_branch: master
 custom_external_trigger: true
 repo_vars:
  - CONTAINER_NAME = 'qbittorrent'
  - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,180 +1,191 @@
-adduser3.116ubuntu1
+adduser3.118ubuntu2
-apt1.6.12ubuntu0.2
+apt2.0.5
-apt-utils1.6.12ubuntu0.2
+apt-utils2.0.5
-base-files10.1ubuntu2.10
+base-files11ubuntu5.3
-base-passwd3.5.44
+base-passwd3.5.47
-bash4.4.18-2ubuntu1.2
+bash5.0-6ubuntu1.1
-bsdutils1:2.31.1-0.4ubuntu3.7
+bsdutils1:2.34-0.1ubuntu9.1
-bzip21.0.6-8.1ubuntu0.2
+bzip21.0.8-2
-ca-certificates20210119~18.04.1
+ca-certificates20210119~20.04.1
-coreutils8.28-1ubuntu1
+coreutils8.30-3ubuntu2
-curl7.58.0-2ubuntu3.12
+curl7.68.0-1ubuntu2.5
-dash0.5.8-2.10
+dash0.5.10.2-6
-dbus1.12.2-1ubuntu1.2
+dbus1.12.16-2ubuntu2.1
-debconf1.5.66ubuntu1
+debconf1.5.73
-debianutils4.8.4
+debianutils4.9.1
-diffutils1:3.6-1
+diffutils1:3.7-3
-dirmngr2.2.4-1ubuntu1.4
+dirmngr2.2.19-3ubuntu2.1
-dpkg1.19.0.5ubuntu2.3
+dpkg1.19.7ubuntu3
-e2fsprogs1.44.1-1ubuntu1.3
+e2fsprogs1.45.5-2ubuntu1
-fdisk2.31.1-0.4ubuntu3.7
+fdisk2.34-0.1ubuntu9.1
-file1:5.32-2ubuntu0.4
+file1:5.38-4
-findutils4.6.0+git+20170828-2
+findutils4.7.0-1ubuntu1
-gcc-8-base8.4.0-1ubuntu1~18.04
+gcc-10-base10.2.0-5ubuntu1~20.04
-geoip-bin1.6.12-1
+geoip-bin1.6.12-6build1
-geoip-database20180315-1
+geoip-database20191224-2
-gnupg2.2.4-1ubuntu1.4
+gnupg2.2.19-3ubuntu2.1
-gnupg-l10n2.2.4-1ubuntu1.4
+gnupg-l10n2.2.19-3ubuntu2.1
-gnupg-utils2.2.4-1ubuntu1.4
+gnupg-utils2.2.19-3ubuntu2.1
-gpg2.2.4-1ubuntu1.4
+gpg2.2.19-3ubuntu2.1
-gpg-agent2.2.4-1ubuntu1.4
+gpg-agent2.2.19-3ubuntu2.1
-gpgconf2.2.4-1ubuntu1.4
+gpgconf2.2.19-3ubuntu2.1
-gpgsm2.2.4-1ubuntu1.4
+gpgsm2.2.19-3ubuntu2.1
-gpgv2.2.4-1ubuntu1.4
+gpgv2.2.19-3ubuntu2.1
-gpg-wks-client2.2.4-1ubuntu1.4
+gpg-wks-client2.2.19-3ubuntu2.1
-gpg-wks-server2.2.4-1ubuntu1.4
+gpg-wks-server2.2.19-3ubuntu2.1
-grep3.1-2build1
+grep3.4-1
-gzip1.6-5ubuntu1
+gzip1.10-0ubuntu4
-hostname3.20
+hostname3.23
-init-system-helpers1.51
+init-system-helpers1.57
-krb5-locales1.16-2ubuntu0.2
+krb5-locales1.17-6ubuntu4.1
-libacl12.2.52-3build1
+libacl12.2.53-6
-libapparmor12.12-4ubuntu5.1
+libapparmor12.13.3-7ubuntu5.1
-libapt-inst2.01.6.12ubuntu0.2
+libapt-pkg6.02.0.5
-libapt-pkg5.01.6.12ubuntu0.2
+libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
-libasn1-8-heimdal7.5.0+dfsg-1
+libassuan02.5.3-7ubuntu2
-libassuan02.5.1-2
+libattr11:2.4.48-5
-libattr11:2.4.47-2build1
+libaudit11:2.8.5-2ubuntu6
-libaudit11:2.8.2-1ubuntu1.1
+libaudit-common1:2.8.5-2ubuntu6
-libaudit-common1:2.8.2-1ubuntu1.1
+libblkid12.34-0.1ubuntu9.1
-libblkid12.31.1-0.4ubuntu3.7
+libbrotli11.0.7-6ubuntu0.1
-libboost-system1.65.11.65.1+dfsg-0ubuntu5
+libbz2-1.01.0.8-2
-libbz2-1.01.0.6-8.1ubuntu0.2
+libc62.31-0ubuntu9.2
-libc62.27-3ubuntu1.4
+libcap-ng00.7.9-2.1build1
-libcap-ng00.7.7-3.1
+libc-bin2.31-0ubuntu9.2
-libc-bin2.27-3ubuntu1.4
+libcom-err21.45.5-2ubuntu1
-libcom-err21.44.1-1ubuntu1.3
+libcrypt11:4.4.10-10ubuntu4
-libcurl47.58.0-2ubuntu3.12
+libcurl47.68.0-1ubuntu2.5
-libdb5.35.3.28-13.1ubuntu1.1
+libdb5.35.3.28+dfsg1-0.6ubuntu2
-libdbus-1-31.12.2-1ubuntu1.2
+libdbus-1-31.12.16-2ubuntu2.1
-libdebconfclient00.213ubuntu1
+libdebconfclient00.251ubuntu1
-libdouble-conversion12.0.1-4ubuntu1
+libdouble-conversion33.1.5-4ubuntu1
-libexpat12.2.5-3ubuntu0.2
+libexpat12.2.9-1build1
-libext2fs21.44.1-1ubuntu1.3
+libext2fs21.45.5-2ubuntu1
-libfdisk12.31.1-0.4ubuntu3.7
+libfdisk12.34-0.1ubuntu9.1
-libffi63.2.1-8
+libffi73.3-4
-libgcc11:8.4.0-1ubuntu1~18.04
+libgcc-s110.2.0-5ubuntu1~20.04
-libgcrypt201.8.1-4ubuntu1.2
+libgcrypt201.8.5-5ubuntu1
-libgeoip11.6.12-1
+libgdbm61.18.1-5
-libglib2.0-02.56.4-0ubuntu0.18.04.8
+libgdbm-compat41.18.1-5
-libglib2.0-data2.56.4-0ubuntu0.18.04.8
+libgeoip11.6.12-6build1
-libgmp102:6.1.2+dfsg-2
+libglib2.0-02.64.6-1~ubuntu20.04.3
-libgnutls303.5.18-1ubuntu1.4
+libglib2.0-data2.64.6-1~ubuntu20.04.3
-libgpg-error01.27-6
+libgmp102:6.2.0+dfsg-4
-libgssapi3-heimdal7.5.0+dfsg-1
+libgnutls303.6.13-2ubuntu1.3
-libgssapi-krb5-21.16-2ubuntu0.2
+libgpg-error01.37-1
-libhcrypto4-heimdal7.5.0+dfsg-1
+libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
-libheimbase1-heimdal7.5.0+dfsg-1
+libgssapi-krb5-21.17-6ubuntu4.1
-libheimntlm0-heimdal7.5.0+dfsg-1
+libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
-libhogweed43.4-1
+libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
-libhx509-5-heimdal7.5.0+dfsg-1
+libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
-libicu6060.2-3ubuntu3.1
+libhogweed53.5.1+really3.5.1-2ubuntu0.1
-libidn2-02.0.4-1.1ubuntu0.2
+libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
-libk5crypto31.16-2ubuntu0.2
+libicu6666.1-2ubuntu2
-libkeyutils11.5.9-9.2ubuntu2
+libidn2-02.2.0-2
-libkrb5-26-heimdal7.5.0+dfsg-1
+libk5crypto31.17-6ubuntu4.1
-libkrb5-31.16-2ubuntu0.2
+libkeyutils11.6-6ubuntu1
-libkrb5support01.16-2ubuntu0.2
+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.45+dfsg-1ubuntu1.10
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
-libldap-common2.4.45+dfsg-1ubuntu1.10
+libldap-common2.4.49+dfsg-2ubuntu1.8
-liblz4-10.0~r131-2ubuntu3
+liblz4-11.9.2-2
-liblzma55.2.2-1.3
+liblzma55.2.4-1ubuntu1
-libmagic11:5.32-2ubuntu0.4
+libmagic11:5.38-4
-libmagic-mgc1:5.32-2ubuntu0.4
+libmagic-mgc1:5.38-4
-libmount12.31.1-0.4ubuntu3.7
+libmount12.34-0.1ubuntu9.1
-libmpdec22.4.2-1ubuntu1
+libmpdec22.4.2-3
-libncurses56.1-1ubuntu1.18.04
+libncurses66.2-0ubuntu2
-libncursesw56.1-1ubuntu1.18.04
+libncursesw66.2-0ubuntu2
-libnettle63.4-1
+libnetaddr-ip-perl4.079+dfsg-1build4
-libnghttp2-141.30.0-1ubuntu1
+libnettle73.5.1+really3.5.1-2ubuntu0.1
-libnpth01.5-3
+libnghttp2-141.40.0-1build1
-libp11-kit00.23.9-2ubuntu0.1
+libnpth01.6-1
-libpam0g1.1.8-3.6ubuntu2.18.04.2
+libp11-kit00.23.20-1ubuntu0.1
-libpam-modules1.1.8-3.6ubuntu2.18.04.2
+libpam0g1.3.1-5ubuntu4.1
-libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
+libpam-modules1.3.1-5ubuntu4.1
-libpam-runtime1.1.8-3.6ubuntu2.18.04.2
+libpam-modules-bin1.3.1-5ubuntu4.1
-libpcre32:8.39-9
+libpam-runtime1.3.1-5ubuntu4.1
-libprocps62:3.3.12-3ubuntu1.2
+libpcre2-16-010.34-7
-libpsl50.19.1-5build1
+libpcre2-8-010.34-7
-libpython3.6-minimal3.6.9-1~18.04ubuntu1.4
+libpcre32:8.39-12build1
-libpython3.6-stdlib3.6.9-1~18.04ubuntu1.4
+libperl5.305.30.0-9ubuntu0.2
-libpython3-stdlib3.6.7-1~18.04
+libprocps82:3.3.16-1ubuntu2.1
-libqt5core5a5.9.5+dfsg-0ubuntu2.5
+libpsl50.21.0-1ubuntu1
-libqt5dbus55.9.5+dfsg-0ubuntu2.5
+libpython3.8-minimal3.8.5-1~20.04.2
-libqt5network55.9.5+dfsg-0ubuntu2.5
+libpython3.8-stdlib3.8.5-1~20.04.2
-libqt5xml55.9.5+dfsg-0ubuntu2.5
+libpython3-stdlib3.8.2-0ubuntu2
-libreadline77.0-3
+libqt5core5a5.12.8+dfsg-0ubuntu1
-libroken18-heimdal7.5.0+dfsg-1
+libqt5dbus55.12.8+dfsg-0ubuntu1
-librtmp12.4+20151223.gitfa8646d.1-1
+libqt5network55.12.8+dfsg-0ubuntu1
-libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.3
+libqt5xml55.12.8+dfsg-0ubuntu1
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libreadline88.0-4
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libroken18-heimdal7.7.0+dfsg-1ubuntu1
-libseccomp22.4.3-1ubuntu3.18.04.3
+librtmp12.4+20151223.gitfa8646d.1-2build1
-libselinux12.7-2build2
+libsasl2-22.1.27+dfsg-2
-libsemanage12.7-2build2
+libsasl2-modules2.1.27+dfsg-2
-libsemanage-common2.7-2build2
+libsasl2-modules-db2.1.27+dfsg-2
-libsepol12.7-1
+libseccomp22.5.1-1ubuntu1~20.04.1
-libsmartcols12.31.1-0.4ubuntu3.7
+libselinux13.0-1build2
-libsqlite3-03.22.0-1ubuntu0.4
+libsemanage13.0-1build2
-libss21.44.1-1ubuntu1.3
+libsemanage-common3.0-1build2
-libssl1.0.01.0.2n-1ubuntu5.6
+libsepol13.0-1
-libssl1.11.1.1-1ubuntu2.1~18.04.8
+libsmartcols12.34-0.1ubuntu9.1
-libstdc++68.4.0-1ubuntu1~18.04
+libsocket6-perl0.29-1build1
-libsystemd0237-3ubuntu10.44
+libsqlite3-03.31.1-4ubuntu0.2
-libtasn1-64.13-2
+libss21.45.5-2ubuntu1
-libtinfo56.1-1ubuntu1.18.04
+libssh-40.9.3-2ubuntu2.1
-libtorrent-rasterbar101.2.12+git20210118.3efdb8a941-1ppa1~18.04
+libssl1.11.1.1f-1ubuntu2.3
-libudev1237-3ubuntu10.44
+libstdc++610.2.0-5ubuntu1~20.04
-libunistring20.9.9-0ubuntu2
+libsystemd0245.4-4ubuntu3.6
-libuuid12.31.1-0.4ubuntu3.7
+libtasn1-64.16.0-2
-libwind0-heimdal7.5.0+dfsg-1
+libtinfo66.2-0ubuntu2
-libxml22.9.4+dfsg1-6.1ubuntu1.3
+libtorrent-rasterbar101.2.13+git20210323.34a979720b-1ppa1~20.04
-libzstd11.3.3+dfsg-2ubuntu1.2
+libudev1245.4-4ubuntu3.6
-locales2.27-3ubuntu1.4
+libunistring20.9.10-2
-login1:4.5-1ubuntu2
+libuuid12.34-0.1ubuntu9.1
-lsb-base9.20170808ubuntu1
+libwind0-heimdal7.7.0+dfsg-1ubuntu1
-mawk1.3.3-17ubuntu3
+libxml22.9.10+dfsg-5
-mime-support3.60ubuntu1
+libzstd11.4.4+dfsg-3ubuntu0.1
-mount2.31.1-0.4ubuntu3.7
+locales2.31-0ubuntu9.3
-ncurses-base6.1-1ubuntu1.18.04
+login1:4.8.1-1ubuntu5.20.04
-ncurses-bin6.1-1ubuntu1.18.04
+logsave1.45.5-2ubuntu1
-openssl1.1.1-1ubuntu2.1~18.04.8
+lsb-base11.1.0ubuntu2
-p7zip16.02+dfsg-6
+mawk1.3.4.20200120-2
-p7zip-full16.02+dfsg-6
+mime-support3.64ubuntu1
-passwd1:4.5-1ubuntu2
+mount2.34-0.1ubuntu9.1
-perl-base5.26.1-6ubuntu0.5
+ncurses-base6.2-0ubuntu2
-pinentry-curses1.1.0-1
+ncurses-bin6.2-0ubuntu2
-procps2:3.3.12-3ubuntu1.2
+netbase6.1
-publicsuffix20180223.1310-1
+openssl1.1.1f-1ubuntu2.3
-python33.6.7-1~18.04
+p7zip16.02+dfsg-7build1
-python3.63.6.9-1~18.04ubuntu1.4
+p7zip-full16.02+dfsg-7build1
-python3.6-minimal3.6.9-1~18.04ubuntu1.4
+passwd1:4.8.1-1ubuntu5.20.04
-python3-minimal3.6.7-1~18.04
+perl5.30.0-9ubuntu0.2
-qbittorrent-cli1.6.20334-1
+perl-base5.30.0-9ubuntu0.2
-qbittorrent-nox4.4.0~202012311433-7161-a579b4a51~ubuntu18.04.1
+perl-modules-5.305.30.0-9ubuntu0.2
-qttranslations5-l10n5.9.5-0ubuntu1
+pinentry-curses1.1.0-3build1
-readline-common7.0-3
+procps2:3.3.16-1ubuntu2.1
-sed4.4-2
+publicsuffix20200303.0012-1
-sensible-utils0.0.12
+python33.8.2-0ubuntu2
-shared-mime-info1.9-2
+python3.83.8.5-1~20.04.2
-sysvinit-utils2.88dsf-59.10ubuntu1
+python3.8-minimal3.8.5-1~20.04.2
-tar1.29b-2ubuntu0.2
+python3-minimal3.8.2-0ubuntu2
-tzdata2021a-0ubuntu0.18.04
+qbittorrent-cli1.7.21116-1
-ubuntu-keyring2018.09.18.1~18.04.0
+qbittorrent-nox1:4.3.4.99~202104300534-7354-9f8a6e8fb~ubuntu20.04.1
-unrar1:5.5.8-1
+qttranslations5-l10n5.12.8-0ubuntu1
-unzip6.0-21ubuntu1.1
+readline-common8.0-4
-util-linux2.31.1-0.4ubuntu3.7
+sed4.7-1
-xdg-user-dirs0.17-1ubuntu1
+sensible-utils0.0.12+nmu1
-xz-utils5.2.2-1.3
+shared-mime-info1.15-1
-zlib1g1:1.2.11.dfsg-0ubuntu2
+sysvinit-utils2.96-2.1ubuntu1
 tar1.30+dfsg-7ubuntu0.20.04.1
 tzdata2021a-0ubuntu0.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
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -24,8 +24,8 @@ 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: "/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: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
@@ -68,9 +68,10 @@ app_setup_block: |
 # changelog
 changelogs:
  - { date: "10.02.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: "05.07.20:", desc: "Shift to Python3" }
+  - { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
-  - { date: "31.10.19:", desc: "Adding unstable tag." }
+  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
  - { 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." }
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -1,17 +1,24 @@
 #!/usr/bin/with-contenv bash
-# make our folders
+# make our folder
-mkdir -p \
+mkdir -p /config/qBittorrent
 	/config/qBittorrent \
 	/config/data
 # copy config
 [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
 	cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-# chown download directory if currently set to root
+# v4.3.3 BT_backup migration
-if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
-	chown -R abc:abc /downloads
+	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
 if [[ -d /downloads ]]; then
  if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
    chown -R abc:abc /downloads
  fi
 fi
 # permissions
Author	SHA1	Message	Date
LinuxServer-CI	d9f7f21791	Bot Updating Package Versions	2021-04-30 18:03:23 -04:00
LinuxServer-CI	2375382a28	Bot Updating Package Versions	2021-04-28 16:09:23 +00:00
LinuxServer-CI	5d811b36c6	Bot Updating Package Versions	2021-04-26 19:39:15 +00:00
Adam	e824d378e7	Merge pull request #122 from linuxserver/qbittorrent-cli-patch	2021-04-26 20:31:43 +01:00
TheSpad	f9483a88b6	Fix indentation	2021-04-26 19:58:22 +01:00
TheSpad	f83f3fd5fb	Update repos for qbittorrent-cli	2021-04-26 19:27:58 +01:00
Adam	ecbb937c39	Merge pull request #120 from TheSpad/master	2021-04-26 17:49:48 +01:00
TheSpad	2bbec40d33	Don't try and chown non-existent directory	2021-04-26 13:28:49 +01:00
Adam	05fbba3e20	Remove /downloads VOLUME declaration	2021-04-26 12:58:17 +01:00
Adam	f3de1fa5e5	Remove /downloads VOLUME declaration	2021-04-26 12:58:07 +01:00
Adam	ca6d61ebe6	Remove /downloads VOLUME declaration	2021-04-26 12:57:49 +01:00
LinuxServer-CI	0bf1c72566	Bot Updating Package Versions	2021-04-25 03:09:06 -04:00
LinuxServer-CI	45fcca6ea9	Bot Updating Package Versions	2021-04-18 08:00:37 +00:00
LinuxServer-CI	1dfe1b178b	Bot Updating Templated Files	2021-04-18 07:52:38 +00:00
LinuxServer-CI	46b481c1f2	Bot Updating Templated Files	2021-04-18 08:51:08 +01:00
LinuxServer-CI	dd76ae8615	Bot Updating Package Versions	2021-04-09 06:00:14 +00:00
LinuxServer-CI	2862d4c64b	Bot Updating Package Versions	2021-04-03 07:56:31 -04:00
LinuxServer-CI	9d15a99d0d	Bot Updating Package Versions	2021-03-28 06:14:19 +01:00
LinuxServer-CI	3e1c6f411d	Bot Updating Package Versions	2021-03-27 06:06:10 +00:00
LinuxServer-CI	727670c265	Bot Updating Package Versions	2021-03-25 17:05:45 +00:00
LinuxServer-CI	2b0dbd321b	Bot Updating Package Versions	2021-03-24 20:50:54 +00:00
Roxedus	4aeb003f8f	Merge pull request #117 from linuxserver/master-custom-trigger 2 stage external trigger to check for artifacts	2021-03-24 21:47:21 +01:00
aptalca	9e38503877	2 stage external trigger to check for artifacts	2021-03-24 15:48:12 -04:00
LinuxServer-CI	0efdf54653	Bot Updating Package Versions	2021-03-22 04:37:19 +00:00
LinuxServer-CI	ef9930aed5	Bot Updating Package Versions	2021-03-15 00:01:29 -04:00
LinuxServer-CI	f2a15340dc	Bot Updating Package Versions	2021-02-28 23:05:11 -05:00
LinuxServer-CI	21daeaf0d5	Bot Updating Package Versions	2021-02-22 04:09:13 +00:00
aptalca	af977a986c	Merge pull request #102 from TheSpad/patch-1 Safer BT_backup migration	2021-02-13 08:46:51 -05:00
Adam	5bb96a4860	Safer BT_backup migration Backup /config/qBittorrent/BT_backup/ before we copy anything Rename /config/data/qBittorrent/BT_backup/ after copy so we don't do it again.	2021-02-13 13:18:26 +00:00
LinuxServer-CI	b1d457d6cf	Bot Updating Package Versions	2021-02-13 08:11:31 -05:00
LinuxServer-CI	14f875769b	Bot Updating Templated Files	2021-02-13 13:04:00 +00:00
LinuxServer-CI	c361bde9db	Bot Updating Templated Files	2021-02-13 13:02:28 +00:00
LinuxServer-CI	2a51275b3a	Bot Updating Templated Files	2021-02-13 13:01:07 +00:00
j0nnymoe	9e1a9ee654	Merge pull request #100 from linuxserver/focal rebase to focal	2021-02-13 12:59:23 +00:00
aptalca	82e6971458	Merge pull request #98 from zaggash/patch-1 v4.3.3 upgrade path	2021-02-10 18:07:39 -05:00
aptalca	db769dc00c	rebase to focal	2021-02-10 17:49:24 -05:00
LinuxServer-CI	6b02d3dd3f	Bot Updating Package Versions	2021-02-08 03:58:50 +00:00
LinuxServer-CI	c7d44af955	Bot Updating Package Versions	2021-02-01 04:09:18 +00:00
Alexandre Pinon	9a267928a3	v4.3.3 upgrade path	2021-01-25 23:58:51 +01:00
aptalca	a82199f478	Merge pull request #95 from linuxserver/master-deprecate-umask_set Deprecate UMASK_SET in favor of UMASK in baseimage	2021-01-20 08:04:19 -05:00
Roxedus	2b00f83793	Deprecate UMASK_SET in favor of UMASK in baseimage	2021-01-20 13:19:04 +01:00
LinuxServer-CI	c730612170	Bot Updating Package Versions	2021-01-19 20:29:51 +00:00
LinuxServer-CI	f4aa670e36	Bot Updating Package Versions	2021-01-18 12:07:40 +00:00
LinuxServer-CI	de3c3d3f8f	Bot Updating Templated Files	2021-01-18 07:00:42 -05:00
LinuxServer-CI	0ad6143ad5	Bot Updating Package Versions	2021-01-08 05:18:43 -05:00
LinuxServer-CI	c40da0d2fa	Bot Updating Package Versions	2021-01-04 11:47:00 +00:00
LinuxServer-CI	8c57809c37	Bot Updating Package Versions	2020-12-27 22:04:12 +00:00
LinuxServer-CI	c0319dd36f	Bot Updating Package Versions	2020-12-21 06:39:10 -05:00
Eric Nemchik	453b53f443	Update Jenkinsfile	2020-12-15 18:54:43 -06:00
LinuxServer-CI	f2aa60834d	Bot Updating Package Versions	2020-12-15 21:25:06 +00:00
LinuxServer-CI	d732a5aa06	Bot Updating Templated Files	2020-12-15 21:17:43 +00:00
LinuxServer-CI	1d603b153f	Bot Updating Templated Files	2020-12-15 21:16:40 +00:00
LinuxServer-CI	c40bd11abd	Bot Updating Package Versions	2020-12-02 05:02:39 +00:00
LinuxServer-CI	fe17f2fc18	Bot Updating Package Versions	2020-11-25 12:13:02 -05:00
LinuxServer-CI	e43be66cdb	Bot Updating Package Versions	2020-11-25 05:02:46 +00:00
LinuxServer-CI	763ec46cf3	Bot Updating Package Versions	2020-11-18 00:01:03 -05:00
LinuxServer-CI	9f10b8e233	Bot Updating Package Versions	2020-11-12 16:38:29 +00:00
LinuxServer-CI	520e471b04	Bot Updating Templated Files	2020-11-12 16:31:34 +00:00
Aaron	2b913e4df5	readme-vars.yml: Update changelog Signed-off-by: Aaron <admin@datahoarder.dev>	2020-11-12 08:30:10 -08:00
Aaron	79d5ee0cd7	30-config: Stop creating /config/data directory on startup Signed-off-by: Aaron <admin@datahoarder.dev>	2020-11-12 08:30:10 -08:00
LinuxServer-CI	46b6b4e375	Bot Updating Package Versions	2020-11-11 00:01:48 -05:00
LinuxServer-CI	8b363149a1	Bot Updating Package Versions	2020-11-02 03:48:20 +00:00
LinuxServer-CI	c87b025488	Bot Updating Templated Files	2020-11-02 03:42:20 +00:00
thelamer	cfc4e1cd36	update baseimages	2020-11-01 19:40:55 -08:00
LinuxServer-CI	a76f73b6d4	Bot Updating Package Versions	2020-10-23 08:13:03 -04:00
LinuxServer-CI	b468b496e9	Bot Updating Package Versions	2020-10-22 08:10:41 -04:00
LinuxServer-CI	6fb3ff602a	Bot Updating Package Versions	2020-10-19 06:12:40 +00:00
LinuxServer-CI	19e9414071	Bot Updating Templated Files	2020-10-07 03:57:33 +00:00
LinuxServer-CI	e1105c3c10	Bot Updating Templated Files	2020-10-07 03:56:14 +00:00
LinuxServer-CI	12eeada89e	Bot Updating Package Versions	2020-09-30 00:00:14 -04:00
LinuxServer-CI	a9570058b0	Bot Updating Package Versions	2020-09-23 04:59:52 +01:00
LinuxServer-CI	ea87627cc4	Bot Updating Package Versions	2020-09-16 04:59:42 +01:00
LinuxServer-CI	4b3791666e	Bot Updating Package Versions	2020-08-26 00:01:06 -04:00
LinuxServer-CI	7132836687	Bot Updating Templated Files	2020-08-26 03:56:30 +00:00
LinuxServer-CI	0ae62b1e31	Bot Updating Package Versions	2020-08-19 00:00:23 -04:00
LinuxServer-CI	c00ae15d02	Bot Updating Package Versions	2020-08-05 04:02:14 +00:00
LinuxServer-CI	b40aefd8c0	Bot Updating Templated Files	2020-08-05 03:57:06 +00:00
LinuxServer-CI	f3ddd66daf	Bot Updating Templated Files	2020-08-05 03:56:13 +00:00
LinuxServer-CI	771466e8d1	Bot Updating Package Versions	2020-07-29 04:00:32 +00:00
LinuxServer-CI	40386796be	Bot Updating Package Versions	2020-07-22 03:59:48 +00:00
LinuxServer-CI	b1712457b3	Bot Updating Package Versions	2020-07-15 00:00:24 -04:00
LinuxServer-CI	a149240962	Bot Updating Package Versions	2020-07-08 00:00:22 -04:00
LinuxServer-CI	203665be42	Bot Updating Package Versions	2020-07-01 04:06:11 +00:00
LinuxServer-CI	6c73fdbe28	Bot Updating Package Versions	2020-06-17 05:59:45 +02:00
LinuxServer-CI	0fd37c121c	Bot Updating Package Versions	2020-06-06 10:15:34 -04:00
LinuxServer-CI	d0e1c52430	Bot Updating Templated Files	2020-06-06 14:10:21 +00:00
driz	d905eb1a9c	Merge pull request #77 from ngosang/feature/python2 Drop Python 2 support, removed in qBittorrent v4.2.2	2020-06-06 10:09:02 -04:00
LinuxServer-CI	73f60599a0	Bot Updating Package Versions	2020-06-03 00:00:59 -04:00
LinuxServer-CI	46a9021a49	Bot Updating Templated Files	2020-06-03 03:55:53 +00:00
LinuxServer-CI	454d4a325a	Bot Updating Package Versions	2020-05-25 23:14:01 +00:00
Eric Nemchik	27c8324ebd	Merge pull request #76 from linuxserver/drizuid-patch-1 Update 30-config	2020-05-25 18:08:37 -05:00
ngosang	358eefe9c6	Drop Python 2 support, removed in qBittorrent v4.2.2 I'm qBittorrent developer. https://github.com/qbittorrent/search-plugins/issues/84#issuecomment-619539387 Resolves #67	2020-05-26 01:00:52 +02:00
driz	722bd16154	Update 30-config adjust comment wording to be more clear	2020-05-25 18:02:50 -04:00
LinuxServer-CI	72ca1908f8	Bot Updating Package Versions	2020-05-20 03:58:00 +00:00
LinuxServer-CI	fb1cae11aa	Bot Updating Templated Files	2020-04-29 03:55:51 +00:00
LinuxServer-CI	5cafd8e13c	Bot Updating Package Versions	2020-04-24 22:15:39 -04:00
LinuxServer-CI	61ca0015f3	Bot Updating Package Versions	2020-04-22 20:11:47 -04:00
LinuxServer-CI	ba58ecb683	Bot Updating Package Versions	2020-04-22 05:05:11 +01:00
LinuxServer-CI	58f4ae5129	Bot Updating Package Versions	2020-04-17 20:12:06 -04:00
LinuxServer-CI	16788fb0f2	Bot Updating Package Versions	2020-04-08 06:06:45 +02:00
LinuxServer-CI	24b3491eef	Bot Updating Templated Files	2020-04-08 03:55:54 +00:00
LinuxServer-CI	978d08a5fd	Bot Updating Package Versions	2020-04-05 17:56:33 -04:00
LinuxServer-CI	668e9858cc	Bot Updating Templated Files	2020-04-05 21:47:10 +00:00
Richard Chen Zheng	e38b7158db	Add python2	2020-04-05 14:44:49 -07:00
Richard Chen Zheng	b3c6a6e811	Fix issue #70 - update to python3	2020-04-05 14:44:49 -07:00
LinuxServer-CI	1b64db93e7	Bot Updating Package Versions	2020-04-03 00:10:11 +02:00
LinuxServer-CI	81242e2067	Bot Updating Package Versions	2020-04-02 15:22:44 +00:00
LinuxServer-CI	53200a7b1f	Bot Updating Package Versions	2020-04-01 00:02:50 -04:00
LinuxServer-CI	f66091b91f	Bot Updating Package Versions	2020-03-25 00:20:17 -04:00
LinuxServer-CI	4f6acb37d1	Bot Updating Package Versions	2020-03-19 12:16:34 +01:00
LinuxServer-CI	40a39fe84a	Bot Updating Templated Files	2020-03-19 12:07:03 +01:00
LinuxServer-CI	9cdd5ef3d3	Bot Updating Package Versions	2020-03-18 06:10:57 +01:00
LinuxServer-CI	c70fd537e9	Bot Updating Templated Files	2020-03-18 04:56:15 +00:00
LinuxServer-CI	dea7c84f45	Bot Updating Package Versions	2020-02-26 05:00:58 +00:00
LinuxServer-CI	8d1dac2300	Bot Updating Package Versions	2020-02-19 00:01:20 -05:00
LinuxServer-CI	25691a42ff	Bot Updating Package Versions	2020-02-12 05:04:37 +00:00
LinuxServer-CI	884270d998	Bot Updating Package Versions	2020-02-05 00:05:57 -05:00
LinuxServer-CI	8fcc3fb181	Bot Updating Package Versions	2020-01-29 05:03:36 +00:00
LinuxServer-CI	1e38561692	Bot Updating Package Versions	2020-01-22 06:04:06 +01:00
LinuxServer-CI	db829a8a40	Bot Updating Package Versions	2019-12-19 08:42:50 +00:00
LinuxServer-CI	5d2bcceef4	Bot Updating Package Versions	2019-12-05 11:11:51 -05:00
LinuxServer-CI	ddb0bea2aa	Bot Updating Package Versions	2019-12-04 17:10:35 +01:00
LinuxServer-CI	450d6b60ec	Bot Updating Package Versions	2019-12-04 00:02:37 -05:00
LinuxServer-CI	2421611e80	Bot Updating Templated Files	2019-12-03 23:55:53 -05:00
LinuxServer-CI	804a0a417c	Bot Updating Package Versions	2019-11-26 23:59:53 -05:00
LinuxServer-CI	12c6b8b45d	Bot Updating Package Versions	2019-11-19 11:11:34 +01:00
j0nnymoe	8f57215fc9	adding unstable branch to advertised tags (#58 ) adding unstable branch to advertised tags	2019-11-05 15:41:39 +00:00
thelamer	9f36ab0e69	adding unstable branch to advertised tags	2019-11-04 19:04:50 -08:00
LinuxServer-CI	3eb0345870	Bot Updating Package Versions	2019-11-02 08:16:00 +00:00
LinuxServer-CI	00249991fd	Bot Updating Package Versions	2019-11-01 01:12:40 +00:00
LinuxServer-CI	9989d4583d	Bot Updating Templated Files	2019-10-31 21:07:26 -04:00