Bot Updating Package Versions

Fix port in readme (master)

.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://discord.gg/YWrKVTn)
+* 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)
 
 ## Common files
 
@@ -105,10 +105,10 @@ docker build \
   -t linuxserver/qbittorrent:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs qbittorrent"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs qbittorrent`
       render: bash
     validations:
       required: true

.github/workflows/external_trigger.yml

@@ -7,23 +7,36 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
+          printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
+          if grep -q "^qbittorrent_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            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
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\`" >> $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 "**** Retrieving external version ****"
+          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
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
+            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"
             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,
@@ -32,9 +45,8 @@ jobs:
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
           image="linuxserver/qbittorrent"
           tag="latest"
           token=$(curl -sX GET \
@@ -42,14 +54,33 @@ jobs:
             | 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}" \
+            "https://ghcr.io/v2/${image}/manifests/${tag}")
-              | jq -r 'first(.manifests[].digest)')
+          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-            digest=$(curl -s \
+            # 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 \
               --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}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
-              | jq -r '.config.digest')
+              digest=$(jq -r '.config.digest' <<< "${digest}");
+            fi
+          fi
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -61,45 +92,52 @@ jobs:
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
-            echo "**** Can't retrieve last pushed version, exiting ****"
+            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"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
-            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 ****"
+            echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
-            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
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            if [[ "${artifacts_found}" == "false" ]]; then
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              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."
+              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
+                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 \
                 --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-            echo "**** Sleeping 10 seconds until job starts ****"
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
               sleep 10
               buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
               buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
               curl -iX POST \
                 "${buildurl}submitDescription" \
                 --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
@@ -111,3 +149,4 @@ jobs:
                 "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             fi
+          fi

.github/workflows/external_trigger_scheduler.yml

@@ -9,37 +9,37 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 
       - name: External Trigger Scheduler
         run: |
-          echo "**** Branches found: ****"
+          printf "# External trigger scheduler for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
             ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
             ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
             ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
             if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
                   -d "{\"ref\":\"refs/heads/${br}\"}" \
                   https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/external_trigger.yml/dispatches
               else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
-                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/package_trigger.yml

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

.github/workflows/package_trigger_scheduler.yml

@@ -9,42 +9,92 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          echo "**** Branches found: ****"
+          printf "# Package trigger scheduler for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+              continue
-            if [ "${br}" == "${ls_branch}" ]; then
+            fi
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/Jenkinsfile >/dev/null 2>&1; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
+              skipped_branches="${skipped_branches}${br} "
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                  -H "Accept: application/vnd.github.v3+json" \
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/readme-vars.yml)
-                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                sleep 30
+                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
+                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} "
+              elif grep -q "^qbittorrent_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                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
+                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} "
               else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                printf "> To disable, add \`qbittorrent_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
+                triggered_branches="${triggered_branches}${br} "
+                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
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                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 \
+                  "${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
+                sleep 20
               fi
             else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
               echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done
+          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 "**** Notifying Discord ****"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for qbittorrent** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
+              "description": "**Package Check Build(s) for qbittorrent** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi

.github/workflows/permissions.yml

@@ -5,6 +5,8 @@ on:
       - '**/run'
       - '**/finish'
       - '**/check'
+      - 'root/migrations/*'
+
 jobs:
   permission_check:
     uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:latest as unrar
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
 FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
@@ -19,15 +19,10 @@ XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache \
+    grep \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
@@ -45,13 +40,12 @@ RUN \
   fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-${QBT_CLI_VERSION#v}.tar.gz" && \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
@@ -19,15 +19,10 @@ XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache \
+    grep \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
@@ -45,13 +40,12 @@ RUN \
   fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-${QBT_CLI_VERSION#v}.tar.gz" && \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Jenkinsfile

@@ -17,6 +17,8 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
+    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
+    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     CONTAINER_NAME = 'qbittorrent'
     BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
     LS_USER = 'linuxserver'
@@ -33,21 +35,47 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8080'
     CI_SSL='false'
-    CI_DELAY='120'
+    CI_DELAY='60'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
-    CI_AUTH='user:password'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
+    stage("Set git config"){
+      steps{
+        sh '''#!/bin/bash
+              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
+              chmod 600 /config/.ssh/id_sign
+              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
+              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
+              git config --global gpg.format ssh
+              git config --global user.signingkey /config/.ssh/id_sign
+              git config --global commit.gpgsign true
+        '''
+      }
+    }
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
+        echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
-              containers=$(docker ps -aq)
+              echo "Pruning builder"
+              docker builder prune -f --builder container || :
+              containers=$(docker ps -q)
               if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
+                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
-              docker system prune -af --volumes || : '''
+                done
+              fi
+              docker system prune -f --volumes || :
+              docker image prune -af || :
+           '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
@@ -68,7 +96,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
         }
         sh '''#! /bin/bash
               echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -179,6 +207,7 @@ pipeline {
           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'
         }
       }
     }
@@ -203,6 +232,7 @@ pipeline {
           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.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'
         }
       }
     }
@@ -227,6 +257,7 @@ pipeline {
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+          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'
         }
       }
     }
@@ -249,9 +280,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -266,20 +299,19 @@ pipeline {
         }
       }
       steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Cloned repo paths for templating:
-                # Stage 1 - Jenkinsfile update
+              # ${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}/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}
+              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}
@@ -291,14 +323,14 @@ pipeline {
                 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 Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "Jenkinsfile is up to date."
               fi
-                # Stage 2 - Delete old templates
+              echo "Starting Stage 2 - Delete old templates"
-                OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -316,13 +348,42 @@ pipeline {
                 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 "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "No templates to delete"
               fi
-                # Stage 3 - Update templates
+              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}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -346,32 +407,47 @@ pipeline {
                 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 "No templates to update"
               fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
               mkdir -p ${TEMPDIR}/docs
-                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
               if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                 cd ${TEMPDIR}/docs/docker-documentation
                 GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                 git commit -m 'Bot Updating Documentation'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
               fi
               mkdir -p ${TEMPDIR}/unraid
-                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
               if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
               if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                  if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -382,19 +458,34 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
               fi
-                # Stage 4 - Sync Readme to Docker Hub
               if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
-                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
                   echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
                   DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
                 else
                   echo "Syncing readme to Docker Hub"
                   DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                 fi
-                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
                 curl -s \
                   -H "Authorization: JWT ${DH_TOKEN}" \
                   -H "Content-Type: application/json" \
@@ -412,7 +503,6 @@ pipeline {
         }
       }
     }
-    }
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
@@ -450,10 +540,10 @@ pipeline {
       }
     }
     /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
        ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
-    stage("GitLab Mirror"){
+    stage("GitLab Mirror and Quay.io Visibility"){
       when {
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -467,6 +557,10 @@ pipeline {
             "merge_requests_access_level":"disabled",\
             "repository_access_level":"enabled",\
             "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
+        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
+          -d '{"visibility":"public"}' ||: '''
       } 
     }
     /* ###############
@@ -497,7 +591,42 @@ 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 \
           --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
@@ -528,7 +657,42 @@ 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 \
               --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') {
@@ -537,10 +701,6 @@ 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}\" \
@@ -556,17 +716,50 @@ 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 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            sh '''#! /bin/bash
-            retry(5) {
+                  set -e
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                  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 '''#! /bin/bash
                   containers=$(docker ps -aq)
                   if [[ -n "${containers}" ]]; then
                     docker stop ${containers}
                   fi
-                  docker system prune -af --volumes || : '''
+                  docker system prune -f --volumes || :
+                  docker image prune -af || :
+               '''
           }
         }
       }
@@ -582,7 +775,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -670,18 +863,27 @@ pipeline {
           }
           sh '''#! /bin/bash
                 set -e
+                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
+                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
+                  if [ -n "${CI_DOCKERENV}" ]; then
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
+                  else
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
+                  fi
+                fi
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  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
                 docker run --rm \
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
+                -e RELEASE_TAG=\"latest\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -691,6 +893,7 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -706,46 +909,26 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        retry_backoff(5,5) {
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
           sh '''#! /bin/bash
                 set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  for i in "${CACHE[@]}"; do
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                          CACHEIMAGE=${i}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
                       fi
-                    docker push ${PUSHIMAGE}:latest
+                  done
-                    docker push ${PUSHIMAGE}:${META_TAG}
+                  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}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                   if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
                   fi
                 done
               '''
         }
       }
     }
-    }
     // If this is a multi arch release push all images and define the manifest
     stage('Docker-Push-Multi') {
       when {
@@ -753,88 +936,37 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        retry_backoff(5,5) {
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
           sh '''#! /bin/bash
                 set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $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}
-                    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}
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                          CACHEIMAGE=${i}
-                    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}
+                  done
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                  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 push ${MANIFESTIMAGE}:amd64-latest
+                  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}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                   if [ -n "${SEMVER}" ]; then
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                   fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                done
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                   if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
                   fi
                 done
               '''
         }
       }
     }
-    }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
@@ -852,14 +984,14 @@ pipeline {
              "object": "'${COMMIT_SHA}'",\
              "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
              "type": "commit",\
-             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "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 '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "master",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
+                     "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
               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'''
@@ -984,32 +1116,94 @@ EOF
      ###################### */
   post {
     always {
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
       script{
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
         if (env.EXIT_STATUS == "ABORTED"){
           sh 'echo "build aborted"'
+        }else{
+          if (currentBuild.currentResult == "SUCCESS"){
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
             }
-        else if (currentBuild.currentResult == "SUCCESS"){
+          }else{
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
+            if (env.GITHUBIMAGE =~ /lspipepr/){
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+              env.JOB_WEBHOOK_STATUS='Failure'
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=16711680
+              env.JOB_WEBHOOK_FOOTER='Live Build'
             }
-        else {
+          }
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
+                 "timestamp": "'${JOB_DATE}'",\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
     cleanup {
       sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
+            echo "Pruning builder!!"
-            containers=$(docker ps -aq)
+            docker builder prune -f --builder container || :
+            containers=$(docker ps -q)
             if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
+              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
-            docker system prune -af --volumes || :
+              done
+            fi
+            docker system prune -f --volumes || :
+            docker image prune -af || :
          '''
       cleanWs()
     }
   }
 }
+
+def retry_backoff(int max_attempts, int power_base, Closure c) {
+  int n = 0
+  while (n < max_attempts) {
+    try {
+      c()
+      return
+    } catch (err) {
+      if ((n + 1) >= max_attempts) {
+        throw err
+      }
+      sleep(power_base ** n)
+      n++
+    }
+  }
+  return
+}

README.md

@@ -3,7 +3,7 @@
 [![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://discord.gg/YWrKVTn "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://linuxserver.io/discord "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://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [Discord](https://linuxserver.io/discord) - 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.
@@ -28,7 +28,7 @@ Find us at:
 
 # [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fqbittorrent)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
@@ -78,12 +78,29 @@ 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 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
+For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
+
+### 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.
+
+## Read-Only Operation
+
+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
@@ -97,9 +114,10 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
       - WEBUI_PORT=8080
+      - TORRENTING_PORT=6881
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/qbittorrent/appdata:/config
-      - /path/to/downloads:/downloads
+      - /path/to/downloads:/downloads #optional
     ports:
       - 8080:8080
       - 6881:6881
@@ -116,11 +134,12 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
   -e WEBUI_PORT=8080 \
+  -e TORRENTING_PORT=6881 \
   -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/qbittorrent/appdata:/config \
-  -v /path/to/downloads:/downloads \
+  -v /path/to/downloads:/downloads `#optional` \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent:latest
 ```
@@ -131,15 +150,18 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8080` | WebUI |
+| `-p 8080:8080` | WebUI |
-| `-p 6881` | tcp connection port |
+| `-p 6881:6881` | tcp connection port |
-| `-p 6881/udp` | udp connection port |
+| `-p 6881: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). |
 | `-e WEBUI_PORT=8080` | for changing the port of the web UI, see below for explanation |
+| `-e TORRENTING_PORT=6881` | for changing the port of tcp/udp connection, see below for explanation |
 | `-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)
 
