Bot Updating Package Versions

Don't chown /downloads unless it's mounted (libtorrentv1)

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@
 * Read, and fill the Pull Request template
   * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
   * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
 
 ## Common files
 
@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/libtorrentv1/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-qbittorrent)
@@ -105,17 +105,17 @@ docker build \
   -t linuxserver/qbittorrent:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/libtorrentv1/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discord chat support
-    url: https://linuxserver.io/discord
+    url: https://discord.gg/YWrKVTn
     about: Realtime support / chat with the community and the team.
 
   - name: Discourse discussion forum

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/external_trigger.yml

@@ -4,40 +4,31 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-libtorrentv1:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/libtorrentv1'
         env:
           SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
           printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^qbittorrent_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
-          elif grep -q "^qbittorrent_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          if grep -q "^qbittorrent_libtorrentv1" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of master branch. To disable this trigger, add \`qbittorrent_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of libtorrentv1 branch. To disable this trigger, add \`qbittorrent_libtorrentv1\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-            && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
-          echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^qbittorrent_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)')
+          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"
+            FAILURE_REASON="Can't retrieve external version for qbittorrent branch libtorrentv1"
             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"}],
@@ -48,39 +39,20 @@ jobs:
           echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
           echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/qbittorrent"
-          tag="latest"
+          tag="libtorrentv1"
           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 "Accept: application/vnd.oci.image.index.v1+json" \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/manifests/${tag}")
-          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-            # If there's a layer element it's a single-arch manifest so just get that digest
-            digest=$(jq -r '.config.digest' <<< "${multidigest}")
-          else
-            # Otherwise it's multi-arch or has manifest annotations
-            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-              # Check for manifest annotations and delete if found
-              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
-            fi
-            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
-              # If there's still more than one digest, it's multi-arch
-              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
-            else
-              # Otherwise it's single arch
-              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
-            fi
-            if digest=$(curl -s \
+            multidigest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
-              digest=$(jq -r '.config.digest' <<< "${digest}");
-            fi
-          fi
+              "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}")
@@ -94,7 +66,7 @@ jobs:
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag libtorrentv1"
             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 }}
@@ -104,32 +76,25 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
-            echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all arch repos are updated yet. Will try again later."
-            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 }}
-            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/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" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             if [[ "${artifacts_found}" == "false" ]]; then
               echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
               echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag libtorrentv1 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
               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 }}
             else
               printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
               echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-              if [[ "${artifacts_found}" == "true" ]]; then
+              if "${artifacts_found}" == "true" ]]; then
                 echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
               fi
               response=$(curl -iX POST \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/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'})" >> $GITHUB_STEP_SUMMARY
               echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -144,7 +109,7 @@ jobs:
                 --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
                 --data-urlencode "Submit=Submit"
               echo "**** Notifying Discord ****"
-              TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              TRIGGER_REASON="A version change was detected for qbittorrent tag libtorrentv1. 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 }}

.github/workflows/greetings.yml

@@ -9,5 +9,5 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        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)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger_scheduler.yml

@@ -27,18 +27,9 @@ jobs:
             fi
             printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
             JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
-            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/Jenkinsfile >/dev/null 2>&1; then
-              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-              skipped_branches="${skipped_branches}${br} "
-            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
               echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/readme-vars.yml)
-              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
                 echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
                 echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
                 skipped_branches="${skipped_branches}${br} "
