Bot Updating Package Versions

Restore qbittorrent-cli (master)

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/libtorrentv1/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/master/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-qbittorrent)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/libtorrentv1/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/master/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/external_trigger.yml

@@ -4,26 +4,32 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-libtorrentv1:
+  external-trigger-master:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/libtorrentv1'
+        if: github.ref == 'refs/heads/master'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1 }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1 is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+          printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
+          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 libtorrentv1 branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1\". ****"
-          echo "External trigger running off of libtorrentv1 branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1\`" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)')
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of master branch. To disable this trigger, add \`qbittorrent_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          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 ****"
-            FAILURE_REASON="Can't retrieve external version for qbittorrent branch libtorrentv1"
+            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,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -31,11 +37,10 @@ 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 "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/qbittorrent"
-          tag="libtorrentv1"
+          tag="latest"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
             | jq -r '.token')
@@ -60,45 +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 ****"
-            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag libtorrentv1"
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+            echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all arch repos are updated yet. Will try again later."
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            exit 0
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            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 ****"
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            echo "**** Sleeping 10 seconds until job starts ****"
-            sleep 10
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
-            curl -iX POST \
-              "${buildurl}submitDescription" \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              --data-urlencode "description=GHA 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 libtorrentv1. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ "${artifacts_found}" == "false" ]]; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
+              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            else
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              if "${artifacts_found}" == "true" ]]; then
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
+              fi
+              response=$(curl -iX POST \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $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 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

@@ -15,31 +15,31 @@ jobs:
 
       - name: External Trigger Scheduler
         run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# External trigger scheduler for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
             ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
             ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
             ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
             if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                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 ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/greetings.yml

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

.github/workflows/package_trigger.yml

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

.github/workflows/package_trigger_scheduler.yml

@@ -14,37 +14,69 @@ jobs:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# Package trigger scheduler for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml | yq -r '.ls_branch')
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
-                sleep 30
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
+            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif grep -q "^qbittorrent_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`qbittorrent_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/lastBuild/api/json | jq -r '.building') == "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 "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                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} ****"
-          echo "**** Notifying Discord ****"
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for qbittorrent** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+            if [[ -n "${triggered_branches}" ]]; then
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+            fi
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) 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,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:latest as unrar
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
 # set version label
 ARG BUILD_DATE
@@ -19,39 +19,33 @@ 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 \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
-  echo "**** install qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
-    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
+    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 && \
-  curl -o \
-    /app/qbittorrent-nox -L \
-    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/x86_64-qbittorrent-nox" && \
-  chmod +x /app/qbittorrent-nox && \
+  apk add -U --upgrade --no-cache \
+    qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
   if [ -z ${QBT_CLI_VERSION+x} ]; then \
     QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
-      | jq -r '. | .tag_name'); \
+    | jq -r '. | .tag_name'); \
   fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-${QBT_CLI_VERSION#v}.tar.gz" && \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Dockerfile.aarch64

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
 # set version label
 ARG BUILD_DATE
@@ -19,39 +19,33 @@ 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 \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
-  echo "**** install qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
-    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
+    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 && \
-  curl -o \
-    /app/qbittorrent-nox -L \
-    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/aarch64-qbittorrent-nox" && \
-  chmod +x /app/qbittorrent-nox && \
+  apk add -U --upgrade --no-cache \
+    qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
   if [ -z ${QBT_CLI_VERSION+x} ]; then \
     QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
-      | jq -r '. | .tag_name'); \
+    | jq -r '. | .tag_name'); \
   fi && \
   curl -o \
     /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-${QBT_CLI_VERSION#v}.tar.gz" && \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Jenkinsfile

@@ -17,6 +17,8 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
+    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
+    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     CONTAINER_NAME = 'qbittorrent'
     BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
     LS_USER = 'linuxserver'
@@ -25,21 +27,37 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.18'
+    DIST_TAG = 'edge'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
+    DIST_REPO_PACKAGES = 'qbittorrent-nox'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
     CI_PORT='8080'
     CI_SSL='false'
-    CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DELAY='60'
+    CI_DOCKERENV=''
+    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
@@ -49,7 +67,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:libtorrentv1 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' ''',
@@ -66,7 +84,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
         }
         sh '''#! /bin/bash
               echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -78,7 +96,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 libtorrentv1-${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -111,14 +129,15 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is a custom command to determine version use that command
-    stage("Set tag custom bash"){
+    // If this is an alpine repo change for external version determine an md5 from the version string
+    stage("Set tag Alpine Repo"){
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)' ''',
+            script: '''curl -sL "${DIST_REPO}x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+                       && awk '/^P:'"${DIST_REPO_PACKAGES}"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' ''',
             returnStdout: true).trim()
-            env.RELEASE_LINK = 'custom_command'
+            env.RELEASE_LINK = 'alpine_repo'
         }
       }
     }
@@ -156,10 +175,10 @@ pipeline {
         }
       }
     }
-    // If this is a libtorrentv1 build use live docker endpoints
+    // If this is a master build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -169,20 +188,20 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-libtorrentv1-' + 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 = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "libtorrentv1"}
+        not {branch "master"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -192,13 +211,13 @@ 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-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            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 = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
         }
       }
@@ -215,13 +234,13 @@ 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-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            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 = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.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/'
         }
@@ -246,7 +265,7 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.19 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 python3 && \
                     python3 -m venv /lsiopy && \
                     pip install --no-cache-dir -U pip && \