@@ -277,7 +299,8 @@ Below are the instructions for updating containers:
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+>[!TIP]
+>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -292,16 +315,21 @@ docker build \
   -t lscr.io/linuxserver/qbittorrent:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 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.
+* **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.
 * **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.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: alpine_repo
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -24,7 +23,7 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='8080'
   - CI_SSL='false'
-  - CI_DELAY='120'
+  - CI_DELAY='60'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV=''
-  - CI_AUTH='user:password'
+  - CI_AUTH=''
   - CI_WEBPATH=''

package_versions.txt

@@ -1,262 +1,262 @@
 NAME                                               VERSION                                                                                  TYPE     
-7zip                                               23.01-r0                                                                                 apk     
+7zip                                               24.09-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.0.0.0                                                                                 dotnet  
+CsvHelper                                          12.1.2                                                                                   dotnet    
 Json.NET                                           13.0.3.27908                                                                             dotnet    
-Microsoft.CSharp                                   4.700.22.56512                                                                           dotnet  
+Microsoft.CSharp                                   6.0.3524.45918                                                                           dotnet    
-Microsoft.VisualBasic                              4.700.22.56512                                                                           dotnet  
+Microsoft.VisualBasic                              6.0.3524.45918                                                                           dotnet    
-Microsoft.VisualBasic.Core                         4.700.22.56512                                                                           dotnet  
+Microsoft.VisualBasic.Core                         11.100.3524.45918                                                                        dotnet    
-Microsoft.Win32.Primitives                         4.700.22.56512                                                                           dotnet  
+Microsoft.Win32.Primitives                         6.0.3524.45918                                                                           dotnet    
-Microsoft.Win32.Registry                           4.700.22.56512                                                                           dotnet  
+Microsoft.Win32.Registry                           6.0.3524.45918                                                                           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  
+QBittorrent.Client                                 1.9.24285.1                                                                              dotnet    
-System                                             4.700.22.56512                                                                           dotnet  
+System                                             6.0.3524.45918                                                                           dotnet    
-System.AppContext                                  4.700.22.56512                                                                           dotnet  
+System.AppContext                                  6.0.3524.45918                                                                           dotnet    
-System.Buffers                                     4.700.22.56512                                                                           dotnet  
+System.Buffers                                     6.0.3524.45918                                                                           dotnet    
-System.Collections                                 4.700.22.56512                                                                           dotnet  
+System.Collections                                 6.0.3524.45918                                                                           dotnet    
-System.Collections.Concurrent                      4.700.22.56512                                                                           dotnet  
+System.Collections.Concurrent                      6.0.3524.45918                                                                           dotnet    
-System.Collections.Immutable                       4.700.22.56512                                                                           dotnet  
+System.Collections.Immutable                       6.0.3524.45918                                                                           dotnet    
-System.Collections.NonGeneric                      4.700.22.56512                                                                           dotnet  
+System.Collections.NonGeneric                      6.0.3524.45918                                                                           dotnet    
-System.Collections.Specialized                     4.700.22.56512                                                                           dotnet  
+System.Collections.Specialized                     6.0.3524.45918                                                                           dotnet    
-System.ComponentModel                              4.700.22.56512                                                                           dotnet  
+System.ComponentModel                              6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.Annotations                  4.700.22.56512                                                                           dotnet  
+System.ComponentModel.Annotations                  6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.DataAnnotations              4.700.22.56512                                                                           dotnet  
+System.ComponentModel.DataAnnotations              6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.EventBasedAsync              4.700.22.56512                                                                           dotnet  
+System.ComponentModel.EventBasedAsync              6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.Primitives                   4.700.22.56512                                                                           dotnet  
+System.ComponentModel.Primitives                   6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.TypeConverter                4.700.22.56512                                                                           dotnet  
+System.ComponentModel.TypeConverter                6.0.3524.45918                                                                           dotnet    
-System.Configuration                               4.700.22.56512                                                                           dotnet  
+System.Configuration                               6.0.3524.45918                                                                           dotnet    
-System.Console                                     4.700.22.56512                                                                           dotnet  
+System.Console                                     6.0.3524.45918                                                                           dotnet    
-System.Core                                        4.700.22.56512                                                                           dotnet  
+System.Core                                        6.0.3524.45918                                                                           dotnet    
-System.Data                                        4.700.22.56512                                                                           dotnet  
+System.Data                                        6.0.3524.45918                                                                           dotnet    
-System.Data.Common                                 4.700.22.56512                                                                           dotnet  
+System.Data.Common                                 6.0.3524.45918                                                                           dotnet    
-System.Data.DataSetExtensions                      4.700.22.56512                                                                           dotnet  
+System.Data.DataSetExtensions                      6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Contracts                       4.700.22.56512                                                                           dotnet  
+System.Diagnostics.Contracts                       6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Debug                           4.700.22.56512                                                                           dotnet  
+System.Diagnostics.Debug                           6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.DiagnosticSource                4.700.22.56512                                                                           dotnet  
+System.Diagnostics.DiagnosticSource                6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.FileVersionInfo                 4.700.22.56512                                                                           dotnet  
+System.Diagnostics.FileVersionInfo                 6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Process                         4.700.22.56512                                                                           dotnet  
+System.Diagnostics.Process                         6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.StackTrace                      4.700.22.56512                                                                           dotnet  
+System.Diagnostics.StackTrace                      6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.TextWriterTraceListener         4.700.22.56512                                                                           dotnet  
+System.Diagnostics.TextWriterTraceListener         6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Tools                           4.700.22.56512                                                                           dotnet  
+System.Diagnostics.Tools                           6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.TraceSource                     4.700.22.56512                                                                           dotnet  
+System.Diagnostics.TraceSource                     6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Tracing                         4.700.22.56512                                                                           dotnet  
+System.Diagnostics.Tracing                         6.0.3524.45918                                                                           dotnet    
-System.Drawing                                     4.700.22.56512                                                                           dotnet  
+System.Drawing                                     6.0.3524.45918                                                                           dotnet    
-System.Drawing.Primitives                          4.700.22.56512                                                                           dotnet  
+System.Drawing.Primitives                          6.0.3524.45918                                                                           dotnet    
-System.Dynamic.Runtime                             4.700.22.56512                                                                           dotnet  
+System.Dynamic.Runtime                             6.0.3524.45918                                                                           dotnet    
-System.Globalization                               4.700.22.56512                                                                           dotnet  
+System.Formats.Asn1                                6.0.3524.45918                                                                           dotnet    
-System.Globalization.Calendars                     4.700.22.56512                                                                           dotnet  
+System.Globalization                               6.0.3524.45918                                                                           dotnet    
-System.Globalization.Extensions                    4.700.22.56512                                                                           dotnet  
+System.Globalization.Calendars                     6.0.3524.45918                                                                           dotnet    
-System.IO                                          4.700.22.56512                                                                           dotnet  
+System.Globalization.Extensions                    6.0.3524.45918                                                                           dotnet    
-System.IO.Compression                              4.700.22.56512                                                                           dotnet  
+System.IO                                          6.0.3524.45918                                                                           dotnet    
-System.IO.Compression.Brotli                       4.700.22.56512                                                                           dotnet  
+System.IO.Compression                              6.0.3524.45918                                                                           dotnet    
-System.IO.Compression.FileSystem                   4.700.22.56512                                                                           dotnet  
+System.IO.Compression.Brotli                       6.0.3524.45918                                                                           dotnet    
-System.IO.Compression.ZipFile                      4.700.22.56512                                                                           dotnet  
+System.IO.Compression.FileSystem                   6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem                               4.700.22.56512                                                                           dotnet  
+System.IO.Compression.ZipFile                      6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem.AccessControl                 4.700.22.56512                                                                           dotnet  
+System.IO.FileSystem                               6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem.DriveInfo                     4.700.22.56512                                                                           dotnet  
+System.IO.FileSystem.AccessControl                 6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem.Primitives                    4.700.22.56512                                                                           dotnet  
+System.IO.FileSystem.DriveInfo                     6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem.Watcher                       4.700.22.56512                                                                           dotnet  
+System.IO.FileSystem.Primitives                    6.0.3524.45918                                                                           dotnet    
-System.IO.IsolatedStorage                          4.700.22.56512                                                                           dotnet  
+System.IO.FileSystem.Watcher                       6.0.3524.45918                                                                           dotnet    
-System.IO.MemoryMappedFiles                        4.700.22.56512                                                                           dotnet  
+System.IO.IsolatedStorage                          6.0.3524.45918                                                                           dotnet    
-System.IO.Pipes                                    4.700.22.56512                                                                           dotnet  
+System.IO.MemoryMappedFiles                        6.0.3524.45918                                                                           dotnet    
-System.IO.Pipes.AccessControl                      4.700.22.56512                                                                           dotnet  
+System.IO.Pipes                                    6.0.3524.45918                                                                           dotnet    
-System.IO.UnmanagedMemoryStream                    4.700.22.56512                                                                           dotnet  
+System.IO.Pipes.AccessControl                      6.0.3524.45918                                                                           dotnet    
-System.Linq                                        4.700.22.56512                                                                           dotnet  
+System.IO.UnmanagedMemoryStream                    6.0.3524.45918                                                                           dotnet    
-System.Linq.Expressions                            4.700.22.56512                                                                           dotnet  
+System.Linq                                        6.0.3524.45918                                                                           dotnet    
-System.Linq.Parallel                               4.700.22.56512                                                                           dotnet  
+System.Linq.Expressions                            6.0.3524.45918                                                                           dotnet    
-System.Linq.Queryable                              4.700.22.56512                                                                           dotnet  
+System.Linq.Parallel                               6.0.3524.45918                                                                           dotnet    
-System.Memory                                      4.700.22.56512                                                                           dotnet  
+System.Linq.Queryable                              6.0.3524.45918                                                                           dotnet    
-System.Net                                         4.700.22.56512                                                                           dotnet  
+System.Memory                                      6.0.3524.45918                                                                           dotnet    
-System.Net.Http                                    4.700.22.56512                                                                           dotnet  
+System.Net                                         6.0.3524.45918                                                                           dotnet    
-System.Net.HttpListener                            4.700.22.56512                                                                           dotnet  
+System.Net.Http                                    6.0.3524.45918                                                                           dotnet    
+System.Net.Http.Json                               6.0.3524.45918                                                                           dotnet    
+System.Net.HttpListener                            6.0.3524.45918                                                                           dotnet    
 System.Net.IPNetwork                               2.5.235                                                                                  dotnet    
