Bot Updating Package Versions

Restore qbittorrent-cli (master)

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -53,7 +53,6 @@ body:
       options:
         - x86-64
         - arm64
-        - armhf
     validations:
       required: true
   - type: textarea
@@ -68,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/call_issue_pr_tracker.yml

@@ -2,9 +2,11 @@ name: Issue & PR Tracker
 
 on:
   issues:
-    types: [opened,reopened,labeled,unlabeled]
+    types: [opened,reopened,labeled,unlabeled,closed]
   pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
 
 jobs:
   manage-project:

.github/workflows/external_trigger.yml

@@ -7,21 +7,28 @@ 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 "> [!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 "**** Retrieving external version ****"
+          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
+          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 [ -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,
@@ -30,8 +37,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 "**** Retrieving last pushed version ****"
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/qbittorrent"
           tag="latest"
           token=$(curl -sX GET \
@@ -58,47 +65,61 @@ 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
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            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}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/armv7/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          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
             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
             exit 0
           else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            if [[ "${artifacts_found}" == "false" ]]; then
-            response=$(curl -iX POST \
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              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."
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            echo "**** Sleeping 10 seconds until job starts ****"
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-            sleep 10
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+            else
-            buildurl="${buildurl%$'\r'}"
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "**** Jenkins job build url: ${buildurl} ****"
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
+              if "${artifacts_found}" == "true" ]]; then
-            curl -iX POST \
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
-              "${buildurl}submitDescription" \
+              fi
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+              response=$(curl -iX POST \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
-              --data-urlencode "Submit=Submit"
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Notifying Discord ****"
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-            TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              sleep 10
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              buildurl="${buildurl%$'\r'}"
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+              curl -iX POST \
+                "${buildurl}submitDescription" \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                --data-urlencode "Submit=Submit"
+              echo "**** Notifying Discord ****"
+              TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            fi
           fi

.github/workflows/external_trigger_scheduler.yml

@@ -2,42 +2,44 @@ name: External Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '41 * * * *'
+    - cron:  '42 * * * *'
   workflow_dispatch:
 
 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
-          echo "**** Pulling the yq docker image ****"
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
-          docker pull ghcr.io/linuxserver/yq
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            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 \
+              continue
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            fi
-            if [ "$br" == "$ls_branch" ]; then
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            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 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
                 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
               fi
             else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/package_trigger.yml

@@ -1,38 +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. ****"
-            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 ****"
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/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 "**** 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,74 @@ 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
-          echo "**** Pulling the yq docker image ****"
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
-          docker pull ghcr.io/linuxserver/yq
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            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 \
+              continue
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            fi
-            if [ "${br}" == "${ls_branch}" ]; then
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                curl -iX POST \
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                  -H "Accept: application/vnd.github.v3+json" \
+                skipped_branches="${skipped_branches}${br} "
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              elif grep -q "^qbittorrent_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                sleep 30
+                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') == "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 "> 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|")
+                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
+                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"
+                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
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
-          echo "**** Notifying Discord ****"
+            if [[ -n "${triggered_branches}" ]]; then
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-            "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"}],
+            fi
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) Triggered for qbittorrent** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi

.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,46 +1,31 @@
 # syntax=docker/dockerfile:1
 
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
+
 FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
+ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
 # environment settings
-ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --upgrade --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
+  apk add --no-cache \
+    grep \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
@@ -49,17 +34,18 @@ RUN \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+  if [ -z ${QBT_CLI_VERSION+x} ]; then \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
+    | jq -r '. | .tag_name'); \
+  fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.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/*
@@ -67,6 +53,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8080 6881 6881/udp
 

Dockerfile.aarch64

@@ -1,46 +1,31 @@
 # syntax=docker/dockerfile:1
 
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
+
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
+ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
 # environment settings
-ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --upgrade --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
+  apk add --no-cache \
+    grep \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
@@ -49,17 +34,18 @@ RUN \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+  if [ -z ${QBT_CLI_VERSION+x} ]; then \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
+    | jq -r '. | .tag_name'); \
+  fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.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/*
@@ -67,6 +53,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8080 6881 6881/udp
 

Dockerfile.armhf

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

Jenkinsfile

@@ -16,7 +16,9 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
+    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,19 +35,39 @@ 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)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -56,11 +78,16 @@ pipeline {
           env.COMMIT_SHA = sh(
             script: '''git rev-parse HEAD''',
             returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
           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}" '''
         script{
           env.LS_RELEASE_NUMBER = sh(
             script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -119,7 +146,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
             returnStdout: true).trim()
 
           def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -137,7 +164,7 @@ pipeline {
           }
 
           if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
               env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
             }
             println("SEMVER: ${env.SEMVER}")
@@ -161,7 +188,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
@@ -184,7 +211,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
@@ -207,12 +234,12 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.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/'
@@ -232,15 +259,17 @@ pipeline {
           script{
             env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
                 docker run --rm \
                   -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" || :'''
         }
       }
@@ -259,8 +288,15 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # 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}
@@ -269,16 +305,17 @@ pipeline {
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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"
+              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}"
@@ -293,15 +330,16 @@ pipeline {
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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 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)
@@ -314,36 +352,58 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
                 cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                   echo ".jenkins-external" >> .gitignore
                   git add .gitignore
                 fi
-                git add ${TEMPLATED_FILES}
+                git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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
-              mkdir -p ${TEMPDIR}/gitbook
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
+              mkdir -p ${TEMPDIR}/docs
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              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
-                cd ${TEMPDIR}/gitbook/docker-documentation/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
-                git add images/docker-${CONTAINER_NAME}.md
+                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 push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                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} || \
+                  (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}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${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/
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                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 && [[ -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
@@ -354,7 +414,42 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                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} || \
+                  (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
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; 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
+                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" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
               fi
               rm -Rf ${TEMPDIR}'''
         script{
@@ -380,54 +475,48 @@ pipeline {
         }
       }
     }
+    // If this is a master build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
     /* #######################
-           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: ''
       }
       steps{
         sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
+            "name":"'${LS_REPO}'",
-             "mirror":true,\
+            "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
+            "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
+            "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+            "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" \
-           Scarf.sh package registry
+          -d '{"visibility":"public"}' ||: '''
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "master"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .uuid')
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/qbittorrent",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-qbittorrent",\
-                       "backendUrl":"https://ghcr.io/linuxserver/qbittorrent",\
-                       "publicUrl":"https://lscr.io/linuxserver/qbittorrent"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
       } 
     }
     /* ###############
@@ -458,6 +547,7 @@ 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=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -489,44 +579,10 @@ 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=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          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.armhf"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Qbittorrent\" \
-              --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-          }
-        }
         stage('Build ARM64') {
           agent {
             label 'ARM64'
@@ -552,14 +608,18 @@ pipeline {
               --label \"org.opencontainers.image.title=Qbittorrent\" \
               --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
+            retry_backoff(5,5) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''docker rmi \
+            sh '''#! /bin/bash
-                  ${IMAGE}:arm64v8-${META_TAG} \
+                  containers=$(docker ps -aq)
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -575,7 +635,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}
@@ -596,7 +656,8 @@ pipeline {
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -620,13 +681,6 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -644,13 +698,6 @@ pipeline {
         }
       }
       steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -672,23 +719,31 @@ pipeline {
         ]) {
           script{
             env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
           }
           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:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag 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}\" \
@@ -698,8 +753,7 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
-                -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -716,12 +770,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -729,10 +777,10 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  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
@@ -747,22 +795,11 @@ pipeline {
                     docker push ${PUSHIMAGE}:${META_TAG}
                     docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
+                      docker push ${PUSHIMAGE}:${SEMVER}
                     fi
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
         }
       }
     }
@@ -774,12 +811,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -787,98 +818,49 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${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:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                    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}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
                     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}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     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 push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                  done
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                     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}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
                     fi
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
-                done
-                docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
         }
       }
     }
@@ -899,7 +881,7 @@ 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
@@ -912,49 +894,117 @@ pipeline {
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
     }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
+    // Add protection to the release branch
-    stage('Sync-README') {
+    stage('Github-Release-Branch-Protection') {
       when {
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        echo "Setting up protection for release branch master"
-          [
+        sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+          -d $(jq -c .  << EOF
-            usernameVariable: 'DOCKERUSER',
+            {
-            passwordVariable: 'DOCKERPASS'
+              "required_status_checks": null,
-          ]
+              "enforce_admins": false,
-        ]) {
+              "required_pull_request_reviews": {
-          sh '''#! /bin/bash
+                "dismiss_stale_reviews": false,
-                set -e
+                "require_code_owner_reviews": false,
-                TEMPDIR=$(mktemp -d)
+                "require_last_push_approval": false,
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                "required_approving_review_count": 1
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
+              },
-                docker pull ghcr.io/linuxserver/readme-sync
+              "restrictions": null,
-                docker run --rm=true \
+              "required_linear_history": false,
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+              "allow_force_pushes": false,
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+              "allow_deletions": false,
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+              "block_creations": false,
-                  -e DOCKER_REPOSITORY=${IMAGE} \
+              "required_conversation_resolution": true,
-                  -e GIT_BRANCH=master \
+              "lock_branch": false,
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+              "allow_fork_syncing": false,
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+              "required_signatures": false
-                rm -Rf ${TEMPDIR} '''
+            }
-        }
+EOF
+          ) '''
       }
     }
     // If this is a Pull request send the CI link as a comment on it
     stage('Pull Request Comment') {
       when {
         not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
+        sh '''#! /bin/bash
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
       }
     }
   }
@@ -963,24 +1013,84 @@ pipeline {
      ###################### */
   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{
-        else if (currentBuild.currentResult == "SUCCESS"){
+          if (currentBuild.currentResult == "SUCCESS"){
-          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='Success'
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+              env.JOB_WEBHOOK_COLOUR=3957028
-        }
+              env.JOB_WEBHOOK_FOOTER='PR Build'
-        else {
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-          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,\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "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"}],\
+              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 (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              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'
+            }
+          }
+          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}',\
+                 "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!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
       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

@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
-
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![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!")
@@ -29,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)
@@ -46,7 +45,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 ## Supported Architectures
 
-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
 Simply pulling `lscr.io/linuxserver/qbittorrent:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
@@ -56,7 +55,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |
 
 ## Version Tags
 
@@ -66,41 +65,39 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | latest | ✅ | Stable qbittorrent releases |
 | libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
+
 ## Application Setup
 
-The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
 
-Change username/password via the webui in the webui section of settings.  
+You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
-
-### WEBUI_PORT variable
-
-Due to issues with CSRF and port mapping, should you require to alter the port for the webui 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  
-
-This should alleviate the "white screen" issue.  
-
-If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
-
-edit or add the following lines  
-
-```text
-WebUI\Address=*
-
-WebUI\ServerDomains=*
-```
 
 If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
 
+### WEBUI_PORT variable
+
+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
+
+### 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/).
+
 ## Usage
 
-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
-version: "2.1"
 services:
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -110,9 +107,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
@@ -129,19 +127,19 @@ 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
-
 ```
 
 ## Parameters
 
-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
@@ -151,9 +149,11 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=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 webui, see below for explanation |
+| `-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/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -162,10 +162,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:
 
 ```bash
--e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```
 
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
 
 ## Umask for running applications
 
@@ -174,15 +174,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
 
 ```bash
-  $ id username
+id your_user
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -193,53 +198,101 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Support Info
 
-* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
+* Shell access whilst the container is running:
-* To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
+
-* container version number
+    ```bash
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
+    docker exec -it qbittorrent /bin/bash
-* image version number
+    ```
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest`
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f qbittorrent
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
+    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
 
-* Update all images: `docker-compose pull`
+* Update images:
-  * or update a single image: `docker-compose pull qbittorrent`
+    * All images:
-* Let compose update all containers as necessary: `docker-compose up -d`
+
-  * or update a single container: `docker-compose up -d qbittorrent`
+        ```bash
-* You can also remove the old dangling images: `docker image prune`
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull qbittorrent
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d qbittorrent
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:latest`
+* Update the image:
-* Stop the running container: `docker stop qbittorrent`
+
-* Delete the container: `docker rm qbittorrent`
+    ```bash
+    docker pull lscr.io/linuxserver/qbittorrent:latest
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop qbittorrent
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm qbittorrent
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:
 
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
+    ```bash
-
+    docker image prune
-* Pull the latest image at its tag and replace it with the same env variables in one run:
+    ```
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once qbittorrent
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+>[!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
 
@@ -264,6 +317,16 @@ 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.
+* **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
+* **10.06.23:** - Bump unrar to 6.2.8.
 * **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
 * **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
 * **31.10.22:** - Add libtorrentv1 branch.

jenkins-vars.yml

@@ -23,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,202 +1,261 @@
-NAME                                                                           VERSION                 TYPE   
+NAME                                               VERSION                                                                                  TYPE     
-Alba.CsConsoleFormat                                                           1.0.0                   dotnet  
+7zip                                               23.01-r0                                                                                 apk       
-BencodeNET                                                                     2.3.0                   dotnet  
+Alba.CsConsoleFormat                               1.0.0.89                                                                                 dotnet    
-CsvHelper                                                                      12.1.2                  dotnet  
+BencodeNET                                         2.3.0.0                                                                                  dotnet    
-IPNetwork2                                                                     2.5.235                 dotnet  
+Bouncy Castle for .NET (netstandard2.0)            1.8.8.2                                                                                  dotnet    
-McMaster.Extensions.CommandLineUtils                                           2.4.4                   dotnet  
+CommandLineUtils                                   2.4.4+3c2a4909757a51602dcca9b961d577511b85fd31.3c2a4909757a51602dcca9b961d577511b85fd31  dotnet    
-Microsoft.CSharp                                                               4.4.0                   dotnet  
+CsvHelper                                          12.1.2                                                                                   dotnet    
-Microsoft.NETCore.Platforms                                                    1.1.0                   dotnet  
+Json.NET                                           13.0.3.27908                                                                             dotnet    
-Microsoft.NETCore.Targets                                                      1.1.0                   dotnet  
+Microsoft.CSharp                                   6.0.3524.45918                                                                           dotnet    
-Microsoft.Win32.Primitives                                                     4.3.0                   dotnet  
+Microsoft.VisualBasic                              6.0.3524.45918                                                                           dotnet    
-Mono.Posix.NETStandard                                                         1.0.0                   dotnet  
+Microsoft.VisualBasic.Core                         11.100.3524.45918                                                                        dotnet    
-NETStandard.Library                                                            1.6.1                   dotnet  
+Microsoft.Win32.Primitives                         6.0.3524.45918                                                                           dotnet    
-NJsonSchema                                                                    9.14.1                  dotnet  
+Microsoft.Win32.Registry                           6.0.3524.45918                                                                           dotnet    
-Newtonsoft.Json                                                                13.0.1                  dotnet  
+Mono.Posix.NETStandard                             1.0.0.0                                                                                  dotnet    
-Portable.BouncyCastle                                                          1.8.8                   dotnet  
+NJsonSchema                                        9.14.1.0                                                                                 dotnet    
-Portable.Xaml                                                                  0.18.0                  dotnet  
+Portable.Xaml.dll                                  0.18.0.0                                                                                 dotnet    
-QBittorrent.Client                                                             1.8.23016.2             dotnet  
+QBittorrent.Client                                 1.9.24285.1                                                                              dotnet    
-System.AppContext                                                              4.3.0                   dotnet  
+System                                             6.0.3524.45918                                                                           dotnet    
-System.Buffers                                                                 4.3.0                   dotnet  
+System.AppContext                                  6.0.3524.45918                                                                           dotnet    
-System.Collections                                                             4.3.0                   dotnet  
+System.Buffers                                     6.0.3524.45918                                                                           dotnet    
-System.Collections.Concurrent                                                  4.3.0                   dotnet  
+System.Collections                                 6.0.3524.45918                                                                           dotnet    
-System.Collections.NonGeneric                                                  4.3.0                   dotnet  
+System.Collections.Concurrent                      6.0.3524.45918                                                                           dotnet    
-System.Collections.Specialized                                                 4.3.0                   dotnet  
+System.Collections.Immutable                       6.0.3524.45918                                                                           dotnet    
-System.ComponentModel                                                          4.3.0                   dotnet  
+System.Collections.NonGeneric                      6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.Annotations                                              4.4.1                   dotnet  
+System.Collections.Specialized                     6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.Primitives                                               4.3.0                   dotnet  
+System.ComponentModel                              6.0.3524.45918                                                                           dotnet    
-System.ComponentModel.TypeConverter                                            4.3.0                   dotnet  
+System.ComponentModel.Annotations                  6.0.3524.45918                                                                           dotnet    
-System.Console                                                                 4.3.0                   dotnet  
+System.ComponentModel.DataAnnotations              6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Debug                                                       4.3.0                   dotnet  
+System.ComponentModel.EventBasedAsync              6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.DiagnosticSource                                            4.3.0                   dotnet  
+System.ComponentModel.Primitives                   6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Tools                                                       4.3.0                   dotnet  
+System.ComponentModel.TypeConverter                6.0.3524.45918                                                                           dotnet    
-System.Diagnostics.Tracing                                                     4.3.0                   dotnet  
+System.Configuration                               6.0.3524.45918                                                                           dotnet    
-System.Globalization                                                           4.3.0                   dotnet  
+System.Console                                     6.0.3524.45918                                                                           dotnet    
-System.Globalization.Calendars                                                 4.3.0                   dotnet  
+System.Core                                        6.0.3524.45918                                                                           dotnet    
-System.Globalization.Extensions                                                4.3.0                   dotnet  
+System.Data                                        6.0.3524.45918                                                                           dotnet    
-System.IO                                                                      4.3.0                   dotnet  
+System.Data.Common                                 6.0.3524.45918                                                                           dotnet    
-System.IO.Compression                                                          4.3.0                   dotnet  
+System.Data.DataSetExtensions                      6.0.3524.45918                                                                           dotnet    
-System.IO.Compression.ZipFile                                                  4.3.0                   dotnet  
+System.Diagnostics.Contracts                       6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem                                                           4.3.0                   dotnet  
+System.Diagnostics.Debug                           6.0.3524.45918                                                                           dotnet    
-System.IO.FileSystem.Primitives                                                4.3.0                   dotnet  
+System.Diagnostics.DiagnosticSource                6.0.3524.45918                                                                           dotnet    
-System.Linq                                                                    4.3.0                   dotnet  
+System.Diagnostics.FileVersionInfo                 6.0.3524.45918                                                                           dotnet    
-System.Linq.Expressions                                                        4.3.0                   dotnet  
+System.Diagnostics.Process                         6.0.3524.45918                                                                           dotnet    
-System.Net.Http                                                                4.3.0                   dotnet  
+System.Diagnostics.StackTrace                      6.0.3524.45918                                                                           dotnet    
-System.Net.NameResolution                                                      4.3.0                   dotnet  
+System.Diagnostics.TextWriterTraceListener         6.0.3524.45918                                                                           dotnet    
-System.Net.Primitives                                                          4.3.0                   dotnet  
+System.Diagnostics.Tools                           6.0.3524.45918                                                                           dotnet    
-System.Net.Sockets                                                             4.3.0                   dotnet  
+System.Diagnostics.TraceSource                     6.0.3524.45918                                                                           dotnet    
-System.ObjectModel                                                             4.3.0                   dotnet  
+System.Diagnostics.Tracing                         6.0.3524.45918                                                                           dotnet    
-System.Private.Uri                                                             4.3.0                   dotnet  
+System.Drawing                                     6.0.3524.45918                                                                           dotnet    
-System.Reflection                                                              4.3.0                   dotnet  
+System.Drawing.Primitives                          6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit                                                         4.3.0                   dotnet  
+System.Dynamic.Runtime                             6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit.ILGeneration                                            4.3.0                   dotnet  
+System.Formats.Asn1                                6.0.3524.45918                                                                           dotnet    
-System.Reflection.Emit.Lightweight                                             4.3.0                   dotnet  
+System.Globalization                               6.0.3524.45918                                                                           dotnet    
-System.Reflection.Extensions                                                   4.3.0                   dotnet  
+System.Globalization.Calendars                     6.0.3524.45918                                                                           dotnet    
-System.Reflection.Primitives                                                   4.3.0                   dotnet  
+System.Globalization.Extensions                    6.0.3524.45918                                                                           dotnet    
-System.Reflection.TypeExtensions                                               4.4.0                   dotnet  
+System.IO                                          6.0.3524.45918                                                                           dotnet    
-System.Resources.ResourceManager                                               4.3.0                   dotnet  
+System.IO.Compression                              6.0.3524.45918                                                                           dotnet    
-System.Runtime                                                                 4.3.0                   dotnet  
+System.IO.Compression.Brotli                       6.0.3524.45918                                                                           dotnet    
-System.Runtime.Extensions                                                      4.3.0                   dotnet  
+System.IO.Compression.FileSystem                   6.0.3524.45918                                                                           dotnet    
-System.Runtime.Handles                                                         4.3.0                   dotnet  
+System.IO.Compression.ZipFile                      6.0.3524.45918                                                                           dotnet    
-System.Runtime.InteropServices                                                 4.3.0                   dotnet  
+System.IO.FileSystem                               6.0.3524.45918                                                                           dotnet    
-System.Runtime.InteropServices.RuntimeInformation                              4.3.0                   dotnet  
+System.IO.FileSystem.AccessControl                 6.0.3524.45918                                                                           dotnet    
-System.Runtime.Numerics                                                        4.3.0                   dotnet  
+System.IO.FileSystem.DriveInfo                     6.0.3524.45918                                                                           dotnet    
-System.Runtime.Serialization.Primitives                                        4.3.0                   dotnet  
+System.IO.FileSystem.Primitives                    6.0.3524.45918                                                                           dotnet    
-System.Security.Claims                                                         4.3.0                   dotnet  
+System.IO.FileSystem.Watcher                       6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Algorithms                                        4.3.0                   dotnet  
+System.IO.IsolatedStorage                          6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Cng                                               4.3.0                   dotnet  
+System.IO.MemoryMappedFiles                        6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Csp                                               4.3.0                   dotnet  
+System.IO.Pipes                                    6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Encoding                                          4.3.0                   dotnet  
+System.IO.Pipes.AccessControl                      6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.OpenSsl                                           4.3.0                   dotnet  
+System.IO.UnmanagedMemoryStream                    6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.Primitives                                        4.3.0                   dotnet  
+System.Linq                                        6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.ProtectedData                                     5.0.0                   dotnet  
+System.Linq.Expressions                            6.0.3524.45918                                                                           dotnet    
-System.Security.Cryptography.X509Certificates                                  4.3.0                   dotnet  
+System.Linq.Parallel                               6.0.3524.45918                                                                           dotnet    
-System.Security.Principal                                                      4.3.0                   dotnet  
+System.Linq.Queryable                              6.0.3524.45918                                                                           dotnet    
-System.Security.Principal.Windows                                              4.3.0                   dotnet  
+System.Memory                                      6.0.3524.45918                                                                           dotnet    
-System.Text.Encoding                                                           4.3.0                   dotnet  
+System.Net                                         6.0.3524.45918                                                                           dotnet    
-System.Text.Encoding.Extensions                                                4.3.0                   dotnet  
+System.Net.Http                                    6.0.3524.45918                                                                           dotnet    
-System.Text.RegularExpressions                                                 4.3.0                   dotnet  
+System.Net.Http.Json                               6.0.3524.45918                                                                           dotnet    
-System.Threading                                                               4.3.0                   dotnet  
+System.Net.HttpListener                            6.0.3524.45918                                                                           dotnet    
-System.Threading.Tasks                                                         4.3.0                   dotnet  
+System.Net.IPNetwork                               2.5.235                                                                                  dotnet    
-System.Threading.Tasks.Extensions                                              4.3.0                   dotnet  
+System.Net.Mail                                    6.0.3524.45918                                                                           dotnet    
-System.Threading.ThreadPool                                                    4.3.0                   dotnet  
+System.Net.NameResolution                          6.0.3524.45918                                                                           dotnet    
-System.Threading.Timer                                                         4.3.0                   dotnet  
+System.Net.NetworkInformation                      6.0.3524.45918                                                                           dotnet    
-System.Xml.ReaderWriter                                                        4.3.0                   dotnet  
+System.Net.Ping                                    6.0.3524.45918                                                                           dotnet    
-System.Xml.XDocument                                                           4.3.0                   dotnet  
+System.Net.Primitives                              6.0.3524.45918                                                                           dotnet    
-System.Xml.XmlDocument                                                         4.3.0                   dotnet  
+System.Net.Quic                                    6.0.3524.45918                                                                           dotnet    
-alpine-baselayout                                                              3.4.0-r0                apk     
+System.Net.Requests                                6.0.3524.45918                                                                           dotnet    
-alpine-baselayout-data                                                         3.4.0-r0                apk     
+System.Net.Security                                6.0.3524.45918                                                                           dotnet    
-alpine-keys                                                                    2.4-r1                  apk     
+System.Net.ServicePoint                            6.0.3524.45918                                                                           dotnet    
-apk-tools                                                                      2.14.0_rc1-r0           apk     
+System.Net.Sockets                                 6.0.3524.45918                                                                           dotnet    
-bash                                                                           5.2.15-r3               apk     
+System.Net.WebClient                               6.0.3524.45918                                                                           dotnet    
-brotli-libs                                                                    1.0.9-r12               apk     
+System.Net.WebHeaderCollection                     6.0.3524.45918                                                                           dotnet    
-busybox                                                                        1.36.0                  binary  
+System.Net.WebProxy                                6.0.3524.45918                                                                           dotnet    
-busybox                                                                        1.36.0-r7               apk     
+System.Net.WebSockets                              6.0.3524.45918                                                                           dotnet    
-busybox-binsh                                                                  1.36.0-r7               apk     
+System.Net.WebSockets.Client                       6.0.3524.45918                                                                           dotnet    
-ca-certificates                                                                20230106-r1             apk     
+System.Numerics                                    6.0.3524.45918                                                                           dotnet    
-ca-certificates-bundle                                                         20230106-r1             apk     
+System.Numerics.Vectors                            6.0.3524.45918                                                                           dotnet    
-coreutils                                                                      9.2-r3                  apk     
+System.ObjectModel                                 6.0.3524.45918                                                                           dotnet    
-curl                                                                           8.0.1-r2                apk     
+System.Private.CoreLib                             6.0.3524.45918                                                                           dotnet    
-dbus-libs                                                                      1.14.6-r2               apk     
+System.Private.DataContractSerialization           6.0.3524.45918                                                                           dotnet    
-double-conversion                                                              3.2.1-r1                apk     
+System.Private.Uri                                 6.0.3524.45918                                                                           dotnet    
-gdbm                                                                           1.23-r1                 apk     
+System.Private.Xml                                 6.0.3524.45918                                                                           dotnet    
-glib                                                                           2.76.1-r1               apk     
+System.Private.Xml.Linq                            6.0.3524.45918                                                                           dotnet    
-icu-data-en                                                                    72.1-r3                 apk     
+System.Reflection                                  6.0.3524.45918                                                                           dotnet    
-icu-libs                                                                       72.1-r3                 apk     
+System.Reflection.DispatchProxy                    6.0.3524.45918                                                                           dotnet    
-jq                                                                             1.6-r3                  apk     
+System.Reflection.Emit                             6.0.3524.45918                                                                           dotnet    
-libacl                                                                         2.3.1-r3                apk     
+System.Reflection.Emit.ILGeneration                6.0.3524.45918                                                                           dotnet    
-libattr                                                                        2.5.1-r4                apk     
+System.Reflection.Emit.Lightweight                 6.0.3524.45918                                                                           dotnet    
-libb2                                                                          0.98.1-r2               apk     
+System.Reflection.Extensions                       6.0.3524.45918                                                                           dotnet    
-libblkid                                                                       2.38.1-r7               apk     
+System.Reflection.Metadata                         6.0.3524.45918                                                                           dotnet    
-libbsd                                                                         0.11.7-r1               apk     
+System.Reflection.Primitives                       6.0.3524.45918                                                                           dotnet    
-libbz2                                                                         1.0.8-r5                apk     
+System.Reflection.TypeExtensions                   6.0.3524.45918                                                                           dotnet    
-libc-utils                                                                     0.7.2-r4                apk     
+System.Resources.Reader                            6.0.3524.45918                                                                           dotnet    
-libcrypto1.1                                                                   1.1.1t-r2               apk     
+System.Resources.ResourceManager                   6.0.3524.45918                                                                           dotnet    
-libcrypto3                                                                     3.1.0-r3                apk     
+System.Resources.Writer                            6.0.3524.45918                                                                           dotnet    
-libcurl                                                                        8.0.1-r2                apk     
+System.Runtime                                     6.0.3524.45918                                                                           dotnet    
-libexpat                                                                       2.5.0-r1                apk     
+System.Runtime.CompilerServices.VisualC            6.0.3524.45918                                                                           dotnet    
-libffi                                                                         3.4.4-r2                apk     
+System.Runtime.Extensions                          6.0.3524.45918                                                                           dotnet    
-libgcc                                                                         12.2.1_git20220924-r10  apk     
+System.Runtime.Handles                             6.0.3524.45918                                                                           dotnet    
-libgomp                                                                        12.2.1_git20220924-r10  apk     
+System.Runtime.InteropServices                     6.0.3524.45918                                                                           dotnet    
-libidn2                                                                        2.3.4-r1                apk     
+System.Runtime.InteropServices.RuntimeInformation  6.0.3524.45918                                                                           dotnet    
-libintl                                                                        0.21.1-r3               apk     
+System.Runtime.Intrinsics                          6.0.3524.45918                                                                           dotnet    
-libmd                                                                          1.0.4-r2                apk     
+System.Runtime.Loader                              6.0.3524.45918                                                                           dotnet    
-libmount                                                                       2.38.1-r7               apk     
+System.Runtime.Numerics                            6.0.3524.45918                                                                           dotnet    
-libncursesw                                                                    6.4_p20230401-r4        apk     
+System.Runtime.Serialization                       6.0.3524.45918                                                                           dotnet    
-libpanelw                                                                      6.4_p20230401-r4        apk     
+System.Runtime.Serialization.Formatters            6.0.3524.45918                                                                           dotnet    
-libpcre2-16                                                                    10.42-r1                apk     
+System.Runtime.Serialization.Json                  6.0.3524.45918                                                                           dotnet    
-libproc2                                                                       4.0.3-r1                apk     
+System.Runtime.Serialization.Primitives            6.0.3524.45918                                                                           dotnet    
-libssl1.1                                                                      1.1.1t-r2               apk     
+System.Runtime.Serialization.Xml                   6.0.3524.45918                                                                           dotnet    
-libssl3                                                                        3.1.0-r3                apk     
+System.Security                                    6.0.3524.45918                                                                           dotnet    
-libstdc++                                                                      12.2.1_git20220924-r10  apk     
+System.Security.AccessControl                      6.0.3524.45918                                                                           dotnet    
-libtorrent-rasterbar                                                           2.0.8-r3                apk     
+System.Security.Claims                             6.0.3524.45918                                                                           dotnet    
-libunistring                                                                   1.1-r1                  apk     
+System.Security.Cryptography.Algorithms            6.0.3524.45918                                                                           dotnet    
-linux-pam                                                                      1.5.2-r10               apk     
+System.Security.Cryptography.Cng                   6.0.3524.45918                                                                           dotnet    
-mpdecimal                                                                      2.5.1-r2                apk     
+System.Security.Cryptography.Csp                   6.0.3524.45918                                                                           dotnet    
-musl                                                                           1.2.3_git20230411-r0    apk     
+System.Security.Cryptography.Encoding              6.0.3524.45918                                                                           dotnet    
-musl-utils                                                                     1.2.3_git20230322-r3    apk     
+System.Security.Cryptography.OpenSsl               6.0.3524.45918                                                                           dotnet    
-ncurses-terminfo-base                                                          6.4_p20230401-r4        apk     
+System.Security.Cryptography.Primitives            6.0.3524.45918                                                                           dotnet    
-netcat-openbsd                                                                 1.219-r1                apk     
+System.Security.Cryptography.ProtectedData         5.0.20.51904                                                                             dotnet    
-nghttp2-libs                                                                   1.52.0-r1               apk     
+System.Security.Cryptography.X509Certificates      6.0.3524.45918                                                                           dotnet    
-oniguruma                                                                      6.9.8-r1                apk     
+System.Security.Principal                          6.0.3524.45918                                                                           dotnet    
-openssl                                                                        3.1.0-r3                apk     
+System.Security.Principal.Windows                  6.0.3524.45918                                                                           dotnet    
-openssl1.1-compat                                                              1.1.1t-r2               apk     
+System.Security.SecureString                       6.0.3524.45918                                                                           dotnet    
-p7zip                                                                          17.05-r3                apk     
+System.ServiceModel.Web                            6.0.3524.45918                                                                           dotnet    
-pcre2                                                                          10.42-r1                apk     
+System.ServiceProcess                              6.0.3524.45918                                                                           dotnet    
-procps-ng                                                                      4.0.3-r1                apk     
+System.Text.Encoding                               6.0.3524.45918                                                                           dotnet    
-python                                                                         3.11.3                  binary  
+System.Text.Encoding.CodePages                     6.0.3524.45918                                                                           dotnet    
-python3                                                                        3.11.3-r4               apk     
+System.Text.Encoding.Extensions                    6.0.3524.45918                                                                           dotnet    
-python3-pycache-pyc0                                                           3.11.3-r4               apk     
+System.Text.Encodings.Web                          6.0.3524.45918                                                                           dotnet    
-qbittorrent-nox                                                                4.5.2-r2                apk     
+System.Text.Json                                   6.0.3524.45918                                                                           dotnet    
-qt6-qtbase                                                                     6.5.0-r3                apk     
+System.Text.RegularExpressions                     6.0.3524.45918                                                                           dotnet    
-qt6-qtbase-sqlite                                                              6.5.0-r3                apk     
+System.Threading                                   6.0.3524.45918                                                                           dotnet    
-readline                                                                       8.2.1-r1                apk     
+System.Threading.Channels                          6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Collections                                                 4.3.0                   dotnet  
+System.Threading.Overlapped                        6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Diagnostics.Tools                                           4.3.0                   dotnet  
+System.Threading.Tasks                             6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Diagnostics.Tracing                                         4.3.0                   dotnet  
+System.Threading.Tasks.Dataflow                    6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Globalization                                               4.3.0                   dotnet  
+System.Threading.Tasks.Extensions                  6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Globalization.Calendars                                     4.3.0                   dotnet  
+System.Threading.Tasks.Parallel                    6.0.3524.45918                                                                           dotnet    
-runtime.any.System.IO                                                          4.3.0                   dotnet  
+System.Threading.Thread                            6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Reflection                                                  4.3.0                   dotnet  
+System.Threading.ThreadPool                        6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Reflection.Extensions                                       4.3.0                   dotnet  
+System.Threading.Timer                             6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Reflection.Primitives                                       4.3.0                   dotnet  
+System.Transactions                                6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Resources.ResourceManager                                   4.3.0                   dotnet  
+System.Transactions.Local                          6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Runtime                                                     4.3.0                   dotnet  
+System.ValueTuple                                  6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Runtime.Handles                                             4.3.0                   dotnet  
+System.Web                                         6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Runtime.InteropServices                                     4.3.0                   dotnet  
+System.Web.HttpUtility                             6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Text.Encoding                                               4.3.0                   dotnet  
+System.Windows                                     6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Text.Encoding.Extensions                                    4.3.0                   dotnet  
+System.Xml                                         6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Threading.Tasks                                             4.3.0                   dotnet  
+System.Xml.Linq                                    6.0.3524.45918                                                                           dotnet    
-runtime.any.System.Threading.Timer                                             4.3.0                   dotnet  
+System.Xml.ReaderWriter                            6.0.3524.45918                                                                           dotnet    
-runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl       4.3.0                   dotnet  
+System.Xml.Serialization                           6.0.3524.45918                                                                           dotnet    
-runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+System.Xml.XDocument                               6.0.3524.45918                                                                           dotnet    
-runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+System.Xml.XPath                                   6.0.3524.45918                                                                           dotnet    
-runtime.native.System                                                          4.3.0                   dotnet  
+System.Xml.XPath.XDocument                         6.0.3524.45918                                                                           dotnet    
-runtime.native.System.IO.Compression                                           4.3.0                   dotnet  
+System.Xml.XmlDocument                             6.0.3524.45918                                                                           dotnet    
-runtime.native.System.Net.Http                                                 4.3.0                   dotnet  
+System.Xml.XmlSerializer                           6.0.3524.45918                                                                           dotnet    
-runtime.native.System.Security.Cryptography.Apple                              4.3.0                   dotnet  
+WindowsBase                                        6.0.3524.45918                                                                           dotnet    
-runtime.native.System.Security.Cryptography.OpenSsl                            4.3.0                   dotnet  
+acl-libs                                           2.3.2-r1                                                                                 apk       
-runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                   dotnet  
+alpine-baselayout                                  3.6.8-r0                                                                                 apk       
-runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                   dotnet  
+alpine-baselayout-data                             3.6.8-r0                                                                                 apk       
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple        4.3.0                   dotnet  
+alpine-keys                                        2.5-r0                                                                                   apk       
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+apk-tools                                          2.14.4-r3                                                                                apk       
-runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl         4.3.0                   dotnet  
+bash                                               5.2.37-r0                                                                                apk       
-runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+brotli-libs                                        1.1.0-r2                                                                                 apk       
-runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+busybox                                            1.36.1-r32                                                                               apk       
-runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+busybox-binsh                                      1.36.1-r32                                                                               apk       
-runtime.unix.Microsoft.Win32.Primitives                                        4.3.0                   dotnet  
+c-ares                                             1.34.1-r0                                                                                apk       
-runtime.unix.System.Console                                                    4.3.0                   dotnet  
+ca-certificates                                    20240705-r0                                                                              apk       
-runtime.unix.System.Diagnostics.Debug                                          4.3.0                   dotnet  
+ca-certificates-bundle                             20240705-r0                                                                              apk       
-runtime.unix.System.IO.FileSystem                                              4.3.0                   dotnet  
+catatonit                                          0.2.0-r0                                                                                 apk       
-runtime.unix.System.Net.Primitives                                             4.3.0                   dotnet  
+coreutils                                          9.5-r1                                                                                   apk       
-runtime.unix.System.Net.Sockets                                                4.3.0                   dotnet  
+coreutils-env                                      9.5-r1                                                                                   apk       
-runtime.unix.System.Private.Uri                                                4.3.0                   dotnet  
+coreutils-fmt                                      9.5-r1                                                                                   apk       
-runtime.unix.System.Runtime.Extensions                                         4.3.0                   dotnet  
+coreutils-sha512sum                                9.5-r1                                                                                   apk       
-scanelf                                                                        1.3.7-r1                apk     
+curl                                               8.9.1-r2                                                                                 apk       
-shadow                                                                         4.13-r2                 apk     
+dbus-libs                                          1.14.10-r4                                                                               apk       
-skalibs                                                                        2.13.1.1-r1             apk     
+double-conversion                                  3.3.0-r0                                                                                 apk       
-sqlite-libs                                                                    3.41.2-r2               apk     
+duktape                                            2.7.0-r1                                                                                 apk       
-ssl_client                                                                     1.36.0-r7               apk     
+findutils                                          4.10.0-r0                                                                                apk       
-tzdata                                                                         2023c-r1                apk     
+gdbm                                               1.24-r0                                                                                  apk       
-utmps-libs                                                                     0.1.2.1-r1              apk     
+glib                                               2.82.1-r1                                                                                apk       
-xz-libs                                                                        5.4.2-r1                apk     
+grep                                               3.11-r0                                                                                  apk       
-zlib                                                                           1.2.13-r1               apk     
+icu-data-en                                        74.2-r0                                                                                  apk       
+icu-libs                                           74.2-r0                                                                                  apk       
+jq                                                 1.7.1-r0                                                                                 apk       
+libattr                                            2.5.2-r2                                                                                 apk       
+libb2                                              0.98.1-r3                                                                                apk       
+libblkid                                           2.40.2-r3                                                                                apk       
+libbsd                                             0.12.2-r0                                                                                apk       
+libbz2                                             1.0.8-r6                                                                                 apk       
+libcrypto3                                         3.3.2-r2                                                                                 apk       
+libcurl                                            8.9.1-r2                                                                                 apk       
+libeconf                                           0.6.3-r0                                                                                 apk       
+libexpat                                           2.6.3-r0                                                                                 apk       
+libffi                                             3.4.6-r0                                                                                 apk       
+libgcc                                             14.2.0-r3                                                                                apk       
+libgomp                                            14.2.0-r3                                                                                apk       
+libidn2                                            2.3.7-r0                                                                                 apk       
+libintl                                            0.22.5-r0                                                                                apk       
+libmd                                              1.1.0-r0                                                                                 apk       
+libmount                                           2.40.2-r3                                                                                apk       
+libncursesw                                        6.5_p20240601-r1                                                                         apk       
+libpanelw                                          6.5_p20240601-r1                                                                         apk       
+libpcre2-16                                        10.43-r0                                                                                 apk       
+libproc2                                           4.0.4-r2                                                                                 apk       
+libproxy                                           0.5.9-r0                                                                                 apk       
+libpsl                                             0.21.5-r3                                                                                apk       
+libssl3                                            3.3.2-r2                                                                                 apk       
+libstdc++                                          14.2.0-r3                                                                                apk       
+libtorrent-rasterbar                               2.0.10-r2                                                                                apk       
+libunistring                                       1.2-r0                                                                                   apk       
+linux-pam                                          1.6.1-r1                                                                                 apk       
+mpdecimal                                          4.0.0-r0                                                                                 apk       
+mscorlib                                           6.0.3524.45918                                                                           dotnet    
+musl                                               1.2.5-r5                                                                                 apk       
+musl-utils                                         1.2.5-r3                                                                                 apk       
+ncurses-terminfo-base                              6.5_p20240601-r1                                                                         apk       
+netcat-openbsd                                     1.226-r0                                                                                 apk       
+netstandard                                        6.0.3524.45918                                                                           dotnet    
+nghttp2-libs                                       1.63.0-r0                                                                                apk       
+oniguruma                                          6.9.9-r0                                                                                 apk       
+pcre2                                              10.43-r0                                                                                 apk       
+procps-ng                                          4.0.4-r2                                                                                 apk       
+pyc                                                3.12.7-r0                                                                                apk       
+python3                                            3.12.7-r0                                                                                apk       
+python3-pyc                                        3.12.7-r0                                                                                apk       
+python3-pycache-pyc0                               3.12.7-r0                                                                                apk       
+qbittorrent-nox                                    5.0.0-r2                                                                                 apk       
+qbt                                                1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2                                     dotnet    
+qt6-qtbase                                         6.7.2-r2                                                                                 apk       
+qt6-qtbase-sqlite                                  6.7.2-r2                                                                                 apk       
+readline                                           8.2.13-r0                                                                                apk       
+scanelf                                            1.3.8-r0                                                                                 apk       
+shadow                                             4.16.0-r0                                                                                apk       
+skalibs                                            2.14.2.0-r2                                                                              apk       
+sqlite-libs                                        3.46.1-r0                                                                                apk       
+ssl_client                                         1.36.1-r32                                                                               apk       
+tzdata                                             2024b-r1                                                                                 apk       
+utmps-libs                                         0.1.2.2-r3                                                                               apk       
+xz-libs                                            5.6.3-r0                                                                                 apk       
+zlib                                               1.3.1-r2                                                                                 apk       
+zstd-libs                                          1.5.6-r1                                                                                 apk       

readme-vars.yml

@@ -11,21 +11,19 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable qbittorrent releases" }
-  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }  
+  - { tag: "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" }
@@ -33,42 +31,47 @@ param_ports:
   - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