@@ -258,7 +277,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -270,24 +289,24 @@ pipeline {
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
               # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/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 libtorrentv1 --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
-              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest 
+              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}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f libtorrentv1
+                git checkout -f master
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                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 and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -296,7 +315,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               echo "Starting Stage 2 - Delete old templates"
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -306,13 +325,13 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f libtorrentv1
+                git checkout -f master
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                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/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -328,7 +347,7 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f libtorrentv1
+                git checkout -f master
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -341,8 +360,8 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                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}
@@ -353,7 +372,7 @@ pipeline {
               fi
               echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
               mkdir -p ${TEMPDIR}/docs
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
               if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                 cd ${TEMPDIR}/docs/docker-documentation
@@ -371,8 +390,8 @@ pipeline {
                 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 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-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
@@ -382,7 +401,9 @@ pipeline {
                 echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -441,7 +462,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -454,10 +475,10 @@ pipeline {
         }
       }
     }
-    // If this is a libtorrentv1 build check the S6 service file perms
+    // If this is a master build check the S6 service file perms
     stage("Check S6 Service file Permissions"){
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -475,10 +496,10 @@ pipeline {
       }
     }
     /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
        ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
-    stage("GitLab Mirror"){
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
+    stage("GitLab Mirror and Quay.io Visibility"){
       when {
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -494,6 +515,8 @@ pipeline {
             "visibility":"public"}' '''
         sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
           -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
+        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
+          -d '{"visibility":"public"}' ||: '''
       } 
     }
     /* ###############
@@ -524,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} ."
       }
     }
@@ -555,6 +579,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}: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} ."
           }
         }
@@ -583,9 +608,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 -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 '''#! /bin/bash
@@ -601,7 +627,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -609,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}
@@ -624,14 +650,14 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f libtorrentv1
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                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
@@ -649,7 +675,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -663,7 +689,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -697,18 +723,27 @@ pipeline {
           }
           sh '''#! /bin/bash
                 set -e
+                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
+                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
+                  if [ -n "${CI_DOCKERENV}" ]; then
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
+                  else
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
+                  fi
+                fi
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
+                -e RELEASE_TAG=\"latest\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -718,6 +753,7 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -741,7 +777,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -750,16 +786,16 @@ pipeline {
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                     docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:libtorrentv1
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
                     fi
-                    docker push ${PUSHIMAGE}:libtorrentv1
+                    docker push ${PUSHIMAGE}:latest
                     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
                '''
@@ -782,7 +818,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -790,15 +826,15 @@ pipeline {
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
                   for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-libtorrentv1
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-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}
@@ -806,43 +842,21 @@ pipeline {
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-libtorrentv1
+                    docker push ${MANIFESTIMAGE}:amd64-latest
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                    docker push ${MANIFESTIMAGE}:arm64v8-latest
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:libtorrentv1 || :
-                    docker manifest create ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:amd64-libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1
-                    docker manifest annotate ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1 --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                  done
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-libtorrentv1")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-libtorrentv1 || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-libtorrentv1 ${MANIFESTIMAGE}:amd64-libtorrentv1
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-libtorrentv1
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:libtorrentv1
-                    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} 
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                   done
                '''
@@ -853,7 +867,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -865,17 +879,17 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${META_TAG}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to libtorrentv1",\
+             "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 to ${EXT_RELEASE_CLEAN}" > releasebody.json
+              echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "libtorrentv1",\
+                     "target_commitish": "master",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": true}' >> releasebody.json
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": false}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
@@ -883,14 +897,14 @@ pipeline {
     // Add protection to the release branch
     stage('Github-Release-Branch-Protection') {
       when {
-        branch "libtorrentv1"
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Setting up protection for release branch libtorrentv1"
+        echo "Setting up protection for release branch master"
         sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/libtorrentv1/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
           -d $(jq -c .  << EOF
             {
               "required_status_checks": null,
@@ -999,18 +1013,53 @@ EOF
      ###################### */
   post {
     always {
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
       script{
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
         if (env.EXIT_STATUS == "ABORTED"){
           sh 'echo "build aborted"'
-        }
-        else if (currentBuild.currentResult == "SUCCESS"){
-          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,\
-                 "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"}],\
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
-        }
-        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
-                 "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"}],\
+        }else{
+          if (currentBuild.currentResult == "SUCCESS"){
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }else{
+            if (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} '''
         }
       }
@@ -1028,3 +1077,20 @@ EOF
     }
   }
 }
+
+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,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.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!")
@@ -28,7 +28,7 @@ Find us at:
 
 # [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fqbittorrent)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
@@ -36,7 +36,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/qbittorrent)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Flibtorrentv1%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fqbittorrent%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/latest/index.html)
 
 The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
@@ -47,7 +47,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/qbittorrent:libtorrentv1` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+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.
 
 The architectures supported by this image are:
 
@@ -86,6 +86,10 @@ A bittorrent client can be an active or a passive node. Running your client as a
 
 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
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -96,7 +100,7 @@ To help you get started creating a container from this image you can either use
 ---
 services:
   qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:libtorrentv1
+    image: lscr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent
     environment:
       - PUID=1000
@@ -105,8 +109,8 @@ services:
       - WEBUI_PORT=8080
       - TORRENTING_PORT=6881
     volumes:
-      - /path/to/qbittorrent/config:/config
-      - /path/to/downloads:/downloads
+      - /path/to/qbittorrent/appdata:/config
+      - /path/to/downloads:/downloads #optional
     ports:
       - 8080:8080
       - 6881:6881
@@ -127,10 +131,10 @@ docker run -d \
   -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/qbittorrent/config:/config \
-  -v /path/to/downloads:/downloads \
+  -v /path/to/qbittorrent/appdata:/config \
+  -v /path/to/downloads:/downloads `#optional` \
   --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent:libtorrentv1
+  lscr.io/linuxserver/qbittorrent:latest
 ```
 
 ## Parameters
@@ -149,6 +153,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-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)
 
@@ -214,7 +219,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
 
     ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:libtorrentv1
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
     ```
 
 ## Updating Info
@@ -262,7 +267,7 @@ Below are the instructions for updating containers:
 * Update the image:
 
     ```bash
-    docker pull lscr.io/linuxserver/qbittorrent:libtorrentv1
+    docker pull lscr.io/linuxserver/qbittorrent:latest
     ```
 
 * Stop the running container:
@@ -286,7 +291,8 @@ Below are the instructions for updating containers:
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+>[!TIP]
+>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -298,7 +304,7 @@ cd docker-qbittorrent
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/qbittorrent:libtorrentv1 .
+  -t lscr.io/linuxserver/qbittorrent:latest .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -311,18 +317,19 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.07.24:** - Restore qbittorrent-cli as it now supports openssl 3.
+* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
 * **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:** - Rebase to Alpine 3.19.