-System.Net.Mail                                    4.700.22.56512                                                                           dotnet  
+System.Net.Mail                                    6.0.3524.45918                                                                           dotnet    
-System.Net.NameResolution                          4.700.22.56512                                                                           dotnet  
+System.Net.NameResolution                          6.0.3524.45918                                                                           dotnet    
-System.Net.NetworkInformation                      4.700.22.56512                                                                           dotnet  
+System.Net.NetworkInformation                      6.0.3524.45918                                                                           dotnet    
-System.Net.Ping                                    4.700.22.56512                                                                           dotnet  
+System.Net.Ping                                    6.0.3524.45918                                                                           dotnet    
-System.Net.Primitives                              4.700.22.56512                                                                           dotnet  
+System.Net.Primitives                              6.0.3524.45918                                                                           dotnet    
-System.Net.Requests                                4.700.22.56512                                                                           dotnet  
+System.Net.Quic                                    6.0.3524.45918                                                                           dotnet    
-System.Net.Security                                4.700.22.56512                                                                           dotnet  
+System.Net.Requests                                6.0.3524.45918                                                                           dotnet    
-System.Net.ServicePoint                            4.700.22.56512                                                                           dotnet  
+System.Net.Security                                6.0.3524.45918                                                                           dotnet    
-System.Net.Sockets                                 4.700.22.56512                                                                           dotnet  
+System.Net.ServicePoint                            6.0.3524.45918                                                                           dotnet    
-System.Net.WebClient                               4.700.22.56512                                                                           dotnet  
+System.Net.Sockets                                 6.0.3524.45918                                                                           dotnet    
-System.Net.WebHeaderCollection                     4.700.22.56512                                                                           dotnet  
+System.Net.WebClient                               6.0.3524.45918                                                                           dotnet    
-System.Net.WebProxy                                4.700.22.56512                                                                           dotnet  
+System.Net.WebHeaderCollection                     6.0.3524.45918                                                                           dotnet    
-System.Net.WebSockets                              4.700.22.56512                                                                           dotnet  
+System.Net.WebProxy                                6.0.3524.45918                                                                           dotnet    
-System.Net.WebSockets.Client                       4.700.22.56512                                                                           dotnet  
+System.Net.WebSockets                              6.0.3524.45918                                                                           dotnet    
-System.Numerics                                    4.700.22.56512                                                                           dotnet  
+System.Net.WebSockets.Client                       6.0.3524.45918                                                                           dotnet    
-System.Numerics.Vectors                            4.700.22.56512                                                                           dotnet  
+System.Numerics                                    6.0.3524.45918                                                                           dotnet    
-System.ObjectModel                                 4.700.22.56512                                                                           dotnet  
+System.Numerics.Vectors                            6.0.3524.45918                                                                           dotnet    
-System.Private.CoreLib                             3.1.32-servicing.22559.2+c17d273aa03d4b9d14c92248a91f0d0faa881b98                        dotnet  
+System.ObjectModel                                 6.0.3524.45918                                                                           dotnet    
-System.Private.DataContractSerialization           4.700.22.56512                                                                           dotnet  
+System.Private.CoreLib                             6.0.3524.45918                                                                           dotnet    
-System.Private.Uri                                 4.700.22.56512                                                                           dotnet  
+System.Private.DataContractSerialization           6.0.3524.45918                                                                           dotnet    
-System.Private.Xml                                 4.700.22.56512                                                                           dotnet  
+System.Private.Uri                                 6.0.3524.45918                                                                           dotnet    
-System.Private.Xml.Linq                            4.700.22.56512                                                                           dotnet  
+System.Private.Xml                                 6.0.3524.45918                                                                           dotnet    
-System.Reflection                                  4.700.22.56512                                                                           dotnet  
+System.Private.Xml.Linq                            6.0.3524.45918                                                                           dotnet    
-System.Reflection.DispatchProxy                    4.700.22.56512                                                                           dotnet  
+System.Reflection                                  6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit                             4.700.22.56512                                                                           dotnet  
+System.Reflection.DispatchProxy                    6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit.ILGeneration                4.700.22.56512                                                                           dotnet  
+System.Reflection.Emit                             6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit.Lightweight                 4.700.22.56512                                                                           dotnet  
+System.Reflection.Emit.ILGeneration                6.0.3524.45918                                                                           dotnet    
-System.Reflection.Extensions                       4.700.22.56512                                                                           dotnet  
+System.Reflection.Emit.Lightweight                 6.0.3524.45918                                                                           dotnet    
-System.Reflection.Metadata                         4.700.22.56512                                                                           dotnet  
+System.Reflection.Extensions                       6.0.3524.45918                                                                           dotnet    
-System.Reflection.Primitives                       4.700.22.56512                                                                           dotnet  
+System.Reflection.Metadata                         6.0.3524.45918                                                                           dotnet    
-System.Reflection.TypeExtensions                   4.700.22.56512                                                                           dotnet  
+System.Reflection.Primitives                       6.0.3524.45918                                                                           dotnet    
-System.Resources.Reader                            4.700.22.56512                                                                           dotnet  
+System.Reflection.TypeExtensions                   6.0.3524.45918                                                                           dotnet    
-System.Resources.ResourceManager                   4.700.22.56512                                                                           dotnet  
+System.Resources.Reader                            6.0.3524.45918                                                                           dotnet    
-System.Resources.Writer                            4.700.22.56512                                                                           dotnet  
+System.Resources.ResourceManager                   6.0.3524.45918                                                                           dotnet    
-System.Runtime                                     4.700.22.56512                                                                           dotnet  
+System.Resources.Writer                            6.0.3524.45918                                                                           dotnet    
-System.Runtime.CompilerServices.VisualC            4.700.22.56512                                                                           dotnet  
+System.Runtime                                     6.0.3524.45918                                                                           dotnet    
-System.Runtime.Extensions                          4.700.22.56512                                                                           dotnet  
+System.Runtime.CompilerServices.VisualC            6.0.3524.45918                                                                           dotnet    
-System.Runtime.Handles                             4.700.22.56512                                                                           dotnet  
+System.Runtime.Extensions                          6.0.3524.45918                                                                           dotnet    
-System.Runtime.InteropServices                     4.700.22.56512                                                                           dotnet  
+System.Runtime.Handles                             6.0.3524.45918                                                                           dotnet    
-System.Runtime.InteropServices.RuntimeInformation  4.700.22.56512                                                                           dotnet  
+System.Runtime.InteropServices                     6.0.3524.45918                                                                           dotnet    
-System.Runtime.InteropServices.WindowsRuntime      4.700.22.56512                                                                           dotnet  
+System.Runtime.InteropServices.RuntimeInformation  6.0.3524.45918                                                                           dotnet    
-System.Runtime.Intrinsics                          4.700.22.56512                                                                           dotnet  
+System.Runtime.Intrinsics                          6.0.3524.45918                                                                           dotnet    
-System.Runtime.Loader                              4.700.22.56512                                                                           dotnet  
+System.Runtime.Loader                              6.0.3524.45918                                                                           dotnet    
-System.Runtime.Numerics                            4.700.22.56512                                                                           dotnet  
+System.Runtime.Numerics                            6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization                       4.700.22.56512                                                                           dotnet  
+System.Runtime.Serialization                       6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization.Formatters            4.700.22.56512                                                                           dotnet  
+System.Runtime.Serialization.Formatters            6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization.Json                  4.700.22.56512                                                                           dotnet  
+System.Runtime.Serialization.Json                  6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization.Primitives            4.700.22.56512                                                                           dotnet  
+System.Runtime.Serialization.Primitives            6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization.Xml                   4.700.22.56512                                                                           dotnet  
+System.Runtime.Serialization.Xml                   6.0.3524.45918                                                                           dotnet    
-System.Runtime.WindowsRuntime                      4.700.22.56512                                                                           dotnet  
+System.Security                                    6.0.3524.45918                                                                           dotnet    
-System.Runtime.WindowsRuntime.UI.Xaml              4.700.22.56512                                                                           dotnet  
+System.Security.AccessControl                      6.0.3524.45918                                                                           dotnet    
-System.Security                                    4.700.22.56512                                                                           dotnet  
+System.Security.Claims                             6.0.3524.45918                                                                           dotnet    
-System.Security.AccessControl                      4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.Algorithms            6.0.3524.45918                                                                           dotnet    
-System.Security.Claims                             4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.Cng                   6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Algorithms            4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.Csp                   6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Cng                   4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.Encoding              6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Csp                   4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.OpenSsl               6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Encoding              4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.Primitives            6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.OpenSsl               4.700.22.56512                                                                           dotnet  
-System.Security.Cryptography.Primitives            4.700.22.56512                                                                           dotnet  
 System.Security.Cryptography.ProtectedData         5.0.20.51904                                                                             dotnet    