+  - { env_var: "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 webui, 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." }
 
-# optional parameters
+readonly_supported: true
-optional_block_1: false
-optional_block_1_items: ""
 
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+  The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
-  
+
-  Change username/password via the webui in the webui section of settings.  
+  You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
+
+  If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
 
   ### WEBUI_PORT variable
-  
-  Due to issues with CSRF and port mapping, should you require to alter the port for the webui 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  
-  
-  This should alleviate the "white screen" issue.  
-  
-  If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
-  
-  edit or add the following lines  
 
-  ```text
+  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.
-  WebUI\Address=*
+
-  
+  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
-  WebUI\ServerDomains=*
+
-  ```
+  ### TORRENTING_PORT
-  
+
-  If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
+  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.
 
 # changelog
 changelogs:
+  - { date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3." }
+  - { date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL." }
+  - { date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
+  - { date: "14.02.24:", desc: "Add torrenting port support." }
+  - { date: "31.01.24:", desc: "Remove obsolete compat packages."}
+  - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
+  - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
+  - { date: "10.06.23:", desc: "Bump unrar to 6.2.8." }
   - { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
   - { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
   - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }

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

@@ -10,10 +10,8 @@ if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
 fi
 
 # chown download directory if currently not set to abc
-if [[ -d /downloads ]]; then
+if grep -qe ' /downloads ' /proc/mounts; then
-    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+    lsiown abc:abc /downloads
-        lsiown -R abc:abc /downloads
-    fi
 fi
 
 # permissions

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

@@ -2,7 +2,15 @@
 # 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
 
 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}

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