+* **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:** - Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
+* **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.
-* **25.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
-* **15.01.23:** - Rebase to Alpine 3.17, add openssl1.1-compat.
-* **29.11.22:** - Add icu-libs to support qbittorrent-cli.
-* **30.10.22:** - Add libtorrent v1 branch.
+* **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.
 * **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
 * **12.08.22:** - Bump unrar to 6.1.7.
 * **16.06.22:** - Rebase to Alpine 3.16 from edge.

jenkins-vars.yml

@@ -2,12 +2,10 @@
 
 # jenkins variables
 project_name: docker-qbittorrent
-external_type: na
-custom_version_command: "curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'"
-release_type: prerelease
-release_tag: libtorrentv1
-ls_branch: libtorrentv1
-build_armhf: false
+external_type: alpine_repo
+release_type: stable
+release_tag: latest
+ls_branch: master
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -17,13 +15,15 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.18'
+  - DIST_TAG = 'edge'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
+  - DIST_REPO_PACKAGES = 'qbittorrent-nox'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'
   - CI_PORT='8080'
   - CI_SSL='false'
-  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DELAY='60'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

package_versions.txt

@@ -6,252 +6,256 @@ Bouncy Castle for .NET (netstandard2.0)            1.8.8.2
 CommandLineUtils                                   2.4.4+3c2a4909757a51602dcca9b961d577511b85fd31.3c2a4909757a51602dcca9b961d577511b85fd31  dotnet    
 CsvHelper                                          12.1.2                                                                                   dotnet    
 Json.NET                                           13.0.3.27908                                                                             dotnet    
-Microsoft.CSharp                                   4.700.22.56512                                                                           dotnet    
-Microsoft.VisualBasic                              4.700.22.56512                                                                           dotnet    
-Microsoft.VisualBasic.Core                         4.700.22.56512                                                                           dotnet    
-Microsoft.Win32.Primitives                         4.700.22.56512                                                                           dotnet    
-Microsoft.Win32.Registry                           4.700.22.56512                                                                           dotnet    
+Microsoft.CSharp                                   6.0.3524.45918                                                                           dotnet    
+Microsoft.VisualBasic                              6.0.3524.45918                                                                           dotnet    
+Microsoft.VisualBasic.Core                         11.100.3524.45918                                                                        dotnet    
+Microsoft.Win32.Primitives                         6.0.3524.45918                                                                           dotnet    
+Microsoft.Win32.Registry                           6.0.3524.45918                                                                           dotnet    
 Mono.Posix.NETStandard                             1.0.0.0                                                                                  dotnet    
 NJsonSchema                                        9.14.1.0                                                                                 dotnet    
 Portable.Xaml.dll                                  0.18.0.0                                                                                 dotnet    