-System.Security.Cryptography.X509Certificates      4.700.22.56512                                                                           dotnet  
+System.Security.Cryptography.X509Certificates      6.0.3524.45918                                                                           dotnet    
-System.Security.Principal                          4.700.22.56512                                                                           dotnet  
+System.Security.Principal                          6.0.3524.45918                                                                           dotnet    
-System.Security.Principal.Windows                  4.700.22.56512                                                                           dotnet  
+System.Security.Principal.Windows                  6.0.3524.45918                                                                           dotnet    
-System.Security.SecureString                       4.700.22.56512                                                                           dotnet  
+System.Security.SecureString                       6.0.3524.45918                                                                           dotnet    
-System.ServiceModel.Web                            4.700.22.56512                                                                           dotnet  
+System.ServiceModel.Web                            6.0.3524.45918                                                                           dotnet    
-System.ServiceProcess                              4.700.22.56512                                                                           dotnet  
+System.ServiceProcess                              6.0.3524.45918                                                                           dotnet    
-System.Text.Encoding                               4.700.22.56512                                                                           dotnet  
+System.Text.Encoding                               6.0.3524.45918                                                                           dotnet    
-System.Text.Encoding.CodePages                     4.700.22.56512                                                                           dotnet  
+System.Text.Encoding.CodePages                     6.0.3524.45918                                                                           dotnet    
-System.Text.Encoding.Extensions                    4.700.22.56512                                                                           dotnet  
+System.Text.Encoding.Extensions                    6.0.3524.45918                                                                           dotnet    
-System.Text.Encodings.Web                          4.700.22.56512                                                                           dotnet  
+System.Text.Encodings.Web                          6.0.3524.45918                                                                           dotnet    
-System.Text.Json                                   4.700.22.56512                                                                           dotnet  
+System.Text.Json                                   6.0.3524.45918                                                                           dotnet    
-System.Text.RegularExpressions                     4.700.22.56512                                                                           dotnet  
+System.Text.RegularExpressions                     6.0.3524.45918                                                                           dotnet    
-System.Threading                                   4.700.22.56512                                                                           dotnet  
+System.Threading                                   6.0.3524.45918                                                                           dotnet    
-System.Threading.Channels                          4.700.22.56512                                                                           dotnet  
+System.Threading.Channels                          6.0.3524.45918                                                                           dotnet    
-System.Threading.Overlapped                        4.700.22.56512                                                                           dotnet  
+System.Threading.Overlapped                        6.0.3524.45918                                                                           dotnet    
-System.Threading.Tasks                             4.700.22.56512                                                                           dotnet  
+System.Threading.Tasks                             6.0.3524.45918                                                                           dotnet    
-System.Threading.Tasks.Dataflow                    4.700.22.56512                                                                           dotnet  
+System.Threading.Tasks.Dataflow                    6.0.3524.45918                                                                           dotnet    
-System.Threading.Tasks.Extensions                  4.700.22.56512                                                                           dotnet  
+System.Threading.Tasks.Extensions                  6.0.3524.45918                                                                           dotnet    
-System.Threading.Tasks.Parallel                    4.700.22.56512                                                                           dotnet  
+System.Threading.Tasks.Parallel                    6.0.3524.45918                                                                           dotnet    
-System.Threading.Thread                            4.700.22.56512                                                                           dotnet  
+System.Threading.Thread                            6.0.3524.45918                                                                           dotnet    
-System.Threading.ThreadPool                        4.700.22.56512                                                                           dotnet  
+System.Threading.ThreadPool                        6.0.3524.45918                                                                           dotnet    
-System.Threading.Timer                             4.700.22.56512                                                                           dotnet  
+System.Threading.Timer                             6.0.3524.45918                                                                           dotnet    
-System.Transactions                                4.700.22.56512                                                                           dotnet  
+System.Transactions                                6.0.3524.45918                                                                           dotnet    
-System.Transactions.Local                          4.700.22.56512                                                                           dotnet  
+System.Transactions.Local                          6.0.3524.45918                                                                           dotnet    
-System.ValueTuple                                  4.700.22.56512                                                                           dotnet  
+System.ValueTuple                                  6.0.3524.45918                                                                           dotnet    
-System.Web                                         4.700.22.56512                                                                           dotnet  
+System.Web                                         6.0.3524.45918                                                                           dotnet    
-System.Web.HttpUtility                             4.700.22.56512                                                                           dotnet  
+System.Web.HttpUtility                             6.0.3524.45918                                                                           dotnet    
-System.Windows                                     4.700.22.56512                                                                           dotnet  
+System.Windows                                     6.0.3524.45918                                                                           dotnet    
-System.Xml                                         4.700.22.56512                                                                           dotnet  
+System.Xml                                         6.0.3524.45918                                                                           dotnet    
-System.Xml.Linq                                    4.700.22.56512                                                                           dotnet  
+System.Xml.Linq                                    6.0.3524.45918                                                                           dotnet    
-System.Xml.ReaderWriter                            4.700.22.56512                                                                           dotnet  
+System.Xml.ReaderWriter                            6.0.3524.45918                                                                           dotnet    
-System.Xml.Serialization                           4.700.22.56512                                                                           dotnet  
+System.Xml.Serialization                           6.0.3524.45918                                                                           dotnet    
-System.Xml.XDocument                               4.700.22.56512                                                                           dotnet  
+System.Xml.XDocument                               6.0.3524.45918                                                                           dotnet    
-System.Xml.XPath                                   4.700.22.56512                                                                           dotnet  
+System.Xml.XPath                                   6.0.3524.45918                                                                           dotnet    
-System.Xml.XPath.XDocument                         4.700.22.56512                                                                           dotnet  
+System.Xml.XPath.XDocument                         6.0.3524.45918                                                                           dotnet    
-System.Xml.XmlDocument                             4.700.22.56512                                                                           dotnet  
+System.Xml.XmlDocument                             6.0.3524.45918                                                                           dotnet    
-System.Xml.XmlSerializer                           4.700.22.56512                                                                           dotnet  
+System.Xml.XmlSerializer                           6.0.3524.45918                                                                           dotnet    
-WindowsBase                                        4.700.22.56512                                                                           dotnet  
+WindowsBase                                        6.0.3524.45918                                                                           dotnet    
-alpine-baselayout                                  3.5.3-r1                                                                                 apk     
+acl-libs                                           2.3.2-r1                                                                                 apk       
-alpine-baselayout-data                             3.5.3-r1                                                                                 apk     
+alpine-baselayout                                  3.6.8-r1                                                                                 apk       
-alpine-keys                                        2.4-r1                                                                                   apk     
+alpine-baselayout-data                             3.6.8-r1                                                                                 apk       
-apk-tools                                          2.14.0-r5                                                                                apk     
+alpine-keys                                        2.5-r0                                                                                   apk       
-bash                                               5.2.21-r0                                                                                apk     
+apk-tools                                          2.14.9-r1                                                                                apk       
-brotli-libs                                        1.1.0-r1                                                                                 apk     
+bash                                               5.2.37-r0                                                                                apk       
-busybox                                            1.36.1-r18                                                                               apk     
+brotli-libs                                        1.1.0-r2                                                                                 apk       
-busybox-binsh                                      1.36.1-r18                                                                               apk     
+busybox                                            1.37.0-r14                                                                               apk       
-c-ares                                             1.25.0-r0                                                                                apk     
+busybox-binsh                                      1.37.0-r14                                                                               apk       
-ca-certificates                                    20230506-r1                                                                              apk     
+c-ares                                             1.34.4-r0                                                                                apk       
-ca-certificates-bundle                             20230506-r1                                                                              apk     
+ca-certificates                                    20241121-r1                                                                              apk       
-coreutils                                          9.4-r1                                                                                   apk     
+ca-certificates-bundle                             20241121-r1                                                                              apk       
-coreutils-env                                      9.4-r1                                                                                   apk     
+catatonit                                          0.2.1-r0                                                                                 apk       
-coreutils-fmt                                      9.4-r1                                                                                   apk     
+coreutils                                          9.6-r2                                                                                   apk       
-coreutils-sha512sum                                9.4-r1                                                                                   apk     
+coreutils-env                                      9.6-r2                                                                                   apk       
-curl                                               8.5.0-r1                                                                                 apk     
+coreutils-fmt                                      9.6-r2                                                                                   apk       
-dbus-libs                                          1.14.10-r0                                                                               apk     
+coreutils-sha512sum                                9.6-r2                                                                                   apk       
-double-conversion                                  3.3.0-r0                                                                                 apk     
+curl                                               8.12.1-r1                                                                                apk       
-duktape                                            2.7.0-r1                                                                                 apk     
+dbus-libs                                          1.16.2-r1                                                                                apk       
-gdbm                                               1.23-r1                                                                                  apk     
+double-conversion                                  3.3.1-r0                                                                                 apk       
-glib                                               2.78.3-r0                                                                                apk     
+duktape-libs                                       2.7.0-r2                                                                                 apk       
+findutils                                          4.10.0-r0                                                                                apk       
+gdbm                                               1.24-r0                                                                                  apk       
+glib                                               2.84.0-r0                                                                                apk       
+grep                                               3.11-r0                                                                                  apk       
 icu-data-en                                        74.2-r0                                                                                  apk       
 icu-libs                                           74.2-r0                                                                                  apk       
 jq                                                 1.7.1-r0                                                                                 apk       
