Bot Updating Package Versions

2020-10-23 08:13:03 -04:00 · 2020-10-22 08:10:41 -04:00 · 2020-10-19 06:12:40 +00:00 · 2020-10-07 03:57:33 +00:00 · 2020-10-07 03:56:14 +00:00 · 2020-09-30 00:00:14 -04:00
19 changed files with 381 additions and 724 deletions
--- a/.github/ISSUE_TEMPLATE/issue.bug.md
+++ b/.github/ISSUE_TEMPLATE/issue.bug.md
@@ -1,14 +1,12 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 ---
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 <!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-<!--- Provide a general summary of the bug in the Title above -->
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
 <!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!--- Provide a general summary of the issue in the Title above -->
 ------------------------------
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,13 +0,0 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discord chat support
    url: https://discord.gg/YWrKVTn
    about: Realtime support / chat with the community and the team.
  - name: Discourse discussion forum
    url: https://discourse.linuxserver.io
    about: Post on our community forum.
  - name: Documentation
    url: https://docs.linuxserver.io/images/docker-qbittorrent
    about: Documentation - information about all of our containers.
--- a/.github/ISSUE_TEMPLATE/issue.feature.md
+++ b/.github/ISSUE_TEMPLATE/issue.feature.md
@@ -1,25 +0,0 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
 ---
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 <!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
 <!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
 <!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!--- Provide a general summary of the request in the Title above -->
 ------------------------------
 ## Desired Behavior
 <!--- Tell us what should happen -->
 ## Current Behavior
 <!--- Tell us what happens instead of the expected behavior -->
 ## Alternatives Considered
 <!--- Tell us what other options you have tried or considered -->
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -1,105 +0,0 @@
 name: External Trigger Main
 on:
  workflow_dispatch:
 jobs:
  external-trigger-unstable:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
      - name: External Trigger
        if: github.ref == 'refs/heads/unstable'
        run: |
          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
            exit 0
          fi
          echo "**** External trigger running off of unstable branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
          echo "**** Retrieving external version ****"
          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
            FAILURE_REASON="Can't retrieve external version for qbittorrent branch unstable"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-qbittorrent/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
          EXT_RELEASE_CLEAN=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
          echo "**** External version: ${EXT_RELEASE} ****"
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/qbittorrent"
          tag="unstable"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
            | jq -r '.token')
            multidigest=$(curl -s \
              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
              --header "Authorization: Bearer ${token}" \
              "https://ghcr.io/v2/${image}/manifests/${tag}" \
              | jq -r 'first(.manifests[].digest)')
            digest=$(curl -s \
              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
              --header "Authorization: Bearer ${token}" \
              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
              | jq -r '.config.digest')
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
            "https://ghcr.io/v2/${image}/blobs/${digest}" \
            | jq -r '.container_config')
          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
            echo "**** Can't retrieve last pushed version, exiting ****"
            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag unstable"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
          if [ "${EXT_RELEASE_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
            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_CLEAN} found; old version was ${IMAGE_VERSION}. Checking artifacts. . . ****"
            EXT_RELEASE_STRIPPED=$(echo ${EXT_RELEASE} | sed 's|^1:||')
            URL_AMD64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_amd64.deb"
            URL_ARMHF="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_armhf.deb"
            URL_ARM64="https://launchpad.net/~qbittorrent-team/+archive/ubuntu/qbittorrent-unstable/+files/qbittorrent-nox_${EXT_RELEASE_STRIPPED}_arm64.deb"
            if curl -fL "${URL_AMD64}" >/dev/null && curl -fL "${URL_ARMHF}" >/dev/null && curl -fL "${URL_ARM64}" >/dev/null; then
              echo "**** All artifacts seem to be published, triggering build ****"
              response=$(curl -iX POST \
                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=false \
                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
              echo "**** Jenkins job queue url: ${response%$'\r'} ****"
              echo "**** Sleeping 10 seconds until job starts ****"
              sleep 10
              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
              buildurl="${buildurl%$'\r'}"
              echo "**** Jenkins job build url: ${buildurl} ****"
              echo "**** Attempting to change the Jenkins job description ****"
              curl -iX POST \
                "${buildurl}submitDescription" \
                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
                --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 unstable. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            else
              echo "**** Not all artifacts are published yet, skipping trigger ****"
              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag unstable is detected, however not all artifacts are uploaded to launchpad yet. Will try again in 1 hr."
              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            fi
          fi
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -1,43 +0,0 @@
 name: External Trigger Scheduler
 on:
  schedule:
    - cron:  '41 * * * *'
  workflow_dispatch:
 jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
        with:
          fetch-depth: '0'
      - name: External Trigger Scheduler
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
          echo "**** Pulling the yq docker image ****"
          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml \
              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
            if [ "$br" == "$ls_branch" ]; then
              echo "**** Branch ${br} appears to be live; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
                  -d "{\"ref\":\"refs/heads/${br}\"}" \
                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/external_trigger.yml/dispatches
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
              fi
            else
              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
            fi
          done
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -8,6 +8,6 @@ jobs:
    steps:
    - uses: actions/first-interaction@v1
      with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE.md)!'
        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -1,38 +0,0 @@
 name: Package Trigger Main
 on:
  workflow_dispatch:
 jobs:
  package-trigger-unstable:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
      - name: Package Trigger
        if: github.ref == 'refs/heads/unstable'
        run: |
          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
            exit 0
          fi
          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
            exit 0
          fi
          echo "**** Package trigger running off of unstable branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
          response=$(curl -iX POST \
            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=true \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
          echo "**** Sleeping 10 seconds until job starts ****"
          sleep 10
          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
          buildurl="${buildurl%$'\r'}"
          echo "**** Jenkins job build url: ${buildurl} ****"
          echo "**** Attempting to change the Jenkins job description ****"
          curl -iX POST \
            "${buildurl}submitDescription" \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -1,50 +0,0 @@
 name: Package Trigger Scheduler
 on:
  schedule:
    - cron:  '43 3 * * 1'
  workflow_dispatch:
 jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3
        with:
          fetch-depth: '0'
      - name: Package Trigger Scheduler
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
          echo "**** Pulling the yq docker image ****"
          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml \
              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
            if [ "${br}" == "${ls_branch}" ]; then
              echo "**** Branch ${br} appears to be live; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
                triggered_branches="${triggered_branches}${br} "
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
                  -d "{\"ref\":\"refs/heads/${br}\"}" \
                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
                sleep 30
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
              fi
            else
              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
            fi
          done
          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
          echo "**** Notifying Discord ****"
          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
            "description": "**Package Check Build(s) Triggered for qbittorrent** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,3 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
 .jenkins-external
--- a/12
+++ b/12
@@ -1,11 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+FROM lsiobase/ubuntu:bionic
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="sparklyballs, thelamer"
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -22,12 +22,12 @@ RUN \
 	python3 && \
 curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian 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 "**** install packages ****" && \
 if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
 	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
 fi && \
 apt-get update && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,11 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+FROM lsiobase/ubuntu:arm64v8-bionic
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="sparklyballs, thelamer"
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -22,12 +22,12 @@ RUN \
 	python3 && \
 curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian 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 "**** install packages ****" && \
 if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
 	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
 fi && \
 apt-get update && \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,11 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+FROM lsiobase/ubuntu:arm32v7-bionic
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="sparklyballs, thelamer"
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -22,12 +22,12 @@ RUN \
 	python3 && \
 curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian 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 "**** install packages ****" && \
 if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
 	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
 fi && \
 apt-get update && \
--- a/340
+++ b/340
@@ -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 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_scheduler.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.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/focal/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/bionic/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,47 +119,45 @@ 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 {
        script{
          env.IMAGE = env.DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + 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 = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = 'unstable-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "unstable"}
+        not {branch "master"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
        script{
          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/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 = 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -172,16 +170,15 @@ pipeline {
      steps {
        script{
          env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/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 = 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.EXT_RELEASE_TAG = 'unstable-version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@@ -194,24 +191,24 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
        ]) {
          script{
-            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
          }
          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
                set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
+                docker pull lsiodev/spaces-file-upload:latest
                docker run --rm \
                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
                -e FILE_NAME="shellcheck-result.xml" \
                -e MIMETYPE="text/xml" \
                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                -t lsiodev/spaces-file-upload:latest \
                python /upload.py'''
        }
      }
@@ -219,7 +216,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
@@ -229,68 +226,20 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              docker pull 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 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
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating Jenkinsfile"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "Jenkinsfile is up to date."
              fi
              # Stage 2 - Delete old templates
              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
                fi
              done
              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
                git checkout -f unstable
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Deleting old templates"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "No templates to delete"
              fi
              # Stage 3 - Update templates
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; 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
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
                cd ${TEMPDIR}/repo/${LS_REPO}/
                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                  echo ".jenkins-external" >> .gitignore
                  git add .gitignore
                fi
                git add ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
@@ -300,30 +249,13 @@ pipeline {
              fi
              mkdir -p ${TEMPDIR}/gitbook
              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                cd ${TEMPDIR}/gitbook/docker-documentation/
                git add images/docker-${CONTAINER_NAME}.md
                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 
              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
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
              if [[ ("${BRANCH_NAME}" == "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
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                  echo "Image is on the ignore list, skipping Unraid template upload"
                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
              fi
              rm -Rf ${TEMPDIR}'''
        script{
          env.FILES_UPDATED = sh(
@@ -335,7 +267,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 {
@@ -378,9 +310,8 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
        echo "Running on node: ${NODE_NAME}"
        sh "docker build --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-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
@@ -392,9 +323,8 @@ pipeline {
      parallel {
        stage('Build X86') {
          steps {
            echo "Running on node: ${NODE_NAME}"
            sh "docker build --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} ."
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
        stage('Build ARMHF') {
@@ -402,20 +332,28 @@ pipeline {
            label 'ARMHF'
          }
          steps {
-            echo "Running on node: ${NODE_NAME}"
+            withCredentials([
-            echo 'Logging into Github'
+              [
                $class: 'UsernamePasswordMultiBinding',
                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
                usernameVariable: 'DOCKERUSER',
                passwordVariable: 'DOCKERPASS'
              ]
            ]) {
              echo 'Logging into DockerHub'
              sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                 '''
              sh "docker build --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} ."
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
              retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
              }
              sh '''docker rmi \
                    ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
            }
          }
        }
        stage('Build ARM64') {
@@ -423,20 +361,28 @@ pipeline {
            label 'ARM64'
          }
          steps {
-            echo "Running on node: ${NODE_NAME}"
+            withCredentials([
-            echo 'Logging into Github'
+              [
                $class: 'UsernamePasswordMultiBinding',
                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
                usernameVariable: 'DOCKERUSER',
                passwordVariable: 'DOCKERPASS'
              ]
            ]) {
              echo 'Logging into DockerHub'
              sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                 '''
              sh "docker build --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} ."
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
              retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
              }
              sh '''docker rmi \
                    ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
            }
          }
        }
      }
@@ -444,7 +390,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 +418,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,19 +442,12 @@ 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: ''
      }
      steps {
        sh '''#! /bin/bash
              echo "Packages were updated. Cleaning up the image and exiting."
              if [ "${MULTIARCH}" == "true" ]; then
                docker rmi ${IMAGE}:amd64-${META_TAG}
              else
                docker rmi ${IMAGE}:${META_TAG}
              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -517,7 +456,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: ''
@@ -526,13 +465,6 @@ pipeline {
        }
      }
      steps {
        sh '''#! /bin/bash
              echo "There are no package updates. Cleaning up the image and exiting."
              if [ "${MULTIARCH}" == "true" ]; then
                docker rmi ${IMAGE}:amd64-${META_TAG}
              else
                docker rmi ${IMAGE}:${META_TAG}
              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -549,20 +481,20 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key	', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
        ]) {
          script{
-            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
          }
          sh '''#! /bin/bash
                set -e
-                docker pull ghcr.io/linuxserver/ci:latest
+                docker pull lsiodev/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
                --shm-size=1gb \
@@ -574,15 +506,15 @@ pipeline {
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
                -e DO_REGION="ams3" \
                -e DO_BUCKET="lsio-ci" \
-                -t ghcr.io/linuxserver/ci:latest \
+                -t lsiodev/ci:latest \
                python /ci/ci.py'''
        }
      }
@@ -609,24 +541,24 @@ pipeline {
            sh '''#! /bin/bash
                  set -e
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
                  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
               '''
          }
          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:unstable || :
+                  ${DELETEIMAGE}:latest || :
                done
             '''
        }
@@ -651,67 +583,85 @@ pipeline {
            sh '''#! /bin/bash
                  set -e
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
                    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
                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}: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
                  docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
                  docker push ${GITHUBIMAGE}:latest
                  docker push ${GITHUBIMAGE}:${META_TAG}
                  docker push ${GITHUBIMAGE}:arm32v7-latest
                  docker push ${GITHUBIMAGE}:arm64v8-latest
                  docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
                  docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
                  docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                  docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
               '''
          }
          sh '''#! /bin/bash
                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 \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
             '''
        }
      }
@@ -719,7 +669,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
        }
@@ -727,21 +677,21 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Pushing New tag for current commit ${META_TAG}"
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${META_TAG}'",\
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
             "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}'",\
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "unstable",\
+                     "target_commitish": "master",\
-                     "name": "'${META_TAG}'",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\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'''
      }
@@ -764,9 +714,9 @@ pipeline {
          sh '''#! /bin/bash
                set -e
                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                docker pull 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 linuxserver/jenkins-builder:latest 
-                docker pull ghcr.io/linuxserver/readme-sync
+                docker pull lsiodev/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
@@ -774,7 +724,7 @@ pipeline {
                  -e DOCKER_REPOSITORY=${IMAGE} \
                  -e GIT_BRANCH=master \
                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+                  lsiodev/readme-sync bash -c 'node sync' 
                rm -Rf ${TEMPDIR} '''
        }
      }
--- a/README.md
+++ b/README.md
@@ -31,12 +31,12 @@ Find us at:
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
-[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-qbittorrent/container_registry)
 [![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)
+[![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%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fqbittorrent%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/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.
@@ -46,7 +46,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
-Simply pulling `ghcr.io/linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 The architectures supported by this image are:
@@ -78,12 +78,13 @@ Compatible with docker-compose v2 schemas.
 version: "2.1"
 services:
  qbittorrent:
-    image: ghcr.io/linuxserver/qbittorrent
+    image: linuxserver/qbittorrent
    container_name: qbittorrent
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Europe/London
      - UMASK_SET=022
      - WEBUI_PORT=8080
    volumes:
      - </path/to/appdata/config>:/config
@@ -103,6 +104,7 @@ docker run -d \
  -e PUID=1000 \
  -e PGID=1000 \
  -e TZ=Europe/London \
  -e UMASK_SET=022 \
  -e WEBUI_PORT=8080 \
  -p 6881:6881 \
  -p 6881:6881/udp \
@@ -110,7 +112,7 @@ docker run -d \
  -v </path/to/appdata/config>:/config \
  -v </path/to/downloads>:/downloads \
  --restart unless-stopped \
-  ghcr.io/linuxserver/qbittorrent
+  linuxserver/qbittorrent
 ```
@@ -126,6 +128,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-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 UMASK_SET=022` | for umask setting of qbittorrent, optional , default if left unset is 022 |
 | `-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. |
@@ -201,7 +204,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/qbittorrent`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/qbittorrent`
 ## Updating Info
@@ -217,7 +220,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`
+* Update the image: `docker pull linuxserver/qbittorrent`
 * Stop the running container: `docker stop qbittorrent`
 * Delete the container: `docker rm qbittorrent`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -247,7 +250,7 @@ cd docker-qbittorrent
 docker build \
  --no-cache \
  --pull \
-  -t ghcr.io/linuxserver/qbittorrent:latest .
+  -t linuxserver/qbittorrent:latest .
 ```
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -259,10 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
-* **24.03.21:** - Rebase to focal.
+* **03.04.20:** - Fix adding search engine plugin
 * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **05.07.20:** - Shift to Python3
 * **31.10.19:** - Adding unstable tag.
 * **02.08.19:** - Add qbitorrent-cli for processing scripts.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,11 +3,10 @@
 # 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/focal/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/bionic/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,191 +1,180 @@
-adduser3.118ubuntu2
+adduser3.116ubuntu1
-apt2.0.4
+apt1.6.12ubuntu0.1
-apt-utils2.0.4
+apt-utils1.6.12ubuntu0.1
-base-files11ubuntu5.3
+base-files10.1ubuntu2.10
-base-passwd3.5.47
+base-passwd3.5.44
-bash5.0-6ubuntu1.1
+bash4.4.18-2ubuntu1.2
-bsdutils1:2.34-0.1ubuntu9.1
+bsdutils1:2.31.1-0.4ubuntu3.7
-bzip21.0.8-2
+bzip21.0.6-8.1ubuntu0.2
-ca-certificates20210119~20.04.1
+ca-certificates20190110~18.04.1
-coreutils8.30-3ubuntu2
+coreutils8.28-1ubuntu1
-curl7.68.0-1ubuntu2.4
+curl7.58.0-2ubuntu3.10
-dash0.5.10.2-6
+dash0.5.8-2.10
-dbus1.12.16-2ubuntu2.1
+dbus1.12.2-1ubuntu1.2
-debconf1.5.73
+debconf1.5.66ubuntu1
-debianutils4.9.1
+debianutils4.8.4
-diffutils1:3.7-3
+diffutils1:3.6-1
-dirmngr2.2.19-3ubuntu2.1
+dirmngr2.2.4-1ubuntu1.3
-dpkg1.19.7ubuntu3
+dpkg1.19.0.5ubuntu2.3
-e2fsprogs1.45.5-2ubuntu1
+e2fsprogs1.44.1-1ubuntu1.3
-fdisk2.34-0.1ubuntu9.1
+fdisk2.31.1-0.4ubuntu3.7
-file1:5.38-4
+file1:5.32-2ubuntu0.4
-findutils4.7.0-1ubuntu1
+findutils4.6.0+git+20170828-2
-gcc-10-base10.2.0-5ubuntu1~20.04
+gcc-8-base8.4.0-1ubuntu1~18.04
-geoip-bin1.6.12-6build1
+geoip-bin1.6.12-1
-geoip-database20191224-2
+geoip-database20180315-1
-gnupg2.2.19-3ubuntu2.1
+gnupg2.2.4-1ubuntu1.3
-gnupg-l10n2.2.19-3ubuntu2.1
+gnupg-l10n2.2.4-1ubuntu1.3
-gnupg-utils2.2.19-3ubuntu2.1
+gnupg-utils2.2.4-1ubuntu1.3
-gpg2.2.19-3ubuntu2.1
+gpg2.2.4-1ubuntu1.3
-gpg-agent2.2.19-3ubuntu2.1
+gpg-agent2.2.4-1ubuntu1.3
-gpgconf2.2.19-3ubuntu2.1
+gpgconf2.2.4-1ubuntu1.3
-gpgsm2.2.19-3ubuntu2.1
+gpgsm2.2.4-1ubuntu1.3
-gpgv2.2.19-3ubuntu2.1
+gpgv2.2.4-1ubuntu1.3
-gpg-wks-client2.2.19-3ubuntu2.1
+gpg-wks-client2.2.4-1ubuntu1.3
-gpg-wks-server2.2.19-3ubuntu2.1
+gpg-wks-server2.2.4-1ubuntu1.3
-grep3.4-1
+grep3.1-2build1
-gzip1.10-0ubuntu4
+gzip1.6-5ubuntu1
-hostname3.23
+hostname3.20
-init-system-helpers1.57
+init-system-helpers1.51
-krb5-locales1.17-6ubuntu4.1
+krb5-locales1.16-2ubuntu0.1
-libacl12.2.53-6
+libacl12.2.52-3build1
-libapparmor12.13.3-7ubuntu5.1
+libapparmor12.12-4ubuntu5.1
-libapt-pkg6.02.0.4
+libapt-inst2.01.6.12ubuntu0.1
-libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
+libapt-pkg5.01.6.12ubuntu0.1
-libassuan02.5.3-7ubuntu2
+libasn1-8-heimdal7.5.0+dfsg-1
-libattr11:2.4.48-5
+libassuan02.5.1-2
-libaudit11:2.8.5-2ubuntu6
+libattr11:2.4.47-2build1
-libaudit-common1:2.8.5-2ubuntu6
+libaudit11:2.8.2-1ubuntu1
-libblkid12.34-0.1ubuntu9.1
+libaudit-common1:2.8.2-1ubuntu1
-libbrotli11.0.7-6ubuntu0.1
+libblkid12.31.1-0.4ubuntu3.7
-libbz2-1.01.0.8-2
+libboost-system1.65.11.65.1+dfsg-0ubuntu5
-libc62.31-0ubuntu9.2
+libbz2-1.01.0.6-8.1ubuntu0.2
-libcap-ng00.7.9-2.1build1
+libc62.27-3ubuntu1.2
-libc-bin2.31-0ubuntu9.2
+libcap-ng00.7.7-3.1
-libcom-err21.45.5-2ubuntu1
+libc-bin2.27-3ubuntu1.2
-libcrypt11:4.4.10-10ubuntu4
+libcom-err21.44.1-1ubuntu1.3
-libcurl47.68.0-1ubuntu2.4
+libcurl47.58.0-2ubuntu3.10
-libdb5.35.3.28+dfsg1-0.6ubuntu2
+libdb5.35.3.28-13.1ubuntu1.1
-libdbus-1-31.12.16-2ubuntu2.1
+libdbus-1-31.12.2-1ubuntu1.2
-libdebconfclient00.251ubuntu1
+libdebconfclient00.213ubuntu1
-libdouble-conversion33.1.5-4ubuntu1
+libdouble-conversion12.0.1-4ubuntu1
-libexpat12.2.9-1build1
+libexpat12.2.5-3ubuntu0.2
-libext2fs21.45.5-2ubuntu1
+libext2fs21.44.1-1ubuntu1.3
-libfdisk12.34-0.1ubuntu9.1
+libfdisk12.31.1-0.4ubuntu3.7
-libffi73.3-4
+libffi63.2.1-8
-libgcc-s110.2.0-5ubuntu1~20.04
+libgcc11:8.4.0-1ubuntu1~18.04
-libgcrypt201.8.5-5ubuntu1
+libgcrypt201.8.1-4ubuntu1.2
-libgdbm61.18.1-5
+libgeoip11.6.12-1
-libgdbm-compat41.18.1-5
+libglib2.0-02.56.4-0ubuntu0.18.04.6
-libgeoip11.6.12-6build1
+libglib2.0-data2.56.4-0ubuntu0.18.04.6
-libglib2.0-02.64.6-1~ubuntu20.04.3
+libgmp102:6.1.2+dfsg-2
-libglib2.0-data2.64.6-1~ubuntu20.04.3
+libgnutls303.5.18-1ubuntu1.4
-libgmp102:6.2.0+dfsg-4
+libgpg-error01.27-6
-libgnutls303.6.13-2ubuntu1.3
+libgssapi3-heimdal7.5.0+dfsg-1
-libgpg-error01.37-1
+libgssapi-krb5-21.16-2ubuntu0.1
-libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
+libhcrypto4-heimdal7.5.0+dfsg-1
-libgssapi-krb5-21.17-6ubuntu4.1
+libheimbase1-heimdal7.5.0+dfsg-1
-libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
+libheimntlm0-heimdal7.5.0+dfsg-1
-libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
+libhogweed43.4-1
-libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
+libhx509-5-heimdal7.5.0+dfsg-1
-libhogweed53.5.1+really3.5.1-2
+libicu6060.2-3ubuntu3.1
-libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
+libidn2-02.0.4-1.1ubuntu0.2
-libicu6666.1-2ubuntu2
+libk5crypto31.16-2ubuntu0.1
-libidn2-02.2.0-2
+libkeyutils11.5.9-9.2ubuntu2
-libk5crypto31.17-6ubuntu4.1
+libkrb5-26-heimdal7.5.0+dfsg-1
-libkeyutils11.6-6ubuntu1
+libkrb5-31.16-2ubuntu0.1
-libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
+libkrb5support01.16-2ubuntu0.1
 libkrb5-31.17-6ubuntu4.1
 libkrb5support01.17-6ubuntu4.1
 libksba81.3.5-2
-libldap-2.4-22.4.49+dfsg-2ubuntu1.7
+libldap-2.4-22.4.45+dfsg-1ubuntu1.6
-libldap-common2.4.49+dfsg-2ubuntu1.7
+libldap-common2.4.45+dfsg-1ubuntu1.6
-liblz4-11.9.2-2
+liblz4-10.0~r131-2ubuntu3
-liblzma55.2.4-1ubuntu1
+liblzma55.2.2-1.3
-libmagic11:5.38-4
+libmagic11:5.32-2ubuntu0.4
-libmagic-mgc1:5.38-4
+libmagic-mgc1:5.32-2ubuntu0.4
-libmount12.34-0.1ubuntu9.1
+libmount12.31.1-0.4ubuntu3.7
-libmpdec22.4.2-3
+libmpdec22.4.2-1ubuntu1
-libncurses66.2-0ubuntu2
+libncurses56.1-1ubuntu1.18.04
-libncursesw66.2-0ubuntu2
+libncursesw56.1-1ubuntu1.18.04
-libnetaddr-ip-perl4.079+dfsg-1build4
+libnettle63.4-1
-libnettle73.5.1+really3.5.1-2
+libnghttp2-141.30.0-1ubuntu1
-libnghttp2-141.40.0-1build1
+libnpth01.5-3
-libnpth01.6-1
+libp11-kit00.23.9-2
-libp11-kit00.23.20-1ubuntu0.1
+libpam0g1.1.8-3.6ubuntu2.18.04.2
-libpam0g1.3.1-5ubuntu4.1
+libpam-modules1.1.8-3.6ubuntu2.18.04.2
-libpam-modules1.3.1-5ubuntu4.1
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
-libpam-modules-bin1.3.1-5ubuntu4.1
+libpam-runtime1.1.8-3.6ubuntu2.18.04.2
-libpam-runtime1.3.1-5ubuntu4.1
+libpcre32:8.39-9
-libpcre2-16-010.34-7
+libprocps62:3.3.12-3ubuntu1.2
-libpcre2-8-010.34-7
+libpsl50.19.1-5build1
-libpcre32:8.39-12build1
+libpython3.6-minimal3.6.9-1~18.04ubuntu1.3
-libperl5.305.30.0-9ubuntu0.2
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1.3
-libprocps82:3.3.16-1ubuntu2
+libpython3-stdlib3.6.7-1~18.04
-libpsl50.21.0-1ubuntu1
+libqt5core5a5.9.5+dfsg-0ubuntu2.5
-libpython3.8-minimal3.8.5-1~20.04.2
+libqt5dbus55.9.5+dfsg-0ubuntu2.5
-libpython3.8-stdlib3.8.5-1~20.04.2
+libqt5network55.9.5+dfsg-0ubuntu2.5
-libpython3-stdlib3.8.2-0ubuntu2
+libqt5xml55.9.5+dfsg-0ubuntu2.5
-libqt5core5a5.12.8+dfsg-0ubuntu1
+libreadline77.0-3
-libqt5dbus55.12.8+dfsg-0ubuntu1
+libroken18-heimdal7.5.0+dfsg-1
-libqt5network55.12.8+dfsg-0ubuntu1
+librtmp12.4+20151223.gitfa8646d.1-1
-libqt5xml55.12.8+dfsg-0ubuntu1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
-libreadline88.0-4
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
-libroken18-heimdal7.7.0+dfsg-1ubuntu1
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
-librtmp12.4+20151223.gitfa8646d.1-2build1
+libseccomp22.4.3-1ubuntu3.18.04.3
-libsasl2-22.1.27+dfsg-2
+libselinux12.7-2build2
-libsasl2-modules2.1.27+dfsg-2
+libsemanage12.7-2build2
-libsasl2-modules-db2.1.27+dfsg-2
+libsemanage-common2.7-2build2
-libseccomp22.4.3-1ubuntu3.20.04.3
+libsepol12.7-1
-libselinux13.0-1build2
+libsmartcols12.31.1-0.4ubuntu3.7
-libsemanage13.0-1build2
+libsqlite3-03.22.0-1ubuntu0.4
-libsemanage-common3.0-1build2
+libss21.44.1-1ubuntu1.3
-libsepol13.0-1
+libssl1.0.01.0.2n-1ubuntu5.4
-libsmartcols12.34-0.1ubuntu9.1
+libssl1.11.1.1-1ubuntu2.1~18.04.6
-libsocket6-perl0.29-1build1
+libstdc++68.4.0-1ubuntu1~18.04
-libsqlite3-03.31.1-4ubuntu0.2
+libsystemd0237-3ubuntu10.42
-libss21.45.5-2ubuntu1
+libtasn1-64.13-2
-libssh-40.9.3-2ubuntu2.1
+libtinfo56.1-1ubuntu1.18.04
-libssl1.11.1.1f-1ubuntu2.2
+libtorrent-rasterbar101.2.10+git20201018.3d48e7d056-1ppa1~18.04
-libstdc++610.2.0-5ubuntu1~20.04
+libudev1237-3ubuntu10.42
-libsystemd0245.4-4ubuntu3.4
+libunistring20.9.9-0ubuntu2
-libtasn1-64.16.0-2
+libuuid12.31.1-0.4ubuntu3.7
-libtinfo66.2-0ubuntu2
+libwind0-heimdal7.5.0+dfsg-1
-libtorrent-rasterbar101.2.13+git20210323.34a979720b-1ppa1~20.04
+libxml22.9.4+dfsg1-6.1ubuntu1.3
-libudev1245.4-4ubuntu3.4
+libzstd11.3.3+dfsg-2ubuntu1.1
-libunistring20.9.10-2
+locales2.27-3ubuntu1.2
-libuuid12.34-0.1ubuntu9.1
+login1:4.5-1ubuntu2
-libwind0-heimdal7.7.0+dfsg-1ubuntu1
+lsb-base9.20170808ubuntu1
-libxml22.9.10+dfsg-5
+mawk1.3.3-17ubuntu3
-libzstd11.4.4+dfsg-3ubuntu0.1
+mime-support3.60ubuntu1
-locales2.31-0ubuntu9.2
+mount2.31.1-0.4ubuntu3.7
-login1:4.8.1-1ubuntu5.20.04
+ncurses-base6.1-1ubuntu1.18.04
-logsave1.45.5-2ubuntu1
+ncurses-bin6.1-1ubuntu1.18.04
-lsb-base11.1.0ubuntu2
+openssl1.1.1-1ubuntu2.1~18.04.6
-mawk1.3.4.20200120-2
+p7zip16.02+dfsg-6
-mime-support3.64ubuntu1
+p7zip-full16.02+dfsg-6
-mount2.34-0.1ubuntu9.1
+passwd1:4.5-1ubuntu2
-ncurses-base6.2-0ubuntu2
+perl-base5.26.1-6ubuntu0.3
-ncurses-bin6.2-0ubuntu2
+pinentry-curses1.1.0-1
-netbase6.1
+procps2:3.3.12-3ubuntu1.2
-openssl1.1.1f-1ubuntu2.2
+publicsuffix20180223.1310-1
-p7zip16.02+dfsg-7build1
+python33.6.7-1~18.04
-p7zip-full16.02+dfsg-7build1
+python3.63.6.9-1~18.04ubuntu1.3
-passwd1:4.8.1-1ubuntu5.20.04
+python3.6-minimal3.6.9-1~18.04ubuntu1.3
-perl5.30.0-9ubuntu0.2
+python3-minimal3.6.7-1~18.04
-perl-base5.30.0-9ubuntu0.2
+qbittorrent-cli1.5.19350-1
-perl-modules-5.305.30.0-9ubuntu0.2
+qbittorrent-nox1:4.3.0.99~202010231047-7094-260e48b70~ubuntu18.04.1
-pinentry-curses1.1.0-3build1
+qttranslations5-l10n5.9.5-0ubuntu1
-procps2:3.3.16-1ubuntu2
+readline-common7.0-3
-publicsuffix20200303.0012-1
+sed4.4-2
-python33.8.2-0ubuntu2
+sensible-utils0.0.12
-python3.83.8.5-1~20.04.2
+shared-mime-info1.9-2
-python3.8-minimal3.8.5-1~20.04.2
+sysvinit-utils2.88dsf-59.10ubuntu1
-python3-minimal3.8.2-0ubuntu2
+tar1.29b-2ubuntu0.1
-qbittorrent-cli1.6.20334-1
+tzdata2020a-0ubuntu0.18.04
-qbittorrent-nox4.4.0~202103241608-7246-9f386afe9~ubuntu20.04.1
+ubuntu-keyring2018.09.18.1~18.04.0
-qttranslations5-l10n5.12.8-0ubuntu1
+unrar1:5.5.8-1
-readline-common8.0-4
+unzip6.0-21ubuntu1
-sed4.7-1
+util-linux2.31.1-0.4ubuntu3.7
-sensible-utils0.0.12+nmu1
+xdg-user-dirs0.17-1ubuntu1
-shared-mime-info1.15-1
+xz-utils5.2.2-1.3
-sysvinit-utils2.96-2.1ubuntu1
+zlib1g1:1.2.11.dfsg-0ubuntu2
 tar1.30+dfsg-7ubuntu0.20.04.1
 tzdata2021a-0ubuntu0.20.04
 ubuntu-keyring2020.02.11.2
 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
@@ -34,6 +34,7 @@ param_ports:
 param_usage_include_env: true
 param_env_vars:
  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
  - { env_var: "UMASK_SET", env_value: "022", desc: "for umask setting of qbittorrent, optional , default if left unset is 022"}
  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}
 # optional parameters
@@ -68,10 +69,7 @@ app_setup_block: |
 # changelog
 changelogs:
-  - { date: "24.03.21:", desc: "Rebase to focal." }
+  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
  - { 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: "31.10.19:", desc: "Adding unstable tag." }
  - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -9,7 +9,7 @@ mkdir -p \
 [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
 	cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-# chown download directory if currently set to root
+# chown download directory if currently not set to abc
 if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
 	chown -R abc:abc /downloads
 fi
--- a/root/etc/services.d/qbittorrent/run
+++ b/root/etc/services.d/qbittorrent/run
@@ -1,11 +1,9 @@
 #!/usr/bin/with-contenv bash
 UMASK_SET=${UMASK_SET:-022}
 WEBUI_PORT=${WEBUI_PORT:-8080}
-if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
+umask "$UMASK_SET"
  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
  umask ${UMASK_SET}
 fi
 exec \
 	s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
Author	SHA1	Message	Date
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