-QBittorrent.Client                                 1.9.23349.1                                                                              dotnet    
-System                                             4.700.22.56512                                                                           dotnet    
-System.AppContext                                  4.700.22.56512                                                                           dotnet    
-System.Buffers                                     4.700.22.56512                                                                           dotnet    
-System.Collections                                 4.700.22.56512                                                                           dotnet    
-System.Collections.Concurrent                      4.700.22.56512                                                                           dotnet    
-System.Collections.Immutable                       4.700.22.56512                                                                           dotnet    
-System.Collections.NonGeneric                      4.700.22.56512                                                                           dotnet    
-System.Collections.Specialized                     4.700.22.56512                                                                           dotnet    
-System.ComponentModel                              4.700.22.56512                                                                           dotnet    
-System.ComponentModel.Annotations                  4.700.22.56512                                                                           dotnet    
-System.ComponentModel.DataAnnotations              4.700.22.56512                                                                           dotnet    
-System.ComponentModel.EventBasedAsync              4.700.22.56512                                                                           dotnet    
-System.ComponentModel.Primitives                   4.700.22.56512                                                                           dotnet    
-System.ComponentModel.TypeConverter                4.700.22.56512                                                                           dotnet    
-System.Configuration                               4.700.22.56512                                                                           dotnet    
-System.Console                                     4.700.22.56512                                                                           dotnet    
-System.Core                                        4.700.22.56512                                                                           dotnet    
-System.Data                                        4.700.22.56512                                                                           dotnet    
-System.Data.Common                                 4.700.22.56512                                                                           dotnet    
-System.Data.DataSetExtensions                      4.700.22.56512                                                                           dotnet    
-System.Diagnostics.Contracts                       4.700.22.56512                                                                           dotnet    
-System.Diagnostics.Debug                           4.700.22.56512                                                                           dotnet    
-System.Diagnostics.DiagnosticSource                4.700.22.56512                                                                           dotnet    
-System.Diagnostics.FileVersionInfo                 4.700.22.56512                                                                           dotnet    
-System.Diagnostics.Process                         4.700.22.56512                                                                           dotnet    
-System.Diagnostics.StackTrace                      4.700.22.56512                                                                           dotnet    
-System.Diagnostics.TextWriterTraceListener         4.700.22.56512                                                                           dotnet    
-System.Diagnostics.Tools                           4.700.22.56512                                                                           dotnet    
-System.Diagnostics.TraceSource                     4.700.22.56512                                                                           dotnet    
-System.Diagnostics.Tracing                         4.700.22.56512                                                                           dotnet    
-System.Drawing                                     4.700.22.56512                                                                           dotnet    
-System.Drawing.Primitives                          4.700.22.56512                                                                           dotnet    
-System.Dynamic.Runtime                             4.700.22.56512                                                                           dotnet    
-System.Globalization                               4.700.22.56512                                                                           dotnet    
-System.Globalization.Calendars                     4.700.22.56512                                                                           dotnet    
-System.Globalization.Extensions                    4.700.22.56512                                                                           dotnet    
-System.IO                                          4.700.22.56512                                                                           dotnet    
-System.IO.Compression                              4.700.22.56512                                                                           dotnet    
-System.IO.Compression.Brotli                       4.700.22.56512                                                                           dotnet    
-System.IO.Compression.FileSystem                   4.700.22.56512                                                                           dotnet    
-System.IO.Compression.ZipFile                      4.700.22.56512                                                                           dotnet    
-System.IO.FileSystem                               4.700.22.56512                                                                           dotnet    
-System.IO.FileSystem.AccessControl                 4.700.22.56512                                                                           dotnet    
-System.IO.FileSystem.DriveInfo                     4.700.22.56512                                                                           dotnet    
-System.IO.FileSystem.Primitives                    4.700.22.56512                                                                           dotnet    
-System.IO.FileSystem.Watcher                       4.700.22.56512                                                                           dotnet    
-System.IO.IsolatedStorage                          4.700.22.56512                                                                           dotnet    
-System.IO.MemoryMappedFiles                        4.700.22.56512                                                                           dotnet    
-System.IO.Pipes                                    4.700.22.56512                                                                           dotnet    
-System.IO.Pipes.AccessControl                      4.700.22.56512                                                                           dotnet    
-System.IO.UnmanagedMemoryStream                    4.700.22.56512                                                                           dotnet    
-System.Linq                                        4.700.22.56512                                                                           dotnet    
-System.Linq.Expressions                            4.700.22.56512                                                                           dotnet    
-System.Linq.Parallel                               4.700.22.56512                                                                           dotnet    
-System.Linq.Queryable                              4.700.22.56512                                                                           dotnet    
-System.Memory                                      4.700.22.56512                                                                           dotnet    
-System.Net                                         4.700.22.56512                                                                           dotnet    
-System.Net.Http                                    4.700.22.56512                                                                           dotnet    
-System.Net.HttpListener                            4.700.22.56512                                                                           dotnet    
+QBittorrent.Client                                 1.9.24285.1                                                                              dotnet    
+System                                             6.0.3524.45918                                                                           dotnet    
+System.AppContext                                  6.0.3524.45918                                                                           dotnet    
+System.Buffers                                     6.0.3524.45918                                                                           dotnet    
+System.Collections                                 6.0.3524.45918                                                                           dotnet    
+System.Collections.Concurrent                      6.0.3524.45918                                                                           dotnet    
+System.Collections.Immutable                       6.0.3524.45918                                                                           dotnet    
+System.Collections.NonGeneric                      6.0.3524.45918                                                                           dotnet    
+System.Collections.Specialized                     6.0.3524.45918                                                                           dotnet    
+System.ComponentModel                              6.0.3524.45918                                                                           dotnet    
+System.ComponentModel.Annotations                  6.0.3524.45918                                                                           dotnet    
+System.ComponentModel.DataAnnotations              6.0.3524.45918                                                                           dotnet    
+System.ComponentModel.EventBasedAsync              6.0.3524.45918                                                                           dotnet    
+System.ComponentModel.Primitives                   6.0.3524.45918                                                                           dotnet    
+System.ComponentModel.TypeConverter                6.0.3524.45918                                                                           dotnet    
+System.Configuration                               6.0.3524.45918                                                                           dotnet    
+System.Console                                     6.0.3524.45918                                                                           dotnet    
+System.Core                                        6.0.3524.45918                                                                           dotnet    
+System.Data                                        6.0.3524.45918                                                                           dotnet    
+System.Data.Common                                 6.0.3524.45918                                                                           dotnet    
+System.Data.DataSetExtensions                      6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.Contracts                       6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.Debug                           6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.DiagnosticSource                6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.FileVersionInfo                 6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.Process                         6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.StackTrace                      6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.TextWriterTraceListener         6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.Tools                           6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.TraceSource                     6.0.3524.45918                                                                           dotnet    
+System.Diagnostics.Tracing                         6.0.3524.45918                                                                           dotnet    
+System.Drawing                                     6.0.3524.45918                                                                           dotnet    
+System.Drawing.Primitives                          6.0.3524.45918                                                                           dotnet    
+System.Dynamic.Runtime                             6.0.3524.45918                                                                           dotnet    
+System.Formats.Asn1                                6.0.3524.45918                                                                           dotnet    
+System.Globalization                               6.0.3524.45918                                                                           dotnet    
+System.Globalization.Calendars                     6.0.3524.45918                                                                           dotnet    
+System.Globalization.Extensions                    6.0.3524.45918                                                                           dotnet    
+System.IO                                          6.0.3524.45918                                                                           dotnet    
+System.IO.Compression                              6.0.3524.45918                                                                           dotnet    
+System.IO.Compression.Brotli                       6.0.3524.45918                                                                           dotnet    
+System.IO.Compression.FileSystem                   6.0.3524.45918                                                                           dotnet    
+System.IO.Compression.ZipFile                      6.0.3524.45918                                                                           dotnet    
+System.IO.FileSystem                               6.0.3524.45918                                                                           dotnet    
+System.IO.FileSystem.AccessControl                 6.0.3524.45918                                                                           dotnet    
+System.IO.FileSystem.DriveInfo                     6.0.3524.45918                                                                           dotnet    
+System.IO.FileSystem.Primitives                    6.0.3524.45918                                                                           dotnet    
+System.IO.FileSystem.Watcher                       6.0.3524.45918                                                                           dotnet    
+System.IO.IsolatedStorage                          6.0.3524.45918                                                                           dotnet    
+System.IO.MemoryMappedFiles                        6.0.3524.45918                                                                           dotnet    
+System.IO.Pipes                                    6.0.3524.45918                                                                           dotnet    
+System.IO.Pipes.AccessControl                      6.0.3524.45918                                                                           dotnet    
+System.IO.UnmanagedMemoryStream                    6.0.3524.45918                                                                           dotnet    
+System.Linq                                        6.0.3524.45918                                                                           dotnet    
+System.Linq.Expressions                            6.0.3524.45918                                                                           dotnet    
+System.Linq.Parallel                               6.0.3524.45918                                                                           dotnet    
+System.Linq.Queryable                              6.0.3524.45918                                                                           dotnet    
+System.Memory                                      6.0.3524.45918                                                                           dotnet    
+System.Net                                         6.0.3524.45918                                                                           dotnet    
+System.Net.Http                                    6.0.3524.45918                                                                           dotnet    
+System.Net.Http.Json                               6.0.3524.45918                                                                           dotnet    
+System.Net.HttpListener                            6.0.3524.45918                                                                           dotnet    
 System.Net.IPNetwork                               2.5.235                                                                                  dotnet    