-libacl                                             2.3.1-r4                                                                                 apk     
+libapk2                                            2.14.9-r1                                                                                apk       
-libattr                                            2.5.1-r5                                                                                 apk     
+libattr                                            2.5.2-r2                                                                                 apk       
 libb2                                              0.98.1-r3                                                                                apk       
-libblkid                                           2.39.3-r0                                                                                apk     
+libblkid                                           2.41-r0                                                                                  apk       
-libbsd                                             0.11.8-r0                                                                                apk     
+libbsd                                             0.12.2-r0                                                                                apk       
 libbz2                                             1.0.8-r6                                                                                 apk       
-libc-utils                                         0.7.2-r5                                                                                 apk     
+libcrypto3                                         3.3.3-r0                                                                                 apk       
-libcrypto1.1                                       1.1.1w-r0                                                                                apk     
+libcurl                                            8.12.1-r1                                                                                apk       
-libcrypto3                                         3.1.4-r4                                                                                 apk     
+libeconf                                           0.6.3-r0                                                                                 apk       
-libcurl                                            8.5.0-r1                                                                                 apk     
+libexpat                                           2.7.0-r0                                                                                 apk       
-libexpat                                           2.5.0-r2                                                                                 apk     
+libffi                                             3.4.7-r0                                                                                 apk       
-libffi                                             3.4.4-r3                                                                                 apk     
+libgcc                                             14.2.0-r5                                                                                apk       
-libgcc                                             13.2.1_git20231014-r0                                                                    apk     
+libgomp                                            14.2.0-r5                                                                                apk       
-libgomp                                            13.2.1_git20231014-r0                                                                    apk     
+libidn2                                            2.3.7-r0                                                                                 apk       
-libidn2                                            2.3.4-r4                                                                                 apk     
+libintl                                            0.22.5-r0                                                                                apk       
-libintl                                            0.22.4-r0                                                                                apk     
 libmd                                              1.1.0-r0                                                                                 apk       