@@ -46,7 +37,7 @@ jobs:
                 echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
                 echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`qbittorrent_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
                 skipped_branches="${skipped_branches}${br} "
-              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then
                 echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
                 echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
                 skipped_branches="${skipped_branches}${br} "
@@ -58,11 +49,6 @@ jobs:
                 response=$(curl -iX POST \
                   https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
                   --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-                if [[ -z "${response}" ]]; then
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  echo "> Jenkins build could not be triggered. Skipping branch."
-                  continue
-                fi
                 echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
                 echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
                 sleep 10
@@ -70,14 +56,11 @@ jobs:
                 buildurl="${buildurl%$'\r'}"
                 echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
                 echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-                if ! curl -ifX POST \
+                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"; then
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  echo "> Unable to change the Jenkins job description."
-                fi
+                  --data-urlencode "Submit=Submit"
                 sleep 20
               fi
             else
@@ -87,14 +70,13 @@ jobs:
           if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
             if [[ -n "${triggered_branches}" ]]; then
               NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/ \n"
-              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
             fi
             if [[ -n "${skipped_branches}" ]]; then
               NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
             fi
+            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) for qbittorrent** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "description": "**Package Check Build(s) Triggered for qbittorrent** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
           fi

Dockerfile

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:edge
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -20,18 +20,20 @@ XDG_DATA_HOME="/config"
 # install runtime packages and qbitorrent-cli
 RUN \
   echo "**** install packages ****" && \
-  apk add --no-cache \
-    grep \
+  apk add -U --update --no-cache \
     icu-libs \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
+  echo "**** install qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
+    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
   fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
+  curl -o \
+    /app/qbittorrent-nox -L \
+    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/x86_64-qbittorrent-nox" && \
+  chmod +x /app/qbittorrent-nox && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
   if [ -z ${QBT_CLI_VERSION+x} ]; then \

Dockerfile.aarch64

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -20,18 +20,20 @@ XDG_DATA_HOME="/config"
 # install runtime packages and qbitorrent-cli
 RUN \
   echo "**** install packages ****" && \
-  apk add --no-cache \
-    grep \
+  apk add -U --update --no-cache \
     icu-libs \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
+  echo "**** install qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
+    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
   fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
+  curl -o \
+    /app/qbittorrent-nox -L \
+    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/aarch64-qbittorrent-nox" && \
+  chmod +x /app/qbittorrent-nox && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
   if [ -z ${QBT_CLI_VERSION+x} ]; then \

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
   }
   // Input to determine if this is a package check
   parameters {
-    string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
   }
   // Configuration for the variables used for this specific repo
   environment {
@@ -27,9 +27,6 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = 'edge'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-    DIST_REPO_PACKAGES = 'qbittorrent-nox'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
@@ -59,27 +56,15 @@ pipeline {
       steps{
         echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
-              echo "Pruning builder"
-              docker builder prune -f --builder container || :
-              containers=$(docker ps -q)
+              containers=$(docker ps -aq)
               if [[ -n "${containers}" ]]; then
-                BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
-                for container in ${containers}; do
-                  if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
-                    echo "skipping buildx container in docker stop"
-                  else
-                    echo "Stopping container ${container}"
-                    docker stop ${container}
-                  fi
-                done
+                docker stop ${containers}
               fi
-              docker system prune -f --volumes || :
-              docker image prune -af || :
-           '''
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:libtorrentv1 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' ''',
@@ -108,7 +93,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 libtorrentv1-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -141,15 +126,14 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is an alpine repo change for external version determine an md5 from the version string
-    stage("Set tag Alpine Repo"){
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: '''curl -sL "${DIST_REPO}x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-                       && awk '/^P:'"${DIST_REPO_PACKAGES}"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' ''',
+            script: ''' curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)' ''',
             returnStdout: true).trim()
-            env.RELEASE_LINK = 'alpine_repo'
+            env.RELEASE_LINK = 'custom_command'
         }
       }
     }
@@ -187,10 +171,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a libtorrentv1 build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -200,21 +184,20 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
-          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "libtorrentv1"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -224,15 +207,14 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
-          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
         }
       }
     }
@@ -248,16 +230,15 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'libtorrentv1-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/'
-          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
         }
       }
     }
@@ -292,7 +273,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -304,24 +285,24 @@ pipeline {
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
               # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
               # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
               # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
               # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch libtorrentv1 --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
               docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
               echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f libtorrentv1
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -340,13 +321,13 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f libtorrentv1
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -354,35 +335,6 @@ pipeline {
               else
                 echo "No templates to delete"
               fi
-              echo "Starting Stage 2.5 - Update init diagram"
-              if ! grep -q 'init_diagram:' readme-vars.yml; then
-                echo "Adding the key 'init_diagram' to readme-vars.yml"
-                sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
-                sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
-              fi
-              mkdir -p ${TEMPDIR}/d2
-              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
-              ls -al ${TEMPDIR}/d2
-              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
-              if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
-                echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
-                mkdir -p ${TEMPDIR}/repo
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
-                git add readme-vars.yml
-                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating templates and exiting build, new one will trigger based on commit"
-                rm -Rf ${TEMPDIR}
-                exit 0
-              else
-                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Init diagram is unchanged"
-              fi
               echo "Starting Stage 3 - Update templates"
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
@@ -391,7 +343,7 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f libtorrentv1
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -404,8 +356,8 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -506,7 +458,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -519,10 +471,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build check the S6 service file perms
+    // If this is a libtorrentv1 build check the S6 service file perms
     stage("Check S6 Service file Permissions"){
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -591,42 +543,8 @@ pipeline {
           --label \"org.opencontainers.image.title=Qbittorrent\" \
           --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=true --sbom=true --builder=container --load \
+          --provenance=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-        sh '''#! /bin/bash
-              set -e
-              IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-              for i in "${CACHE[@]}"; do
-                docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-              done
-           '''
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry_backoff(5,5) {
-              sh '''#! /bin/bash
-                    set -e
-                    echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                    echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                    echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                    echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                    if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                      for i in "${CACHE[@]}"; do
-                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                      done
-                      for p in $(jobs -p); do
-                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                      done
-                    fi
-                '''
-          }
-        }
       }
     }
     // Build MultiArch Docker containers for push to LS Repo
@@ -657,42 +575,8 @@ pipeline {
               --label \"org.opencontainers.image.title=Qbittorrent\" \
               --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=true --sbom=true --builder=container --load \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh '''#! /bin/bash
-                  set -e
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  done
-               '''
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: 'Quay.io-Robot',
-                usernameVariable: 'QUAYUSER',
-                passwordVariable: 'QUAYPASS'
-              ]
-            ]) {
-              retry_backoff(5,5) {
-                  sh '''#! /bin/bash
-                        set -e
-                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                          done
-                          for p in $(jobs -p); do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                          done
-                        fi
-                    '''
-              }
-            }
           }
         }
         stage('Build ARM64') {
@@ -701,6 +585,10 @@ pipeline {
           }
           steps {
             echo "Running on node: ${NODE_NAME}"
+            echo 'Logging into Github'
+            sh '''#! /bin/bash
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+               '''
             sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
             sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
@@ -716,50 +604,18 @@ pipeline {
               --label \"org.opencontainers.image.title=Qbittorrent\" \
               --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=true --sbom=true --builder=container --load \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh '''#! /bin/bash
-                  set -e
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  done
-               '''
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: 'Quay.io-Robot',
-                usernameVariable: 'QUAYUSER',
-                passwordVariable: 'QUAYPASS'
-              ]
-            ]) {
-              retry_backoff(5,5) {
-                  sh '''#! /bin/bash
-                        set -e
-                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
-                          done
-                          for p in $(jobs -p); do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                          done
-                        fi
-                    '''
-              }
+            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            retry_backoff(5,5) {
+              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
             sh '''#! /bin/bash
                   containers=$(docker ps -aq)
                   if [[ -n "${containers}" ]]; then
                     docker stop ${containers}
                   fi
-                  docker system prune -f --volumes || :
-                  docker image prune -af || :
-               '''
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -767,7 +623,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -790,14 +646,14 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f libtorrentv1
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -815,7 +671,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -829,7 +685,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -883,7 +739,7 @@ pipeline {
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
-                -e RELEASE_TAG=\"latest\" \
+                -e RELEASE_TAG=\"libtorrentv1\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -909,23 +765,37 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        retry_backoff(5,5) {
-          sh '''#! /bin/bash
-                set -e
-                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                          CACHEIMAGE=${i}
-                      fi
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry_backoff(5,5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:libtorrentv1
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
+                    docker push ${PUSHIMAGE}:libtorrentv1
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  fi
-                done
-              '''
+               '''
+          }
         }
       }
     }
@@ -936,41 +806,64 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        retry_backoff(5,5) {
-          sh '''#! /bin/bash
-                set -e
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                          CACHEIMAGE=${i}
-                      fi
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry_backoff(5,5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  if [ "${CI}" == "false" ]; then
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  fi
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-libtorrentv1
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-libtorrentv1
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  fi
-                done
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                  fi
-                done
-              '''
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:amd64-libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                  done
+               '''
+          }
         }
       }
     }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -982,17 +875,17 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${META_TAG}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to libtorrentv1",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
+              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "libtorrentv1",\
                      "name": "'${META_TAG}'",\
-                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
@@ -1000,14 +893,14 @@ pipeline {
     // Add protection to the release branch
     stage('Github-Release-Branch-Protection') {
       when {
-        branch "master"
+        branch "libtorrentv1"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Setting up protection for release branch master"
+        echo "Setting up protection for release branch libtorrentv1"
         sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/libtorrentv1/protection \
           -d $(jq -c .  << EOF
             {
               "required_status_checks": null,
@@ -1169,22 +1062,12 @@ EOF
     }
     cleanup {
       sh '''#! /bin/bash
-            echo "Pruning builder!!"
-            docker builder prune -f --builder container || :
-            containers=$(docker ps -q)
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
             if [[ -n "${containers}" ]]; then
-              BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
-              for container in ${containers}; do
-                if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
-                  echo "skipping buildx container in docker stop"
-                else
-                  echo "Stopping container ${container}"
-                  docker stop ${container}
-                fi
-              done
+              docker stop ${containers}
             fi
-            docker system prune -f --volumes || :
-            docker image prune -af || :
+            docker system prune -af --volumes || :
          '''
       cleanWs()
     }

README.md

@@ -1,9 +1,9 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
 [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
@@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 Find us at:
 
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
+* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -36,8 +36,8 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/qbittorrent)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
-[![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)
+[![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%2Flibtorrentv1%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/)
+[![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%2Flibtorrentv1%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/libtorrentv1/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.
 
@@ -47,7 +47,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/qbittorrent:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/qbittorrent:libtorrentv1` 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,7 +78,7 @@ If you are running a very old (3.x) kernel you may run into [this issue](https:/
 
 Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
 
-For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
+For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
 
 ### TORRENTING_PORT
 
@@ -90,24 +90,17 @@ Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:68
 
 This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
 
-## Non-Root Operation
-
-This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
-
 ## Usage
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
->[!NOTE]
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
-
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
 services:
   qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:latest
+    image: lscr.io/linuxserver/qbittorrent:libtorrentv1
     container_name: qbittorrent
     environment:
       - PUID=1000
@@ -141,7 +134,7 @@ docker run -d \
   -v /path/to/qbittorrent/appdata:/config \
   -v /path/to/downloads:/downloads `#optional` \
   --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent:latest
+  lscr.io/linuxserver/qbittorrent:libtorrentv1
 ```
 
 ## Parameters
@@ -150,9 +143,9 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8080:8080` | WebUI |
-| `-p 6881:6881` | tcp connection port |
-| `-p 6881:6881/udp` | udp connection port |
+| `-p 8080` | WebUI |
+| `-p 6881` | tcp connection port |
+| `-p 6881/udp` | udp connection port |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
@@ -161,7 +154,6 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
-| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -227,7 +219,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
 
     ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:libtorrentv1
     ```
 
 ## Updating Info
@@ -275,7 +267,7 @@ Below are the instructions for updating containers:
 * Update the image:
 
     ```bash
-    docker pull lscr.io/linuxserver/qbittorrent:latest
+    docker pull lscr.io/linuxserver/qbittorrent:libtorrentv1
     ```
 
 * Stop the running container:
@@ -312,13 +304,13 @@ cd docker-qbittorrent
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/qbittorrent:latest .
+  -t lscr.io/linuxserver/qbittorrent:libtorrentv1 .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
@@ -326,18 +318,19 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
 
 * **17.07.24:** - Restore qbittorrent-cli as it now supports openssl 3.
-* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
+* **25.05.24:** - Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
 * **14.02.24:** - Only set/override torrenting port if the optional env var is set.
 * **14.02.24:** - Add torrenting port support.
-* **31.01.24:** - Remove obsolete compat packages.
+* **31.01.24:** - Rebase to Alpine 3.19.
 * **25.12.23:** - Only pull stable releases of qbittorrent-cli.
 * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.
-* **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
+* **17.06.23:** - Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
 * **10.06.23:** - Bump unrar to 6.2.8.
-* **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
-* **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
-* **31.10.22:** - Add libtorrentv1 branch.
+* **25.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
+* **15.01.23:** - Rebase to Alpine 3.17, add openssl1.1-compat.
+* **29.11.22:** - Add icu-libs to support qbittorrent-cli.
+* **30.10.22:** - Add libtorrent v1 branch.
 * **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
 * **12.08.22:** - Bump unrar to 6.1.7.
 * **16.06.22:** - Rebase to Alpine 3.16 from edge.

docker-compose.yml

@@ -1,23 +0,0 @@
-services:
-  qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:latest
-    container_name: qbittorrent
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Kentucky/Louisville
-      - WEBUI_PORT=8080
-      - TORRENTING_PORT=50120
-    volumes:
-      - /opt/stacks/qbittorrent/qbittorrent/appdata:/config
-      - /mnt/8tbraid/qbit:/downloads #optional
-    ports:
-      - 8080:8080
-      - 50120:50120
-      - 50120:50120/udp
-    restart: unless-stopped
-    networks:
-      - Video
-networks:
-  Video:
-    external: true

jenkins-vars.yml

@@ -2,10 +2,11 @@
 
 # jenkins variables
 project_name: docker-qbittorrent
-external_type: alpine_repo
-release_type: stable
-release_tag: latest
-ls_branch: master
+external_type: na
+custom_version_command: "curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'"
+release_type: prerelease
+release_tag: libtorrentv1
+ls_branch: libtorrentv1
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -15,9 +16,6 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = 'edge'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-  - DIST_REPO_PACKAGES = 'qbittorrent-nox'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'

package_versions.txt

@@ -1,99 +1,259 @@
-NAME                                                      VERSION           TYPE     
-7zip                                                      24.09-r0          apk       
-Alba.CsConsoleFormat                                      1.0.0             dotnet    
-BencodeNET                                                2.3.0             dotnet    
-CsvHelper                                                 12.1.2            dotnet    
-IPNetwork2                                                2.5.235           dotnet    
-McMaster.Extensions.CommandLineUtils                      2.4.4             dotnet    
-Mono.Posix.NETStandard                                    1.0.0             dotnet    
-NJsonSchema                                               9.14.1            dotnet    
-Newtonsoft.Json                                           13.0.3            dotnet    
-Portable.BouncyCastle                                     1.8.8             dotnet    
-Portable.Xaml                                             0.18.0            dotnet    
-QBittorrent.Client                                        1.9.24285.1       dotnet    
-System.Security.Cryptography.ProtectedData                5.0.0             dotnet    
-acl-libs                                                  2.3.2-r1          apk       
-alpine-baselayout                                         3.7.0-r0          apk       
-alpine-baselayout-data                                    3.7.0-r0          apk       
-alpine-keys                                               2.5-r0            apk       
-apk-tools                                                 2.14.9-r1         apk       
-bash                                                      5.2.37-r0         apk       
-brotli-libs                                               1.1.0-r2          apk       
-busybox                                                   1.37.0-r17        apk       
-busybox-binsh                                             1.37.0-r17        apk       
-c-ares                                                    1.34.5-r0         apk       
-ca-certificates                                           20241121-r2       apk       
-ca-certificates-bundle                                    20241121-r2       apk       
-catatonit                                                 0.2.1-r0          apk       
-coreutils                                                 9.7-r1            apk       
-coreutils-env                                             9.7-r1            apk       
-coreutils-fmt                                             9.7-r1            apk       
-coreutils-sha512sum                                       9.7-r1            apk       
-curl                                                      8.13.0-r1         apk       
-dbus-libs                                                 1.16.2-r1         apk       
-double-conversion                                         3.3.1-r0          apk       
-duktape-libs                                              2.7.0-r2          apk       
-findutils                                                 4.10.0-r0         apk       
-gdbm                                                      1.24-r0           apk       
-glib                                                      2.84.1-r0         apk       
-grep                                                      3.12-r0           apk       
-icu-data-en                                               76.1-r0           apk       
-icu-libs                                                  76.1-r0           apk       
-jq                                                        1.7.1-r0          apk       
-libapk2                                                   2.14.9-r1         apk       
-libattr                                                   2.5.2-r2          apk       
-libb2                                                     0.98.1-r3         apk       
-libblkid                                                  2.41-r7           apk       
-libbsd                                                    0.12.2-r0         apk       
-libbz2                                                    1.0.8-r6          apk       
-libcrypto3                                                3.5.0-r0          apk       
-libcurl                                                   8.13.0-r1         apk       
-libeconf                                                  0.6.3-r0          apk       
-libexpat                                                  2.7.1-r0          apk       
-libffi                                                    3.4.8-r0          apk       
-libgcc                                                    14.2.0-r6         apk       
-libgomp                                                   14.2.0-r6         apk       
-libidn2                                                   2.3.7-r0          apk       
-libintl                                                   0.24.1-r0         apk       
-libmd                                                     1.1.0-r0          apk       
-libmount                                                  2.41-r7           apk       
-libncursesw                                               6.5_p20250503-r0  apk       
-libpanelw                                                 6.5_p20250503-r0  apk       
-libpcre2-16                                               10.43-r1          apk       
-libproc2                                                  4.0.4-r2          apk       
-libproxy                                                  0.5.9-r0          apk       
-libpsl                                                    0.21.5-r3         apk       
-libssl3                                                   3.5.0-r0          apk       
-libstdc++                                                 14.2.0-r6         apk       
-libtorrent-rasterbar                                      2.0.11-r0         apk       
-libunistring                                              1.3-r0            apk       
-linux-pam                                                 1.7.0-r3          apk       
-mpdecimal                                                 4.0.1-r0          apk       
-musl                                                      1.2.5-r10         apk       
-musl-utils                                                1.2.5-r10         apk       
-ncurses-terminfo-base                                     6.5_p20250503-r0  apk       
-netcat-openbsd                                            1.229.1-r0        apk       
-nghttp2-libs                                              1.65.0-r0         apk       
-oniguruma                                                 6.9.10-r0         apk       
-pcre2                                                     10.43-r1          apk       
-procps-ng                                                 4.0.4-r2          apk       
-pyc                                                       3.12.10-r0        apk       
-python3                                                   3.12.10-r0        apk       
-python3-pyc                                               3.12.10-r0        apk       
-python3-pycache-pyc0                                      3.12.10-r0        apk       
-qbittorrent-nox                                           5.1.0-r0          apk       
-qbt                                                       1.8.24285.1       dotnet    
-qt6-qtbase                                                6.8.2-r2          apk       
-qt6-qtbase-sqlite                                         6.8.2-r2          apk       
-readline                                                  8.2.13-r1         apk       
-runtimepack.Microsoft.NETCore.App.Runtime.linux-musl-x64  6.0.35            dotnet    
-scanelf                                                   1.3.8-r1          apk       
-shadow                                                    4.17.3-r0         apk       
-skalibs-libs                                              2.14.4.0-r0       apk       
-sqlite-libs                                               3.49.2-r0         apk       
-ssl_client                                                1.37.0-r17        apk       
-tzdata                                                    2025b-r0          apk       
-utmps-libs                                                0.1.3.0-r0        apk       
-xz-libs                                                   5.8.1-r0          apk       
-zlib                                                      1.3.1-r2          apk       
-zstd-libs                                                 1.5.7-r0          apk       
+NAME                                               VERSION                                                                                  TYPE     
+7zip                                               23.01-r0                                                                                 apk       
+Alba.CsConsoleFormat                               1.0.0.89                                                                                 dotnet    
+BencodeNET                                         2.3.0.0                                                                                  dotnet    
+Bouncy Castle for .NET (netstandard2.0)            1.8.8.2                                                                                  dotnet    
+CommandLineUtils                                   2.4.4+3c2a4909757a51602dcca9b961d577511b85fd31.3c2a4909757a51602dcca9b961d577511b85fd31  dotnet    
+CsvHelper                                          12.1.2                                                                                   dotnet    
+Json.NET                                           13.0.3.27908                                                                             dotnet    
+Microsoft.CSharp                                   6.0.3024.21525                                                                           dotnet    
+Microsoft.VisualBasic                              6.0.3024.21525                                                                           dotnet    
+Microsoft.VisualBasic.Core                         11.100.3024.21525                                                                        dotnet    
+Microsoft.Win32.Primitives                         6.0.3024.21525                                                                           dotnet    
+Microsoft.Win32.Registry                           6.0.3024.21525                                                                           dotnet    
+Mono.Posix.NETStandard                             1.0.0.0                                                                                  dotnet    
+NJsonSchema                                        9.14.1.0                                                                                 dotnet    
+Portable.Xaml.dll                                  0.18.0.0                                                                                 dotnet    
+QBittorrent.Client                                 1.9.23349.1                                                                              dotnet    
+System                                             6.0.3024.21525                                                                           dotnet    
+System.AppContext                                  6.0.3024.21525                                                                           dotnet    
+System.Buffers                                     6.0.3024.21525                                                                           dotnet    
+System.Collections                                 6.0.3024.21525                                                                           dotnet    
+System.Collections.Concurrent                      6.0.3024.21525                                                                           dotnet    
+System.Collections.Immutable                       6.0.3024.21525                                                                           dotnet    
+System.Collections.NonGeneric                      6.0.3024.21525                                                                           dotnet    
+System.Collections.Specialized                     6.0.3024.21525                                                                           dotnet    
+System.ComponentModel                              6.0.3024.21525                                                                           dotnet    
+System.ComponentModel.Annotations                  6.0.3024.21525                                                                           dotnet    
+System.ComponentModel.DataAnnotations              6.0.3024.21525                                                                           dotnet    
+System.ComponentModel.EventBasedAsync              6.0.3024.21525                                                                           dotnet    
+System.ComponentModel.Primitives                   6.0.3024.21525                                                                           dotnet    
+System.ComponentModel.TypeConverter                6.0.3024.21525                                                                           dotnet    
+System.Configuration                               6.0.3024.21525                                                                           dotnet    
+System.Console                                     6.0.3024.21525                                                                           dotnet    
+System.Core                                        6.0.3024.21525                                                                           dotnet    
+System.Data                                        6.0.3024.21525                                                                           dotnet    
+System.Data.Common                                 6.0.3024.21525                                                                           dotnet    
+System.Data.DataSetExtensions                      6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.Contracts                       6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.Debug                           6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.DiagnosticSource                6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.FileVersionInfo                 6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.Process                         6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.StackTrace                      6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.TextWriterTraceListener         6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.Tools                           6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.TraceSource                     6.0.3024.21525                                                                           dotnet    
+System.Diagnostics.Tracing                         6.0.3024.21525                                                                           dotnet    
+System.Drawing                                     6.0.3024.21525                                                                           dotnet    
+System.Drawing.Primitives                          6.0.3024.21525                                                                           dotnet    
+System.Dynamic.Runtime                             6.0.3024.21525                                                                           dotnet    
+System.Formats.Asn1                                6.0.3024.21525                                                                           dotnet    
+System.Globalization                               6.0.3024.21525                                                                           dotnet    
+System.Globalization.Calendars                     6.0.3024.21525                                                                           dotnet    
+System.Globalization.Extensions                    6.0.3024.21525                                                                           dotnet    
+System.IO                                          6.0.3024.21525                                                                           dotnet    
+System.IO.Compression                              6.0.3024.21525                                                                           dotnet    
+System.IO.Compression.Brotli                       6.0.3024.21525                                                                           dotnet    
+System.IO.Compression.FileSystem                   6.0.3024.21525                                                                           dotnet    
+System.IO.Compression.ZipFile                      6.0.3024.21525                                                                           dotnet    
+System.IO.FileSystem                               6.0.3024.21525                                                                           dotnet    
+System.IO.FileSystem.AccessControl                 6.0.3024.21525                                                                           dotnet    
+System.IO.FileSystem.DriveInfo                     6.0.3024.21525                                                                           dotnet    
+System.IO.FileSystem.Primitives                    6.0.3024.21525                                                                           dotnet    
+System.IO.FileSystem.Watcher                       6.0.3024.21525                                                                           dotnet    
+System.IO.IsolatedStorage                          6.0.3024.21525                                                                           dotnet    
+System.IO.MemoryMappedFiles                        6.0.3024.21525                                                                           dotnet    
+System.IO.Pipes                                    6.0.3024.21525                                                                           dotnet    
+System.IO.Pipes.AccessControl                      6.0.3024.21525                                                                           dotnet    
+System.IO.UnmanagedMemoryStream                    6.0.3024.21525                                                                           dotnet    
+System.Linq                                        6.0.3024.21525                                                                           dotnet    
+System.Linq.Expressions                            6.0.3024.21525                                                                           dotnet    
+System.Linq.Parallel                               6.0.3024.21525                                                                           dotnet    
+System.Linq.Queryable                              6.0.3024.21525                                                                           dotnet    
+System.Memory                                      6.0.3024.21525                                                                           dotnet    
+System.Net                                         6.0.3024.21525                                                                           dotnet    
+System.Net.Http                                    6.0.3024.21525                                                                           dotnet    
+System.Net.Http.Json                               6.0.3024.21525                                                                           dotnet    
+System.Net.HttpListener                            6.0.3024.21525                                                                           dotnet    
+System.Net.IPNetwork                               2.5.235                                                                                  dotnet    
+System.Net.Mail                                    6.0.3024.21525                                                                           dotnet    
+System.Net.NameResolution                          6.0.3024.21525                                                                           dotnet    
+System.Net.NetworkInformation                      6.0.3024.21525                                                                           dotnet    
+System.Net.Ping                                    6.0.3024.21525                                                                           dotnet    
+System.Net.Primitives                              6.0.3024.21525                                                                           dotnet    
+System.Net.Quic                                    6.0.3024.21525                                                                           dotnet    
+System.Net.Requests                                6.0.3024.21525                                                                           dotnet    
+System.Net.Security                                6.0.3024.21525                                                                           dotnet    
+System.Net.ServicePoint                            6.0.3024.21525                                                                           dotnet    
+System.Net.Sockets                                 6.0.3024.21525                                                                           dotnet    
+System.Net.WebClient                               6.0.3024.21525                                                                           dotnet    
+System.Net.WebHeaderCollection                     6.0.3024.21525                                                                           dotnet    
+System.Net.WebProxy                                6.0.3024.21525                                                                           dotnet    
+System.Net.WebSockets                              6.0.3024.21525                                                                           dotnet    
+System.Net.WebSockets.Client                       6.0.3024.21525                                                                           dotnet    
+System.Numerics                                    6.0.3024.21525                                                                           dotnet    
+System.Numerics.Vectors                            6.0.3024.21525                                                                           dotnet    
+System.ObjectModel                                 6.0.3024.21525                                                                           dotnet    
+System.Private.CoreLib                             6.0.3024.21525                                                                           dotnet    
+System.Private.DataContractSerialization           6.0.3024.21525                                                                           dotnet    
+System.Private.Uri                                 6.0.3024.21525                                                                           dotnet    
+System.Private.Xml                                 6.0.3024.21525                                                                           dotnet    
+System.Private.Xml.Linq                            6.0.3024.21525                                                                           dotnet    
+System.Reflection                                  6.0.3024.21525                                                                           dotnet    
+System.Reflection.DispatchProxy                    6.0.3024.21525                                                                           dotnet    
+System.Reflection.Emit                             6.0.3024.21525                                                                           dotnet    
+System.Reflection.Emit.ILGeneration                6.0.3024.21525                                                                           dotnet    
+System.Reflection.Emit.Lightweight                 6.0.3024.21525                                                                           dotnet    
+System.Reflection.Extensions                       6.0.3024.21525                                                                           dotnet    
+System.Reflection.Metadata                         6.0.3024.21525                                                                           dotnet    
+System.Reflection.Primitives                       6.0.3024.21525                                                                           dotnet    
+System.Reflection.TypeExtensions                   6.0.3024.21525                                                                           dotnet    
+System.Resources.Reader                            6.0.3024.21525                                                                           dotnet    
+System.Resources.ResourceManager                   6.0.3024.21525                                                                           dotnet    
+System.Resources.Writer                            6.0.3024.21525                                                                           dotnet    
+System.Runtime                                     6.0.3024.21525                                                                           dotnet    
+System.Runtime.CompilerServices.VisualC            6.0.3024.21525                                                                           dotnet    
+System.Runtime.Extensions                          6.0.3024.21525                                                                           dotnet    
+System.Runtime.Handles                             6.0.3024.21525                                                                           dotnet    
+System.Runtime.InteropServices                     6.0.3024.21525                                                                           dotnet    
+System.Runtime.InteropServices.RuntimeInformation  6.0.3024.21525                                                                           dotnet    
+System.Runtime.Intrinsics                          6.0.3024.21525                                                                           dotnet    
+System.Runtime.Loader                              6.0.3024.21525                                                                           dotnet    
+System.Runtime.Numerics                            6.0.3024.21525                                                                           dotnet    
+System.Runtime.Serialization                       6.0.3024.21525                                                                           dotnet    
+System.Runtime.Serialization.Formatters            6.0.3024.21525                                                                           dotnet    
+System.Runtime.Serialization.Json                  6.0.3024.21525                                                                           dotnet    
+System.Runtime.Serialization.Primitives            6.0.3024.21525                                                                           dotnet    
+System.Runtime.Serialization.Xml                   6.0.3024.21525                                                                           dotnet    
+System.Security                                    6.0.3024.21525                                                                           dotnet    
+System.Security.AccessControl                      6.0.3024.21525                                                                           dotnet    
+System.Security.Claims                             6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.Algorithms            6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.Cng                   6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.Csp                   6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.Encoding              6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.OpenSsl               6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.Primitives            6.0.3024.21525                                                                           dotnet    
+System.Security.Cryptography.ProtectedData         5.0.20.51904                                                                             dotnet    
+System.Security.Cryptography.X509Certificates      6.0.3024.21525                                                                           dotnet    
+System.Security.Principal                          6.0.3024.21525                                                                           dotnet    
+System.Security.Principal.Windows                  6.0.3024.21525                                                                           dotnet    
+System.Security.SecureString                       6.0.3024.21525                                                                           dotnet    
+System.ServiceModel.Web                            6.0.3024.21525                                                                           dotnet    
+System.ServiceProcess                              6.0.3024.21525                                                                           dotnet    
+System.Text.Encoding                               6.0.3024.21525                                                                           dotnet    
+System.Text.Encoding.CodePages                     6.0.3024.21525                                                                           dotnet    
+System.Text.Encoding.Extensions                    6.0.3024.21525                                                                           dotnet    
+System.Text.Encodings.Web                          6.0.3024.21525                                                                           dotnet    
+System.Text.Json                                   6.0.3024.21525                                                                           dotnet    
+System.Text.RegularExpressions                     6.0.3024.21525                                                                           dotnet    
+System.Threading                                   6.0.3024.21525                                                                           dotnet    
+System.Threading.Channels                          6.0.3024.21525                                                                           dotnet    
+System.Threading.Overlapped                        6.0.3024.21525                                                                           dotnet    
+System.Threading.Tasks                             6.0.3024.21525                                                                           dotnet    
+System.Threading.Tasks.Dataflow                    6.0.3024.21525                                                                           dotnet    
+System.Threading.Tasks.Extensions                  6.0.3024.21525                                                                           dotnet    
+System.Threading.Tasks.Parallel                    6.0.3024.21525                                                                           dotnet    
+System.Threading.Thread                            6.0.3024.21525                                                                           dotnet    
+System.Threading.ThreadPool                        6.0.3024.21525                                                                           dotnet    
+System.Threading.Timer                             6.0.3024.21525                                                                           dotnet    
+System.Transactions                                6.0.3024.21525                                                                           dotnet    
+System.Transactions.Local                          6.0.3024.21525                                                                           dotnet    
+System.ValueTuple                                  6.0.3024.21525                                                                           dotnet    
+System.Web                                         6.0.3024.21525                                                                           dotnet    
+System.Web.HttpUtility                             6.0.3024.21525                                                                           dotnet    
+System.Windows                                     6.0.3024.21525                                                                           dotnet    
+System.Xml                                         6.0.3024.21525                                                                           dotnet    
+System.Xml.Linq                                    6.0.3024.21525                                                                           dotnet    
+System.Xml.ReaderWriter                            6.0.3024.21525                                                                           dotnet    
+System.Xml.Serialization                           6.0.3024.21525                                                                           dotnet    
+System.Xml.XDocument                               6.0.3024.21525                                                                           dotnet    
+System.Xml.XPath                                   6.0.3024.21525                                                                           dotnet    
+System.Xml.XPath.XDocument                         6.0.3024.21525                                                                           dotnet    
+System.Xml.XmlDocument                             6.0.3024.21525                                                                           dotnet    
+System.Xml.XmlSerializer                           6.0.3024.21525                                                                           dotnet    
+WindowsBase                                        6.0.3024.21525                                                                           dotnet    
+alpine-baselayout                                  3.6.5-r0                                                                                 apk       
+alpine-baselayout-data                             3.6.5-r0                                                                                 apk       
+alpine-keys                                        2.4-r1                                                                                   apk       
+alpine-release                                     3.20.3-r0                                                                                apk       
+apk-tools                                          2.14.4-r0                                                                                apk       
+bash                                               5.2.26-r0                                                                                apk       
+brotli-libs                                        1.1.0-r2                                                                                 apk       
+busybox                                            1.36.1-r29                                                                               apk       
+busybox-binsh                                      1.36.1-r29                                                                               apk       
+c-ares                                             1.33.1-r0                                                                                apk       
+ca-certificates                                    20240705-r0                                                                              apk       
+ca-certificates-bundle                             20240705-r0                                                                              apk       
+catatonit                                          0.2.0-r0                                                                                 apk       
+coreutils                                          9.5-r1                                                                                   apk       
+coreutils-env                                      9.5-r1                                                                                   apk       
+coreutils-fmt                                      9.5-r1                                                                                   apk       
+coreutils-sha512sum                                9.5-r1                                                                                   apk       
+curl                                               8.9.1-r2                                                                                 apk       
+dbus-libs                                          1.14.10-r1                                                                               apk       
+double-conversion                                  3.3.0-r0                                                                                 apk       
+duktape                                            2.7.0-r1                                                                                 apk       
+findutils                                          4.9.0-r5                                                                                 apk       
+gdbm                                               1.23-r1                                                                                  apk       
+glib                                               2.80.5-r0                                                                                apk       
+icu-data-en                                        74.2-r0                                                                                  apk       
+icu-libs                                           74.2-r0                                                                                  apk       
+jq                                                 1.7.1-r0                                                                                 apk       
+libacl                                             2.3.2-r0                                                                                 apk       
+libattr                                            2.5.2-r0                                                                                 apk       
+libb2                                              0.98.1-r3                                                                                apk       
+libblkid                                           2.40.1-r1                                                                                apk       
+libbsd                                             0.12.2-r0                                                                                apk       
+libbz2                                             1.0.8-r6                                                                                 apk       
+libcrypto3                                         3.3.2-r0                                                                                 apk       
+libcurl                                            8.9.1-r2                                                                                 apk       
+libeconf                                           0.6.3-r0                                                                                 apk       
+libexpat                                           2.6.3-r0                                                                                 apk       
+libffi                                             3.4.6-r0                                                                                 apk       
+libgcc                                             13.2.1_git20240309-r0                                                                    apk       
+libgomp                                            13.2.1_git20240309-r0                                                                    apk       
+libidn2                                            2.3.7-r0                                                                                 apk       
+libintl                                            0.22.5-r0                                                                                apk       
+libmd                                              1.1.0-r0                                                                                 apk       
+libmount                                           2.40.1-r1                                                                                apk       
+libncursesw                                        6.4_p20240420-r1                                                                         apk       
+libpanelw                                          6.4_p20240420-r1                                                                         apk       
+libpcre2-16                                        10.43-r0                                                                                 apk       
+libproc2                                           4.0.4-r0                                                                                 apk       
+libproxy                                           0.5.6-r0                                                                                 apk       
+libpsl                                             0.21.5-r1                                                                                apk       
+libssl3                                            3.3.2-r0                                                                                 apk       
+libstdc++                                          13.2.1_git20240309-r0                                                                    apk       
+libunistring                                       1.2-r0                                                                                   apk       
+linux-pam                                          1.6.0-r0                                                                                 apk       
+mpdecimal                                          4.0.0-r0                                                                                 apk       
+mscorlib                                           6.0.3024.21525                                                                           dotnet    
+musl                                               1.2.5-r0                                                                                 apk       
+musl-utils                                         1.2.5-r0                                                                                 apk       
+ncurses-terminfo-base                              6.4_p20240420-r1                                                                         apk       
+netcat-openbsd                                     1.226-r0                                                                                 apk       
+netstandard                                        6.0.3024.21525                                                                           dotnet    
+nghttp2-libs                                       1.62.1-r0                                                                                apk       
+oniguruma                                          6.9.9-r0                                                                                 apk       
+pcre2                                              10.43-r0                                                                                 apk       
+procps-ng                                          4.0.4-r0                                                                                 apk       
+pyc                                                3.12.6-r0                                                                                apk       
+python3                                            3.12.6-r0                                                                                apk       
+python3-pyc                                        3.12.6-r0                                                                                apk       
+python3-pycache-pyc0                               3.12.6-r0                                                                                apk       
+qbt                                                1.8.24199.1+738bca0d7d7585cf40629f13a59b6198eaf6fe64                                     dotnet    
+qt6-qtbase                                         6.6.3-r1                                                                                 apk       
+qt6-qtbase-sqlite                                  6.6.3-r1                                                                                 apk       
+readline                                           8.2.10-r0                                                                                apk       
+scanelf                                            1.3.7-r2                                                                                 apk       
+shadow                                             4.15.1-r0                                                                                apk       
+skalibs                                            2.14.1.1-r0                                                                              apk       
+sqlite-libs                                        3.45.3-r1                                                                                apk       
+ssl_client                                         1.36.1-r29                                                                               apk       
+tzdata                                             2024b-r0                                                                                 apk       
+utmps-libs                                         0.1.2.2-r1                                                                               apk       
+xz-libs                                            5.6.2-r0                                                                                 apk       
+zlib                                               1.3.1-r1                                                                                 apk       
+zstd-libs                                          1.5.6-r0                                                                                 apk       

readme-vars.yml

@@ -6,36 +6,39 @@ project_url: "https://www.qbittorrent.org/"
 project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/qbittorrent-icon.png"
 project_blurb: "The [{{ project_name|capitalize }}]({{ project_url }}) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_categories: "Downloaders"
+
 # supported architectures
 available_architectures:
-  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+
 # development version
 development_versions: true
 development_versions_items:
-  - {tag: "latest", desc: "Stable qbittorrent releases"}
-  - {tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1"}
+  - { tag: "latest", desc: "Stable qbittorrent releases" }
+  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
+
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files."}
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files." }
 param_usage_include_ports: true
 param_ports:
-  - {external_port: "8080", internal_port: "8080", port_desc: "WebUI"}
-  - {external_port: "6881", internal_port: "6881", port_desc: "tcp connection port"}
-  - {external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port"}
+  - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
+  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
+  - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
 param_usage_include_env: true
 param_env_vars:
-  - {env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the web UI, see below for explanation"}
-  - {env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation"}
+  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the web UI, see below for explanation"}
+  - { env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation" }
 opt_param_usage_include_vols: true
 opt_param_volumes:
-  - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk."}
+  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
+
 readonly_supported: true
-nonroot_supported: true
+
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -49,96 +52,57 @@ app_setup_block: |
 
   Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
 
-  For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
+  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
 
   ### TORRENTING_PORT
 
   A bittorrent client can be an active or a passive node. Running your client as an active node has the advantage of being able to connect to both active and passive peers, and can potentially increase the number of incoming connections. This requires an open port on the host machine which might differ from container's internal one.
 
   Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:6887, -p 6887:6887/udp and -e TORRENTING_PORT=6887 arguments to Docker.
-# init diagram
-init_diagram: |
-  "qbittorrent:latest": {
-    docker-mods
-    base {
-      fix-attr +\nlegacy cont-init
-    }
-    docker-mods -> base
-    legacy-services
-    custom services
-    init-services -> legacy-services
-    init-services -> custom services
-    custom services -> legacy-services
-    legacy-services -> ci-service-check
-    init-migrations -> init-adduser
-    init-os-end -> init-config
-    init-config -> init-config-end
-    init-crontab-config -> init-config-end
-    init-qbittorrent-config -> init-config-end
-    init-config -> init-crontab-config
-    init-mods-end -> init-custom-files
-    init-adduser -> init-device-perms
-    base -> init-envfile
-    base -> init-migrations
-    init-config-end -> init-mods
-    init-mods-package-install -> init-mods-end
-    init-mods -> init-mods-package-install
-    init-adduser -> init-os-end
-    init-device-perms -> init-os-end
-    init-envfile -> init-os-end
-    init-config -> init-qbittorrent-config
-    init-custom-files -> init-services
-    init-services -> svc-cron
-    svc-cron -> legacy-services
-    init-services -> svc-qbittorrent
-    svc-qbittorrent -> legacy-services
-  }
-  Base Images: {
-    "baseimage-alpine:edge"
-  }
-  "qbittorrent:latest" <- Base Images
+
 # changelog
 changelogs:
-  - {date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3."}
-  - {date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
-  - {date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set."}
-  - {date: "14.02.24:", desc: "Add torrenting port support."}
-  - {date: "31.01.24:", desc: "Remove obsolete compat packages."}
-  - {date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
-  - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
-  - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
-  - {date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)."}
-  - {date: "10.06.23:", desc: "Bump unrar to 6.2.8."}
-  - {date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
-  - {date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli."}
-  - {date: "31.10.22:", desc: "Add libtorrentv1 branch."}
-  - {date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases."}
-  - {date: "12.08.22:", desc: "Bump unrar to 6.1.7."}
-  - {date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge."}
-  - {date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo."}
-  - {date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli."}
-  - {date: "01.03.22:", desc: "Add python for search plugin support."}
-  - {date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos."}
-  - {date: "19.02.22:", desc: "Add jq to build-stage"}
-  - {date: "07.01.22:", desc: "Rebase to Alpine, build from source."}
-  - {date: "06.01.22:", desc: "Deprecate unstable branch."}
-  - {date: "10.02.21:", desc: "Rebase to focal."}
-  - {date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."}
-  - {date: "12.11.20:", desc: "Stop creating /config/data directory on startup"}
-  - {date: "03.04.20:", desc: "Fix adding search engine plugin"}
-  - {date: "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."}
-  - {date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3."}
-  - {date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2."}
-  - {date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1."}
-  - {date: "26.04.18:", desc: "Bump libtorrent to 1.1.7."}
-  - {date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6."}
-  - {date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling."}
-  - {date: "19.12.17:", desc: "Update to v4.0.3."}
-  - {date: "09.02.17:", desc: "Rebase to alpine 3.7"}
-  - {date: "01.12.17:", desc: "Update to v4.0.2."}
-  - {date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds."}
-  - {date: "16.09.17:", desc: "Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui."}
-  - {date: "01.08.17:", desc: "Initial Release."}
-  - {date: "12.02.18:", desc: "Initial Release."}
+  - { date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3." }
+  - { date: "25.05.24:", desc: "Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL." }
+  - { date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
+  - { date: "14.02.24:", desc: "Add torrenting port support." }
+  - { date: "31.01.24:", desc: "Rebase to Alpine 3.19."}
+  - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
+  - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "17.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
+  - { date: "10.06.23:", desc: "Bump unrar to 6.2.8." }
+  - { date: "25.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - { date: "15.01.23:", desc: "Rebase to Alpine 3.17, add openssl1.1-compat." }
+  - { date: "29.11.22:", desc: "Add icu-libs to support qbittorrent-cli." }
+  - { date: "30.10.22:", desc: "Add libtorrent v1 branch." }
+  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
+  - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
+  - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
+  - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
+  - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
+  - { date: "01.03.22:", desc: "Add python for search plugin support." }
+  - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
+  - { date: "19.02.22:", desc: "Add jq to build-stage" }
+  - { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
+  - { date: "06.01.22:", desc: "Deprecate unstable branch." }
+  - { date: "10.02.21:", desc: "Rebase to focal." }
+  - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
+  - { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
+  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
+  - { date: "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." }
+  - { date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3." }
+  - { date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2." }
+  - { date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1." }
+  - { date: "26.04.18:", desc: "Bump libtorrent to 1.1.7." }
+  - { date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6." }
+  - { date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
+  - { date: "19.12.17:", desc: "Update to v4.0.3." }
+  - { date: "09.02.17:", desc: "Rebase to alpine 3.7" }
+  - { date: "01.12.17:", desc: "Update to v4.0.2." }
+  - { date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds." }
+  - { date: "16.09.17:", desc: "Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui." }
+  - { date: "01.08.17:", desc: "Initial Release." }
+  - { date: "12.02.18:", desc: "Initial Release." }

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

@@ -9,13 +9,11 @@ if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
     cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
 fi
 
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    # chown download directory if currently not set to abc
-    if grep -qe ' /downloads ' /proc/mounts; then
-        lsiown abc:abc /downloads
-    fi
-
-    # permissions
-    lsiown -R abc:abc \
-        /config
+# chown download directory if currently not set to abc
+if grep -qe ' /downloads ' /proc/mounts; then
+    lsiown abc:abc /downloads
 fi
+
+# permissions
+lsiown -R abc:abc \
+    /config

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

@@ -6,16 +6,6 @@ if [[ -n "${TORRENTING_PORT}" ]]; then
     TORRENTING_PORT_ARG="--torrenting-port=${TORRENTING_PORT}"
 fi
 
-WEBUI_ADDRESS=$(grep -Po "^WebUI\\\Address=\K(.*)" /config/qBittorrent/qBittorrent.conf)
-if [[ -z ${WEBUI_ADDRESS} ]] || [[ ${WEBUI_ADDRESS} == "*" ]]; then
-    WEBUI_ADDRESS="localhost"
-fi
-
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
-        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
-else
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
-        /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
-fi
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
+        s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}