-System.Net.Mail                                    4.700.22.56512                                                                           dotnet    
-System.Net.NameResolution                          4.700.22.56512                                                                           dotnet    
-System.Net.NetworkInformation                      4.700.22.56512                                                                           dotnet    
-System.Net.Ping                                    4.700.22.56512                                                                           dotnet    
-System.Net.Primitives                              4.700.22.56512                                                                           dotnet    
-System.Net.Requests                                4.700.22.56512                                                                           dotnet    
-System.Net.Security                                4.700.22.56512                                                                           dotnet    
-System.Net.ServicePoint                            4.700.22.56512                                                                           dotnet    
-System.Net.Sockets                                 4.700.22.56512                                                                           dotnet    
-System.Net.WebClient                               4.700.22.56512                                                                           dotnet    
-System.Net.WebHeaderCollection                     4.700.22.56512                                                                           dotnet    
-System.Net.WebProxy                                4.700.22.56512                                                                           dotnet    
-System.Net.WebSockets                              4.700.22.56512                                                                           dotnet    
-System.Net.WebSockets.Client                       4.700.22.56512                                                                           dotnet    
-System.Numerics                                    4.700.22.56512                                                                           dotnet    
-System.Numerics.Vectors                            4.700.22.56512                                                                           dotnet    
-System.ObjectModel                                 4.700.22.56512                                                                           dotnet    
-System.Private.CoreLib                             4.700.22.55902                                                                           dotnet    
-System.Private.DataContractSerialization           4.700.22.56512                                                                           dotnet    
-System.Private.Uri                                 4.700.22.56512                                                                           dotnet    
-System.Private.Xml                                 4.700.22.56512                                                                           dotnet    
-System.Private.Xml.Linq                            4.700.22.56512                                                                           dotnet    
-System.Reflection                                  4.700.22.56512                                                                           dotnet    
-System.Reflection.DispatchProxy                    4.700.22.56512                                                                           dotnet    
-System.Reflection.Emit                             4.700.22.56512                                                                           dotnet    
-System.Reflection.Emit.ILGeneration                4.700.22.56512                                                                           dotnet    
-System.Reflection.Emit.Lightweight                 4.700.22.56512                                                                           dotnet    
-System.Reflection.Extensions                       4.700.22.56512                                                                           dotnet    
-System.Reflection.Metadata                         4.700.22.56512                                                                           dotnet    
-System.Reflection.Primitives                       4.700.22.56512                                                                           dotnet    
-System.Reflection.TypeExtensions                   4.700.22.56512                                                                           dotnet    
-System.Resources.Reader                            4.700.22.56512                                                                           dotnet    
-System.Resources.ResourceManager                   4.700.22.56512                                                                           dotnet    
-System.Resources.Writer                            4.700.22.56512                                                                           dotnet    
-System.Runtime                                     4.700.22.56512                                                                           dotnet    
-System.Runtime.CompilerServices.VisualC            4.700.22.56512                                                                           dotnet    
-System.Runtime.Extensions                          4.700.22.56512                                                                           dotnet    
-System.Runtime.Handles                             4.700.22.56512                                                                           dotnet    
-System.Runtime.InteropServices                     4.700.22.56512                                                                           dotnet    
-System.Runtime.InteropServices.RuntimeInformation  4.700.22.56512                                                                           dotnet    
-System.Runtime.InteropServices.WindowsRuntime      4.700.22.56512                                                                           dotnet    
-System.Runtime.Intrinsics                          4.700.22.56512                                                                           dotnet    
-System.Runtime.Loader                              4.700.22.56512                                                                           dotnet    
-System.Runtime.Numerics                            4.700.22.56512                                                                           dotnet    
-System.Runtime.Serialization                       4.700.22.56512                                                                           dotnet    
-System.Runtime.Serialization.Formatters            4.700.22.56512                                                                           dotnet    
-System.Runtime.Serialization.Json                  4.700.22.56512                                                                           dotnet    
-System.Runtime.Serialization.Primitives            4.700.22.56512                                                                           dotnet    
-System.Runtime.Serialization.Xml                   4.700.22.56512                                                                           dotnet    
-System.Runtime.WindowsRuntime                      4.700.22.56512                                                                           dotnet    
-System.Runtime.WindowsRuntime.UI.Xaml              4.700.22.56512                                                                           dotnet    
-System.Security                                    4.700.22.56512                                                                           dotnet    
-System.Security.AccessControl                      4.700.22.56512                                                                           dotnet    
-System.Security.Claims                             4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.Algorithms            4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.Cng                   4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.Csp                   4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.Encoding              4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.OpenSsl               4.700.22.56512                                                                           dotnet    
-System.Security.Cryptography.Primitives            4.700.22.56512                                                                           dotnet    
+System.Net.Mail                                    6.0.3524.45918                                                                           dotnet    
+System.Net.NameResolution                          6.0.3524.45918                                                                           dotnet    
+System.Net.NetworkInformation                      6.0.3524.45918                                                                           dotnet    
+System.Net.Ping                                    6.0.3524.45918                                                                           dotnet    
+System.Net.Primitives                              6.0.3524.45918                                                                           dotnet    
+System.Net.Quic                                    6.0.3524.45918                                                                           dotnet    
+System.Net.Requests                                6.0.3524.45918                                                                           dotnet    
+System.Net.Security                                6.0.3524.45918                                                                           dotnet    
+System.Net.ServicePoint                            6.0.3524.45918                                                                           dotnet    
+System.Net.Sockets                                 6.0.3524.45918                                                                           dotnet    
+System.Net.WebClient                               6.0.3524.45918                                                                           dotnet    
+System.Net.WebHeaderCollection                     6.0.3524.45918                                                                           dotnet    
+System.Net.WebProxy                                6.0.3524.45918                                                                           dotnet    
+System.Net.WebSockets                              6.0.3524.45918                                                                           dotnet    
+System.Net.WebSockets.Client                       6.0.3524.45918                                                                           dotnet    
+System.Numerics                                    6.0.3524.45918                                                                           dotnet    
+System.Numerics.Vectors                            6.0.3524.45918                                                                           dotnet    
+System.ObjectModel                                 6.0.3524.45918                                                                           dotnet    
+System.Private.CoreLib                             6.0.3524.45918                                                                           dotnet    
+System.Private.DataContractSerialization           6.0.3524.45918                                                                           dotnet    
+System.Private.Uri                                 6.0.3524.45918                                                                           dotnet    
+System.Private.Xml                                 6.0.3524.45918                                                                           dotnet    
+System.Private.Xml.Linq                            6.0.3524.45918                                                                           dotnet    
+System.Reflection                                  6.0.3524.45918                                                                           dotnet    
+System.Reflection.DispatchProxy                    6.0.3524.45918                                                                           dotnet    
+System.Reflection.Emit                             6.0.3524.45918                                                                           dotnet    
+System.Reflection.Emit.ILGeneration                6.0.3524.45918                                                                           dotnet    
+System.Reflection.Emit.Lightweight                 6.0.3524.45918                                                                           dotnet    
+System.Reflection.Extensions                       6.0.3524.45918                                                                           dotnet    
+System.Reflection.Metadata                         6.0.3524.45918                                                                           dotnet    
+System.Reflection.Primitives                       6.0.3524.45918                                                                           dotnet    
+System.Reflection.TypeExtensions                   6.0.3524.45918                                                                           dotnet    
+System.Resources.Reader                            6.0.3524.45918                                                                           dotnet    
+System.Resources.ResourceManager                   6.0.3524.45918                                                                           dotnet    
+System.Resources.Writer                            6.0.3524.45918                                                                           dotnet    
+System.Runtime                                     6.0.3524.45918                                                                           dotnet    
+System.Runtime.CompilerServices.VisualC            6.0.3524.45918                                                                           dotnet    
+System.Runtime.Extensions                          6.0.3524.45918                                                                           dotnet    
+System.Runtime.Handles                             6.0.3524.45918                                                                           dotnet    
+System.Runtime.InteropServices                     6.0.3524.45918                                                                           dotnet    
+System.Runtime.InteropServices.RuntimeInformation  6.0.3524.45918                                                                           dotnet    
+System.Runtime.Intrinsics                          6.0.3524.45918                                                                           dotnet    
+System.Runtime.Loader                              6.0.3524.45918                                                                           dotnet    
+System.Runtime.Numerics                            6.0.3524.45918                                                                           dotnet    
+System.Runtime.Serialization                       6.0.3524.45918                                                                           dotnet    
+System.Runtime.Serialization.Formatters            6.0.3524.45918                                                                           dotnet    
+System.Runtime.Serialization.Json                  6.0.3524.45918                                                                           dotnet    
+System.Runtime.Serialization.Primitives            6.0.3524.45918                                                                           dotnet    
+System.Runtime.Serialization.Xml                   6.0.3524.45918                                                                           dotnet    
+System.Security                                    6.0.3524.45918                                                                           dotnet    
+System.Security.AccessControl                      6.0.3524.45918                                                                           dotnet    
+System.Security.Claims                             6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.Algorithms            6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.Cng                   6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.Csp                   6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.Encoding              6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.OpenSsl               6.0.3524.45918                                                                           dotnet    
+System.Security.Cryptography.Primitives            6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.ProtectedData         5.0.20.51904                                                                             dotnet    
-System.Security.Cryptography.X509Certificates      4.700.22.56512                                                                           dotnet    
-System.Security.Principal                          4.700.22.56512                                                                           dotnet    
-System.Security.Principal.Windows                  4.700.22.56512                                                                           dotnet    
-System.Security.SecureString                       4.700.22.56512                                                                           dotnet    
-System.ServiceModel.Web                            4.700.22.56512                                                                           dotnet    
-System.ServiceProcess                              4.700.22.56512                                                                           dotnet    
-System.Text.Encoding                               4.700.22.56512                                                                           dotnet    
-System.Text.Encoding.CodePages                     4.700.22.56512                                                                           dotnet    
-System.Text.Encoding.Extensions                    4.700.22.56512                                                                           dotnet    
-System.Text.Encodings.Web                          4.700.22.56512                                                                           dotnet    
-System.Text.Json                                   4.700.22.56512                                                                           dotnet    
-System.Text.RegularExpressions                     4.700.22.56512                                                                           dotnet    
-System.Threading                                   4.700.22.56512                                                                           dotnet    
-System.Threading.Channels                          4.700.22.56512                                                                           dotnet    
-System.Threading.Overlapped                        4.700.22.56512                                                                           dotnet    
-System.Threading.Tasks                             4.700.22.56512                                                                           dotnet    
-System.Threading.Tasks.Dataflow                    4.700.22.56512                                                                           dotnet    
-System.Threading.Tasks.Extensions                  4.700.22.56512                                                                           dotnet    
-System.Threading.Tasks.Parallel                    4.700.22.56512                                                                           dotnet    
-System.Threading.Thread                            4.700.22.56512                                                                           dotnet    
-System.Threading.ThreadPool                        4.700.22.56512                                                                           dotnet    
-System.Threading.Timer                             4.700.22.56512                                                                           dotnet    
-System.Transactions                                4.700.22.56512                                                                           dotnet    
-System.Transactions.Local                          4.700.22.56512                                                                           dotnet    
-System.ValueTuple                                  4.700.22.56512                                                                           dotnet    
-System.Web                                         4.700.22.56512                                                                           dotnet    
-System.Web.HttpUtility                             4.700.22.56512                                                                           dotnet    
-System.Windows                                     4.700.22.56512                                                                           dotnet    
-System.Xml                                         4.700.22.56512                                                                           dotnet    
-System.Xml.Linq                                    4.700.22.56512                                                                           dotnet    
-System.Xml.ReaderWriter                            4.700.22.56512                                                                           dotnet    
-System.Xml.Serialization                           4.700.22.56512                                                                           dotnet    
-System.Xml.XDocument                               4.700.22.56512                                                                           dotnet    
-System.Xml.XPath                                   4.700.22.56512                                                                           dotnet    
-System.Xml.XPath.XDocument                         4.700.22.56512                                                                           dotnet    
-System.Xml.XmlDocument                             4.700.22.56512                                                                           dotnet    
-System.Xml.XmlSerializer                           4.700.22.56512                                                                           dotnet    
-WindowsBase                                        4.700.22.56512                                                                           dotnet    
-alpine-baselayout                                  3.4.3-r2                                                                                 apk       
-alpine-baselayout-data                             3.4.3-r2                                                                                 apk       
-alpine-keys                                        2.4-r1                                                                                   apk       
-alpine-release                                     3.19.1-r0                                                                                apk       
-apk-tools                                          2.14.4-r0                                                                                apk       
-bash                                               5.2.21-r0                                                                                apk       
-brotli-libs                                        1.1.0-r1                                                                                 apk       
-busybox                                            1.36.1-r15                                                                               apk       
-busybox-binsh                                      1.36.1-r15                                                                               apk       
-c-ares                                             1.27.0-r0                                                                                apk       
-ca-certificates                                    20240226-r0                                                                              apk       
-ca-certificates-bundle                             20240226-r0                                                                              apk       
-coreutils                                          9.4-r2                                                                                   apk       
-coreutils-env                                      9.4-r2                                                                                   apk       
-coreutils-fmt                                      9.4-r2                                                                                   apk       
-coreutils-sha512sum                                9.4-r2                                                                                   apk       
-curl                                               8.5.0-r0                                                                                 apk       
-dbus-libs                                          1.14.10-r0                                                                               apk       
+System.Security.Cryptography.X509Certificates      6.0.3524.45918                                                                           dotnet    
+System.Security.Principal                          6.0.3524.45918                                                                           dotnet    
+System.Security.Principal.Windows                  6.0.3524.45918                                                                           dotnet    
+System.Security.SecureString                       6.0.3524.45918                                                                           dotnet    
+System.ServiceModel.Web                            6.0.3524.45918                                                                           dotnet    
+System.ServiceProcess                              6.0.3524.45918                                                                           dotnet    
+System.Text.Encoding                               6.0.3524.45918                                                                           dotnet    
+System.Text.Encoding.CodePages                     6.0.3524.45918                                                                           dotnet    
+System.Text.Encoding.Extensions                    6.0.3524.45918                                                                           dotnet    
+System.Text.Encodings.Web                          6.0.3524.45918                                                                           dotnet    
+System.Text.Json                                   6.0.3524.45918                                                                           dotnet    
+System.Text.RegularExpressions                     6.0.3524.45918                                                                           dotnet    
+System.Threading                                   6.0.3524.45918                                                                           dotnet    
+System.Threading.Channels                          6.0.3524.45918                                                                           dotnet    
+System.Threading.Overlapped                        6.0.3524.45918                                                                           dotnet    
+System.Threading.Tasks                             6.0.3524.45918                                                                           dotnet    
+System.Threading.Tasks.Dataflow                    6.0.3524.45918                                                                           dotnet    
+System.Threading.Tasks.Extensions                  6.0.3524.45918                                                                           dotnet    
+System.Threading.Tasks.Parallel                    6.0.3524.45918                                                                           dotnet    
+System.Threading.Thread                            6.0.3524.45918                                                                           dotnet    
+System.Threading.ThreadPool                        6.0.3524.45918                                                                           dotnet    
+System.Threading.Timer                             6.0.3524.45918                                                                           dotnet    
+System.Transactions                                6.0.3524.45918                                                                           dotnet    
+System.Transactions.Local                          6.0.3524.45918                                                                           dotnet    
+System.ValueTuple                                  6.0.3524.45918                                                                           dotnet    
+System.Web                                         6.0.3524.45918                                                                           dotnet    
+System.Web.HttpUtility                             6.0.3524.45918                                                                           dotnet    
+System.Windows                                     6.0.3524.45918                                                                           dotnet    
+System.Xml                                         6.0.3524.45918                                                                           dotnet    
+System.Xml.Linq                                    6.0.3524.45918                                                                           dotnet    
+System.Xml.ReaderWriter                            6.0.3524.45918                                                                           dotnet    
+System.Xml.Serialization                           6.0.3524.45918                                                                           dotnet    
+System.Xml.XDocument                               6.0.3524.45918                                                                           dotnet    
+System.Xml.XPath                                   6.0.3524.45918                                                                           dotnet    
+System.Xml.XPath.XDocument                         6.0.3524.45918                                                                           dotnet    
+System.Xml.XmlDocument                             6.0.3524.45918                                                                           dotnet    
+System.Xml.XmlSerializer                           6.0.3524.45918                                                                           dotnet    
+WindowsBase                                        6.0.3524.45918                                                                           dotnet    
+acl-libs                                           2.3.2-r1                                                                                 apk       
+alpine-baselayout                                  3.6.8-r0                                                                                 apk       
+alpine-baselayout-data                             3.6.8-r0                                                                                 apk       
+alpine-keys                                        2.5-r0                                                                                   apk       
+apk-tools                                          2.14.4-r3                                                                                apk       
+bash                                               5.2.37-r0                                                                                apk       
+brotli-libs                                        1.1.0-r2                                                                                 apk       
+busybox                                            1.36.1-r32                                                                               apk       
+busybox-binsh                                      1.36.1-r32                                                                               apk       
+c-ares                                             1.34.2-r0                                                                                apk       
+ca-certificates                                    20240705-r0                                                                              apk       
+ca-certificates-bundle                             20240705-r0                                                                              apk       
+catatonit                                          0.2.0-r0                                                                                 apk       
+coreutils                                          9.5-r1                                                                                   apk       
+coreutils-env                                      9.5-r1                                                                                   apk       
+coreutils-fmt                                      9.5-r1                                                                                   apk       
+coreutils-sha512sum                                9.5-r1                                                                                   apk       
+curl                                               8.9.1-r2                                                                                 apk       
+dbus-libs                                          1.14.10-r4                                                                               apk       
 double-conversion                                  3.3.0-r0                                                                                 apk       
 duktape                                            2.7.0-r1                                                                                 apk       