-libmount                                           2.39.3-r0                                                                                apk     
+libmount                                           2.41-r0                                                                                  apk       
-libncursesw                                        6.4_p20231125-r0                                                                         apk     
+libncursesw                                        6.5_p20250216-r0                                                                         apk       
-libpanelw                                          6.4_p20231125-r0                                                                         apk     
+libpanelw                                          6.5_p20250216-r0                                                                         apk       
-libpcre2-16                                        10.42-r2                                                                                 apk     
+libpcre2-16                                        10.43-r1                                                                                 apk       
-libproc2                                           4.0.4-r0                                                                                 apk     
+libproc2                                           4.0.4-r2                                                                                 apk       
-libproxy                                           0.5.3-r0                                                                                 apk     
+libproxy                                           0.5.9-r0                                                                                 apk       
-libpsl                                             0.21.5-r0                                                                                apk     
+libpsl                                             0.21.5-r3                                                                                apk       
-libssl1.1                                          1.1.1w-r0                                                                                apk     
+libssl3                                            3.3.3-r0                                                                                 apk       
-libssl3                                            3.1.4-r4                                                                                 apk     
+libstdc++                                          14.2.0-r5                                                                                apk       
-libstdc++                                          13.2.1_git20231014-r0                                                                    apk     
+libtorrent-rasterbar                               2.0.11-r0                                                                                apk       
-libtorrent-rasterbar                               2.0.9-r2                                                                                 apk     
+libunistring                                       1.3-r0                                                                                   apk       
-libunistring                                       1.1-r2                                                                                   apk     
+linux-pam                                          1.7.0-r1                                                                                 apk       
-linux-pam                                          1.5.3-r7                                                                                 apk     
+mpdecimal                                          4.0.0-r0                                                                                 apk       
-mpdecimal                                          2.5.1-r2                                                                                 apk     
+mscorlib                                           6.0.3524.45918                                                                           dotnet    
-mscorlib                                           4.700.22.56512                                                                           dotnet  
+musl                                               1.2.5-r10                                                                                apk       
-musl                                               1.2.4_git20230717-r5                                                                     apk     
+musl-utils                                         1.2.5-r10                                                                                apk       
-musl-utils                                         1.2.4_git20230717-r5                                                                     apk     
+ncurses-terminfo-base                              6.5_p20250216-r0                                                                         apk       
-ncurses-terminfo-base                              6.4_p20231125-r0                                                                         apk     
+netcat-openbsd                                     1.228.1-r0                                                                               apk       
-netcat-openbsd                                     1.226-r0                                                                                 apk     
+netstandard                                        6.0.3524.45918                                                                           dotnet    
-netstandard                                        4.700.22.56512                                                                           dotnet  
+nghttp2-libs                                       1.65.0-r0                                                                                apk       
-nghttp2-libs                                       1.58.0-r0                                                                                apk     
+oniguruma                                          6.9.10-r0                                                                                apk       
-oniguruma                                          6.9.9-r0                                                                                 apk     
+pcre2                                              10.43-r1                                                                                 apk       
-openssl                                            3.1.4-r4                                                                                 apk     
+procps-ng                                          4.0.4-r2                                                                                 apk       
-openssl1.1-compat                                  1.1.1w-r0                                                                                apk     
+pyc                                                3.12.9-r0                                                                                apk       
-pcre2                                              10.42-r2                                                                                 apk     
+python3                                            3.12.9-r0                                                                                apk       
-procps-ng                                          4.0.4-r0                                                                                 apk     
+python3-pyc                                        3.12.9-r0                                                                                apk       
-pyc                                                3.11.6-r1                                                                                apk     
+python3-pycache-pyc0                               3.12.9-r0                                                                                apk       
-python3                                            3.11.6-r1                                                                                apk     
+qbittorrent-nox                                    5.0.4-r0                                                                                 apk       
-python3-pyc                                        3.11.6-r1                                                                                apk     
+qbt                                                1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2                                     dotnet    
-python3-pycache-pyc0                               3.11.6-r1                                                                                apk     
+qt6-qtbase                                         6.8.2-r0                                                                                 apk       
-qbittorrent-nox                                    4.6.3-r0                                                                                 apk     
+qt6-qtbase-sqlite                                  6.8.2-r0                                                                                 apk       
-qbt                                                1.8.24012.1+00a638ba43f1a80a03cc8be139f586ce9886c908                                     dotnet  
+readline                                           8.2.13-r0                                                                                apk       
-qt6-qtbase                                         6.6.1-r0                                                                                 apk     
+scanelf                                            1.3.8-r1                                                                                 apk       
-qt6-qtbase-sqlite                                  6.6.1-r0                                                                                 apk     
+shadow                                             4.17.3-r0                                                                                apk       
-readline                                           8.2.7-r0                                                                                 apk     
+skalibs-libs                                       2.14.3.0-r0                                                                              apk       
-scanelf                                            1.3.7-r2                                                                                 apk     
+sqlite-libs                                        3.49.1-r0                                                                                apk       
-shadow                                             4.14.2-r0                                                                                apk     
+ssl_client                                         1.37.0-r14                                                                               apk       
-skalibs                                            2.14.1.0-r0                                                                              apk     
+tzdata                                             2025a-r0                                                                                 apk       
-sqlite-libs                                        3.45.0-r0                                                                                apk     
+utmps-libs                                         0.1.2.3-r2                                                                               apk       
-ssl_client                                         1.36.1-r18                                                                               apk     
+xz-libs                                            5.6.4-r0                                                                                 apk       
-tzdata                                             2023d-r0                                                                                 apk     
+zlib                                               1.3.1-r2                                                                                 apk       
-utmps-libs                                         0.1.2.2-r0                                                                               apk     
+zstd-libs                                          1.5.7-r0                                                                                 apk       
-xz-libs                                            5.4.5-r0                                                                                 apk     
-zlib                                               1.3-r2                                                                                   apk     
-zstd-libs                                          1.5.5-r8                                                                                 apk     

readme-vars.yml

@@ -6,34 +6,36 @@ 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_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-
 # development version
 development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable qbittorrent releases" }
+  - {tag: "latest", desc: "Stable qbittorrent releases"}
-  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
+  - {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/appdata/config", desc: "Contains all relevant configuration files." }
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files."}
-  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
+  - {external_port: "8080", internal_port: "8080", port_desc: "WebUI"}
-  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
+  - {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: "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: "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."}
+readonly_supported: true
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -47,45 +49,94 @@ 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 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
+  For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
 
+  ### 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
+    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-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: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
+  - {date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3."}
-  - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - {date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
-  - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - {date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set."}
-  - { date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
+  - {date: "14.02.24:", desc: "Add torrenting port support."}
-  - { date: "10.06.23:", desc: "Bump unrar to 6.2.8." }
+  - {date: "31.01.24:", desc: "Remove obsolete compat packages."}
-  - { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - {date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
-  - { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
+  - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
-  - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
+  - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
-  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
+  - {date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)."}
-  - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
+  - {date: "10.06.23:", desc: "Bump unrar to 6.2.8."}
-  - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
+  - {date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
-  - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
+  - {date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli."}
-  - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
+  - {date: "31.10.22:", desc: "Add libtorrentv1 branch."}
-  - { date: "01.03.22:", desc: "Add python for search plugin support." }
+  - {date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases."}
-  - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
+  - {date: "12.08.22:", desc: "Bump unrar to 6.1.7."}
-  - { date: "19.02.22:", desc: "Add jq to build-stage" }
+  - {date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge."}
-  - { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
+  - {date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo."}
-  - { date: "06.01.22:", desc: "Deprecate unstable branch." }
+  - {date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli."}
-  - { date: "10.02.21:", desc: "Rebase to focal." }
+  - {date: "01.03.22:", desc: "Add python for search plugin support."}
-  - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
+  - {date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos."}
-  - { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
+  - {date: "19.02.22:", desc: "Add jq to build-stage"}
-  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
+  - {date: "07.01.22:", desc: "Rebase to Alpine, build from source."}
-  - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
+  - {date: "06.01.22:", desc: "Deprecate unstable branch."}
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
+  - {date: "10.02.21:", desc: "Rebase to focal."}
-  - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
+  - {date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."}
-  - { date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3." }
+  - {date: "12.11.20:", desc: "Stop creating /config/data directory on startup"}
-  - { date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2." }
+  - {date: "03.04.20:", desc: "Fix adding search engine plugin"}
-  - { date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1." }
+  - {date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts."}
-  - { date: "26.04.18:", desc: "Bump libtorrent to 1.1.7." }
+  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - { date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6." }
+  - {date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic."}
-  - { date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
+  - {date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3."}
-  - { date: "19.12.17:", desc: "Update to v4.0.3." }
+  - {date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2."}
-  - { date: "09.02.17:", desc: "Rebase to alpine 3.7" }
+  - {date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1."}
-  - { date: "01.12.17:", desc: "Update to v4.0.2." }
+  - {date: "26.04.18:", desc: "Bump libtorrent to 1.1.7."}
-  - { date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds." }
+  - {date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6."}
-  - { 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: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling."}
-  - { date: "01.08.17:", desc: "Initial Release." }
+  - {date: "19.12.17:", desc: "Update to v4.0.3."}
-  - { date: "12.02.18:", desc: "Initial Release." }
+  - {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,13 @@ if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
     cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
 fi
 
-# chown download directory if currently not set to abc
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-if [[ -d /downloads ]]; then
+    # chown download directory if currently not set to abc
-    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+    if grep -qe ' /downloads ' /proc/mounts; then
-        lsiown -R abc:abc /downloads
+        lsiown abc:abc /downloads
     fi
-fi
 
-# permissions
+    # permissions
-lsiown -R abc:abc \
+    lsiown -R abc:abc \
         /config
+fi

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

@@ -2,7 +2,20 @@
 # shellcheck shell=bash
 
 WEBUI_PORT=${WEBUI_PORT:-8080}
+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 localhost ${WEBUI_PORT}" \
+    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}"
+        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

root/usr/bin/qbt

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # qbt bash wrapper to prompt user when trying to save password
 if [[ "$@" == "settings set password" ]]; then