-findutils                                          4.9.0-r5                                                                                 apk       
-gdbm                                               1.23-r1                                                                                  apk       
-glib                                               2.78.4-r0                                                                                apk       
-icu-data-en                                        74.1-r0                                                                                  apk       
-icu-libs                                           74.1-r0                                                                                  apk       
+findutils                                          4.10.0-r0                                                                                apk       
+gdbm                                               1.24-r0                                                                                  apk       
+glib                                               2.82.2-r0                                                                                apk       
+grep                                               3.11-r0                                                                                  apk       
+icu-data-en                                        74.2-r0                                                                                  apk       
+icu-libs                                           74.2-r0                                                                                  apk       
 jq                                                 1.7.1-r0                                                                                 apk       
-libacl                                             2.3.1-r4                                                                                 apk       
-libattr                                            2.5.1-r5                                                                                 apk       
+libattr                                            2.5.2-r2                                                                                 apk       
 libb2                                              0.98.1-r3                                                                                apk       
-libblkid                                           2.39.3-r0                                                                                apk       
-libbsd                                             0.11.7-r3                                                                                apk       
+libblkid                                           2.40.2-r3                                                                                apk       
+libbsd                                             0.12.2-r0                                                                                apk       
 libbz2                                             1.0.8-r6                                                                                 apk       
-libc-utils                                         0.7.2-r5                                                                                 apk       
-libcrypto3                                         3.1.4-r6                                                                                 apk       
-libcurl                                            8.5.0-r0                                                                                 apk       
-libexpat                                           2.6.2-r0                                                                                 apk       
-libffi                                             3.4.4-r3                                                                                 apk       
-libgcc                                             13.2.1_git20231014-r0                                                                    apk       
-libgomp                                            13.2.1_git20231014-r0                                                                    apk       
-libidn2                                            2.3.4-r4                                                                                 apk       
-libintl                                            0.22.3-r0                                                                                apk       
+libcrypto3                                         3.3.2-r3                                                                                 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-r4                                                                                apk       
+libgomp                                            14.2.0-r4                                                                                apk       
+libidn2                                            2.3.7-r0                                                                                 apk       
+libintl                                            0.22.5-r0                                                                                apk       
 libmd                                              1.1.0-r0                                                                                 apk       
-libmount                                           2.39.3-r0                                                                                apk       
-libncursesw                                        6.4_p20231125-r0                                                                         apk       
-libpanelw                                          6.4_p20231125-r0                                                                         apk       
-libpcre2-16                                        10.42-r2                                                                                 apk       
-libproc2                                           4.0.4-r0                                                                                 apk       
-libproxy                                           0.5.3-r0                                                                                 apk       
-libssl3                                            3.1.4-r6                                                                                 apk       
-libstdc++                                          13.2.1_git20231014-r0                                                                    apk       
-libunistring                                       1.1-r2                                                                                   apk       
-linux-pam                                          1.5.3-r7                                                                                 apk       
-mpdecimal                                          2.5.1-r2                                                                                 apk       
-mscorlib                                           4.700.22.56512                                                                           dotnet    
-musl                                               1.2.4_git20230717-r4                                                                     apk       
-musl-utils                                         1.2.4_git20230717-r4                                                                     apk       
-ncurses-terminfo-base                              6.4_p20231125-r0                                                                         apk       
+libmount                                           2.40.2-r3                                                                                apk       
+libncursesw                                        6.5_p20241006-r0                                                                         apk       
+libpanelw                                          6.5_p20241006-r0                                                                         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-r3                                                                                 apk       
+libstdc++                                          14.2.0-r4                                                                                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_p20241006-r0                                                                         apk       
 netcat-openbsd                                     1.226-r0                                                                                 apk       
-netstandard                                        4.700.22.56512                                                                           dotnet    
-nghttp2-libs                                       1.58.0-r0                                                                                apk       
+netstandard                                        6.0.3524.45918                                                                           dotnet    
+nghttp2-libs                                       1.63.0-r0                                                                                apk       
 oniguruma                                          6.9.9-r0                                                                                 apk       
-pcre2                                              10.42-r2                                                                                 apk       
-procps-ng                                          4.0.4-r0                                                                                 apk       
-pyc                                                3.11.9-r0                                                                                apk       
-python3                                            3.11.9-r0                                                                                apk       
-python3-pyc                                        3.11.9-r0                                                                                apk       
-python3-pycache-pyc0                               3.11.9-r0                                                                                apk       
-qbt                                                1.8.24012.1+00a638ba43f1a80a03cc8be139f586ce9886c908                                     dotnet    
-qt6-qtbase                                         6.6.1-r0                                                                                 apk       
-qt6-qtbase-sqlite                                  6.6.1-r0                                                                                 apk       
-readline                                           8.2.1-r2                                                                                 apk       
-scanelf                                            1.3.7-r2                                                                                 apk       
-shadow                                             4.14.2-r0                                                                                apk       
-skalibs                                            2.14.0.1-r0                                                                              apk       
-sqlite-libs                                        3.44.2-r0                                                                                apk       
-ssl_client                                         1.36.1-r15                                                                               apk       
-tzdata                                             2024a-r0                                                                                 apk       
-utmps-libs                                         0.1.2.2-r0                                                                               apk       
-xz-libs                                            5.4.5-r0                                                                                 apk       
-zlib                                               1.3.1-r0                                                                                 apk       
-zstd-libs                                          1.5.5-r8                                                                                 apk       
+pcre2                                              10.43-r0                                                                                 apk       
+procps-ng                                          4.0.4-r2                                                                                 apk       
+pyc                                                3.12.7-r1                                                                                apk       
+python3                                            3.12.7-r1                                                                                apk       
+python3-pyc                                        3.12.7-r1                                                                                apk       
+python3-pycache-pyc0                               3.12.7-r1                                                                                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.47.0-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

@@ -23,8 +23,7 @@ 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/qbittorrent/config", desc: "Contains all relevant configuration files." }
-  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
@@ -34,6 +33,11 @@ param_usage_include_env: true
 param_env_vars:
   - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the web UI, see below for explanation"}
   - { env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation" }
+opt_param_usage_include_vols: true
+opt_param_volumes:
+  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
+
+readonly_supported: true
 
 # application setup block
 app_setup_block_enabled: true
@@ -58,18 +62,19 @@ app_setup_block: |
 
 # 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: "Rebase to Alpine 3.19."}
+  - { 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: "Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
+  - { 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: "25.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
-  - { date: "15.01.23:", desc: "Rebase to Alpine 3.17, add openssl1.1-compat." }
-  - { date: "29.11.22:", desc: "Add icu-libs to support qbittorrent-cli." }
-  - { date: "30.10.22:", desc: "Add libtorrent v1 branch." }
+  - { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
+  - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
   - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
   - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
   - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }

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 [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
-        lsiown -R abc:abc /downloads
-    fi
+if grep -qe ' /downloads ' /proc/mounts; then
+    lsiown abc:abc /downloads
 fi
 
 # permissions

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

@@ -6,6 +6,11 @@ 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-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
+        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}

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