Bot Updating Package Versions

shift to python3 on unstable

.editorconfig

@@ -1,20 +0,0 @@
-# This file is globally distributed to all container image projects from
-# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-# trim_trailing_whitespace may cause unintended issues and should not be globally set true
-trim_trailing_whitespace = false
-
-[{Dockerfile*,**.yml}]
-indent_style = space
-indent_size = 2
-
-[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
-indent_style = space
-indent_size = 4

.github/CONTRIBUTING.md

@@ -4,9 +4,9 @@
 
 * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
 * Read, and fill the Pull Request template
-  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
+  * If this is a fix for a typo in code or documentation in the README please file an issue
   * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
 
 ## Common files
 
@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
 
 ### Testing your changes
 
-```bash
+```
 git clone https://github.com/linuxserver/docker-qbittorrent.git
 cd docker-qbittorrent
 docker build \
@@ -105,15 +105,14 @@ docker build \
   -t linuxserver/qbittorrent:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-
+```
-```bash
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
-## Update the changelog
+## Update the chagelog
 
 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
 

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- Provide a general summary of the bug in the Title above -->
+
+------------------------------
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Environment
+**OS:**
+**CPU architecture:** x86_64/arm32/arm64
+**How docker service was installed:**
+<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Command used to create docker container (run/create/compose/screenshot)
+<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+
+## Docker logs
+<!--- Provide a full docker log, output of "docker logs qbittorrent" -->

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -1,76 +0,0 @@
-# Based on the issue template
-name: Bug report
-description: Create a report to help us improve
-title: "[BUG] <title>"
-labels: [Bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: Tell us what happens instead of the expected behavior.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: Tell us what should happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        examples:
-          - **OS**: Ubuntu 20.04
-          - **How docker service was installed**: distro's packagemanager
-      value: |
-        - OS:
-        - How docker service was installed:
-      render: markdown
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: CPU architecture
-      options:
-        - x86-64
-        - arm64
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Docker creation
-      description: |
-        Command used to create docker container
-        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
-      render: bash
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      description: |
-        Provide a full docker log, output of "docker logs qbittorrent"
-      label: Container logs
-      placeholder: |
-        Output of `docker logs qbittorrent`
-      render: bash
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
+<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
+
+<!--- Provide a general summary of the request in the Title above -->
+
+------------------------------
+
+## Desired Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Alternatives Considered
+<!--- Tell us what other options you have tried or considered -->

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -1,31 +0,0 @@
-# Based on the issue template
-name: Feature request
-description: Suggest an idea for this project
-title: "[FEAT] <title>"
-labels: [enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is this a new feature request?
-      description: Please search to see if a feature request already exists.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Wanted change
-      description: Tell us what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reason for change
-      description: Justify your request, why do you want it, what is the benefit.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Proposed code change
-      description: Do you have a potential code change in mind?
-    validations:
-      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@
 
 <!--- Before submitting a pull request please check the following -->
 
-<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
+<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  -->
 <!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->

.github/workflows/call_issue_pr_tracker.yml

@@ -1,16 +0,0 @@
-name: Issue & PR Tracker
-
-on:
-  issues:
-    types: [opened,reopened,labeled,unlabeled,closed]
-  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
-  pull_request_review:
-    types: [submitted,edited,dismissed]
-
-jobs:
-  manage-project:
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
-    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -1,13 +0,0 @@
-name: Mark stale issues and pull requests
-on:
-  schedule:
-    - cron:  '29 15 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    permissions:
-      issues: write
-      pull-requests: write
-    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
-    secrets: inherit

.github/workflows/external_trigger.yml

@@ -4,149 +4,88 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-unstable:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v2.3.3
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/unstable'
-        env:
-          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE }}" ]; then
-          if grep -q "^qbittorrent_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE is set; skipping trigger. ****"
-            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
-          elif grep -q "^qbittorrent_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "> [!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 grep -q "^qbittorrent_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
+          echo "**** External trigger running off of unstable branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_UNSTABLE\". ****"
+          echo "**** Retrieving external version ****"
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve external version, exiting ****"
-            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve external version for qbittorrent branch unstable"
-            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"}],
+              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving last pushed version ****"
           image="linuxserver/qbittorrent"
-          tag="latest"
+          tag="unstable"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
             | jq -r '.token')
-          multidigest=$(curl -s \
+            multidigest=$(curl -s \
-            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Accept: application/vnd.oci.image.index.v1+json" \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/manifests/${tag}")
-          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-            # If there's a layer element it's a single-arch manifest so just get that digest
-            digest=$(jq -r '.config.digest' <<< "${multidigest}")
-          else
-            # Otherwise it's multi-arch or has manifest annotations
-            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-              # Check for manifest annotations and delete if found
-              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
-            fi
-            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
-              # If there's still more than one digest, it's multi-arch
-              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
-            else
-              # Otherwise it's single arch
-              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
-            fi
-            if digest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              digest=$(jq -r '.config.digest' <<< "${digest}");
+              | jq -r 'first(.manifests[].digest)')
-            fi
+            digest=$(curl -s \
-          fi
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+              | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}")
+            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            | jq -r '.container_config')
-            image_info=$(echo $image_info | jq -r '.config')
-          else
-            image_info=$(echo $image_info | jq -r '.container_config')
-          fi
           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 "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve last pushed version, exiting ****"
-            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag unstable"
-            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}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            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
-            if [[ "${artifacts_found}" == "false" ]]; then
+            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            response=$(curl -iX POST \
-              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/buildWithParameters?PACKAGE_CHECK=false \
-              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."
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+            echo "**** Sleeping 10 seconds until job starts ****"
-                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            sleep 10
-            else
+            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+            buildurl="${buildurl%$'\r'}"
-              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+            echo "**** Jenkins job build url: ${buildurl} ****"
-              if [[ "${artifacts_found}" == "true" ]]; then
+            echo "**** Attempting to change the Jenkins job description ****"
-                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
+            curl -iX POST \
-              fi
+              "${buildurl}submitDescription" \
-              response=$(curl -iX POST \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              --data-urlencode "Submit=Submit"
-              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+            echo "**** Notifying Discord ****"
-              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+            TRIGGER_REASON="A version change was detected for qbittorrent tag unstable. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-              sleep 10
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              buildurl="${buildurl%$'\r'}"
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-              curl -iX POST \
-                "${buildurl}submitDescription" \
-                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                --data-urlencode "Submit=Submit"
-              echo "**** Notifying Discord ****"
-              TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            fi
           fi

.github/workflows/external_trigger_scheduler.yml

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

.github/workflows/greetings.yml

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

.github/workflows/package_trigger.yml

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

.github/workflows/package_trigger_scheduler.yml

@@ -2,99 +2,49 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '48 6 * * 0'
+    - cron:  '12 11 * * 1'
   workflow_dispatch:
 
 jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v2.3.3
         with:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
-        env:
-          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          printf "# Package trigger scheduler for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
+          echo "**** Branches found: ****"
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
+            br=$(echo "$br" | sed 's|origin/||g')
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+            echo "**** Evaluating branch ${br} ****"
-              continue
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml \
-            fi
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            if [ "${br}" == "${ls_branch}" ]; then
-            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/Jenkinsfile >/dev/null 2>&1; then
+              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-              skipped_branches="${skipped_branches}${br} "
-            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/readme-vars.yml)
-              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif grep -q "^qbittorrent_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`qbittorrent_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              else
-                echo "> [!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 \
+                curl -iX POST \
-                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
+                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                  -H "Accept: application/vnd.github.v3+json" \
-                if [[ -z "${response}" ]]; then
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
-                  echo "> Jenkins build could not be triggered. Skipping branch."
+                sleep 30
-                  continue
+              else
-                fi
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-                sleep 10
-                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-                buildurl="${buildurl%$'\r'}"
-                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-                if ! curl -ifX POST \
-                  "${buildurl}submitDescription" \
-                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                  --data-urlencode "Submit=Submit"; then
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  echo "> Unable to change the Jenkins job description."
-                fi
-                sleep 20
               fi
             else
-              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
             fi
           done
-          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-            if [[ -n "${triggered_branches}" ]]; then
+          echo "**** Notifying Discord ****"
-              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/ \n"
+            "description": "**Package Check Build(s) Triggered for qbittorrent** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
-              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            fi
-            if [[ -n "${skipped_branches}" ]]; then
-              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
-            fi
-            echo "**** Notifying Discord ****"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Package Check Build(s) for qbittorrent** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-          fi

.github/workflows/permissions.yml

@@ -1,12 +0,0 @@
-name: Permission check
-on:
-  pull_request_target:
-    paths:
-      - '**/run'
-      - '**/finish'
-      - '**/check'
-      - 'root/migrations/*'
-
-jobs:
-  permission_check:
-    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 30
+        days-before-close: 365
+        exempt-issue-labels: 'awaiting-approval,work-in-progress'
+        exempt-pr-labels: 'awaiting-approval,work-in-progress'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -41,4 +41,3 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-.jenkins-external

Dockerfile

@@ -1,62 +1,53 @@
-# syntax=docker/dockerfile:1
+FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
-
-FROM ghcr.io/linuxserver/unrar:latest AS unrar
-
-FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
+LABEL maintainer="thelamer"
 
 # environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
-# install runtime packages and qbitorrent-cli
+# add repo and install qbitorrent
 RUN \
-  echo "**** install packages ****" && \
+ echo "***** add qbitorrent repositories ****" && \
-  apk add --no-cache \
+ apt-get update && \
-    grep \
+ apt-get install -y \
-    icu-libs \
+	gnupg \
-    p7zip \
+	python3 && \
-    python3 \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
-    qt6-qtbase-sqlite && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-  fi && \
+ echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
-  echo "***** install qbitorrent-cli ****" && \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
-  mkdir /qbt && \
+ fi && \
-  if [ -z ${QBT_CLI_VERSION+x} ]; then \
+ apt-get update && \
-    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
+ apt-get install -y \
-    | jq -r '. | .tag_name'); \
+	p7zip-full \
-  fi && \
+	qbittorrent-cli \
-  curl -o \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
-    /tmp/qbt.tar.gz -L \
+	unrar \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
+	geoip-bin \
-  tar xf \
+	unzip && \
-    /tmp/qbt.tar.gz -C \
+ echo "**** cleanup ****" && \
-    /qbt && \
+ apt-get clean && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+ rm -rf \
-  echo "**** cleanup ****" && \
+	/tmp/* \
-  rm -rf \
+	/var/lib/apt/lists/* \
-    /root/.cache \
+	/var/tmp/*
-    /tmp/*
 
 # add local files
 COPY root/ /
 
-# add unrar
-COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
-
 # ports and volumes
-EXPOSE 8080 6881 6881/udp
+EXPOSE 6881 6881/udp 8080
-
+VOLUME /config /downloads
-VOLUME /config

Dockerfile.aarch64

@@ -1,62 +1,53 @@
-# syntax=docker/dockerfile:1
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
-
-FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
-
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
+LABEL maintainer="thelamer"
 
 # environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
-# install runtime packages and qbitorrent-cli
+# add repo and install qbitorrent
 RUN \
-  echo "**** install packages ****" && \
+ echo "***** add qbitorrent repositories ****" && \
-  apk add --no-cache \
+ apt-get update && \
-    grep \
+ apt-get install -y \
-    icu-libs \
+	gnupg \
-    p7zip \
+	python3 && \
-    python3 \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
-    qt6-qtbase-sqlite && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-  fi && \
+ echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
-  echo "***** install qbitorrent-cli ****" && \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
-  mkdir /qbt && \
+ fi && \
-  if [ -z ${QBT_CLI_VERSION+x} ]; then \
+ apt-get update && \
-    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
+ apt-get install -y \
-    | jq -r '. | .tag_name'); \
+	p7zip-full \
-  fi && \
+	qbittorrent-cli \
-  curl -o \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
-    /tmp/qbt.tar.gz -L \
+	unrar \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-net6-${QBT_CLI_VERSION#v}.tar.gz" && \
+	geoip-bin \
-  tar xf \
+	unzip && \
-    /tmp/qbt.tar.gz -C \
+ echo "**** cleanup ****" && \
-    /qbt && \
+ apt-get clean && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+ rm -rf \
-  echo "**** cleanup ****" && \
+	/tmp/* \
-  rm -rf \
+	/var/lib/apt/lists/* \
-    /root/.cache \
+	/var/tmp/*
-    /tmp/*
 
 # add local files
 COPY root/ /
 
-# add unrar
-COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
-
 # ports and volumes
-EXPOSE 8080 6881 6881/udp
+EXPOSE 6881 6881/udp 8080
-
+VOLUME /config /downloads
-VOLUME /config

Dockerfile.armhf

@@ -0,0 +1,53 @@
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG QBITTORRENT_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="thelamer"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/config" \
+XDG_CONFIG_HOME="/config" \
+XDG_DATA_HOME="/config"
+
+# add repo and install qbitorrent
+RUN \
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python3 && \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "**** install packages ****" && \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+ fi && \
+ apt-get update && \
+ apt-get install -y \
+	p7zip-full \
+	qbittorrent-cli \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
+	unrar \
+	geoip-bin \
+	unzip && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+# ports and volumes
+EXPOSE 6881 6881/udp 8080
+VOLUME /config /downloads

README.md

@@ -1,9 +1,10 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read the CONTRIBUTING.md -->
+
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
 [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
@@ -11,16 +12,15 @@
 
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
-* regular and timely application updates
+ * regular and timely application updates
-* easy user mappings (PGID, PUID)
+ * easy user mappings (PGID, PUID)
-* custom base image with s6 overlay
+ * custom base image with s6 overlay
-* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+ * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
-* regular security updates
+ * regular security updates
 
 Find us at:
-
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
+* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -28,15 +28,14 @@ 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)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
 [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
-[![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)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Funstable%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/unstable/)
 [![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.
@@ -45,123 +44,94 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 ## Supported Architectures
 
-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://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/).
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/qbittorrent:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `ghcr.io/linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Available | Tag |
+| Architecture | Tag |
-| :----: | :----: | ---- |
+| :----: | --- |
-| x86-64 | ✅ | amd64-\<version tag\> |
+| x86-64 | amd64-latest |
-| arm64 | ✅ | arm64v8-\<version tag\> |
+| arm64 | arm64v8-latest |
-| armhf | ❌ | |
+| armhf | arm32v7-latest |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
 
-| Tag | Available | Description |
+| Tag | Description |
-| :----: | :----: |--- |
+| :----: | --- |
-| latest | ✅ | Stable qbittorrent releases |
+| latest | Stable qbittorrent releases |
-| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
+| unstable | Unstable qbittorrent releases |
-
-## Application Setup
-
-The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
-
-You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
-
-If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
-
-### WEBUI_PORT variable
-
-Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
-
-For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
-
-### TORRENTING_PORT
-
-A bittorrent client can be an active or a passive node. Running your client as an active node has the advantage of being able to connect to both active and passive peers, and can potentially increase the number of incoming connections. This requires an open port on the host machine which might differ from container's internal one.
-
-Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:6887, -p 6887:6887/udp and -e TORRENTING_PORT=6887 arguments to Docker.
-
-## Read-Only Operation
-
-This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
-
-## Non-Root Operation
-
-This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
 
 ## Usage
 
-To help you get started creating a container from this image you can either use docker-compose or the docker cli.
+Here are some example snippets to help you get started creating a container.
 
->[!NOTE]
+### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
 
-### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
+Compatible with docker-compose v2 schemas.
 
 ```yaml
 ---
+version: "2.1"
 services:
   qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:latest
+    image: ghcr.io/linuxserver/qbittorrent
     container_name: qbittorrent
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Etc/UTC
+      - TZ=Europe/London
+      - UMASK_SET=022
       - WEBUI_PORT=8080
-      - TORRENTING_PORT=6881
     volumes:
-      - /path/to/qbittorrent/appdata:/config
+      - </path/to/appdata/config>:/config
-      - /path/to/downloads:/downloads #optional
+      - </path/to/downloads>:/downloads
     ports:
-      - 8080:8080
       - 6881:6881
       - 6881:6881/udp
+      - 8080:8080
     restart: unless-stopped
 ```
 
-### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
+### docker cli
 
-```bash
+```
 docker run -d \
   --name=qbittorrent \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Etc/UTC \
+  -e TZ=Europe/London \
+  -e UMASK_SET=022 \
   -e WEBUI_PORT=8080 \
-  -e TORRENTING_PORT=6881 \
-  -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/qbittorrent/appdata:/config \
+  -p 8080:8080 \
-  -v /path/to/downloads:/downloads `#optional` \
+  -v </path/to/appdata/config>:/config \
+  -v </path/to/downloads>:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent:latest
+  ghcr.io/linuxserver/qbittorrent
 ```
 
+
 ## Parameters
 
-Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8080:8080` | WebUI |
+| `-p 6881` | tcp connection port |
-| `-p 6881:6881` | tcp connection port |
+| `-p 6881/udp` | udp connection port |
-| `-p 6881:6881/udp` | udp connection port |
+| `-p 8080` | http gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
+| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
-| `-e WEBUI_PORT=8080` | for changing the port of the web UI, see below for explanation |
+| `-e UMASK_SET=022` | for umask setting of qbittorrent, optional , default if left unset is 022 |
-| `-e TORRENTING_PORT=6881` | for changing the port of tcp/udp connection, see below for explanation |
+| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
-| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
-| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -169,11 +139,11 @@ You can set any environment variable from a file by using a special prepend `FIL
 
 As an example:
 
-```bash
+```
--e FILE__MYVAR=/run/secrets/mysecretvariable
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
 ```
 
-Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 
 ## Umask for running applications
 
@@ -182,176 +152,118 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
 
-```bash
+```
-id your_user
+  $ id username
+    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
 ```
 
-Example output:
 
-```text
+&nbsp;
-uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
+## Application Setup
+
+The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+
+Change username/password via the webui in the webui section of settings.  
+
+
+### WEBUI_PORT variable
+
+Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
+
+For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090  
+
+This should alleviate the "white screen" issue.  
+
+If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
+
+edit or add the following lines  
+
 ```
+WebUI\Address=*
+
+WebUI\ServerDomains=*
+```
+
 
 ## Docker Mods
-
 [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=qbittorrent&query=%24.mods%5B%27qbittorrent%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
 
 We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
 
+
 ## Support Info
 
-* Shell access whilst the container is running:
+* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
-
+* To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
-    ```bash
+* container version number
-    docker exec -it qbittorrent /bin/bash
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
-    ```
+* image version number
-
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/qbittorrent`
-* To monitor the logs of the container in realtime:
-
-    ```bash
-    docker logs -f qbittorrent
-    ```
-
-* Container version number:
-
-    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent
-    ```
-
-* Image version number:
-
-    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
-    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
-
+* Update all images: `docker-compose pull`
-* Update images:
+  * or update a single image: `docker-compose pull qbittorrent`
-    * All images:
+* Let compose update all containers as necessary: `docker-compose up -d`
-
+  * or update a single container: `docker-compose up -d qbittorrent`
-        ```bash
+* You can also remove the old dangling images: `docker image prune`
-        docker-compose pull
-        ```
-
-    * Single image:
-
-        ```bash
-        docker-compose pull qbittorrent
-        ```
-
-* Update containers:
-    * All containers:
-
-        ```bash
-        docker-compose up -d
-        ```
-
-    * Single container:
-
-        ```bash
-        docker-compose up -d qbittorrent
-        ```
-
-* You can also remove the old dangling images:
-
-    ```bash
-    docker image prune
-    ```
 
 ### Via Docker Run
-
+* Update the image: `docker pull ghcr.io/linuxserver/qbittorrent`
-* Update the image:
+* Stop the running container: `docker stop qbittorrent`
-
+* Delete the container: `docker rm qbittorrent`
-    ```bash
-    docker pull lscr.io/linuxserver/qbittorrent:latest
-    ```
-
-* Stop the running container:
-
-    ```bash
-    docker stop qbittorrent
-    ```
-
-* Delete the container:
-
-    ```bash
-    docker rm qbittorrent
-    ```
-
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images:
+* You can also remove the old dangling images: `docker image prune`
 
-    ```bash
+### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-    docker image prune
+* Pull the latest image at its tag and replace it with the same env variables in one run:
-    ```
+  ```
+  docker run --rm \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower \
+  --run-once qbittorrent
+  ```
+* You can also remove the old dangling images: `docker image prune`
+
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
-
+* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
->[!TIP]
->We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
 If you want to make local modifications to these images for development purposes or just to customize the logic:
-
+```
-```bash
 git clone https://github.com/linuxserver/docker-qbittorrent.git
 cd docker-qbittorrent
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/qbittorrent:latest .
+  -t ghcr.io/linuxserver/qbittorrent:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-
+```
-```bash
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Versions
 
-* **17.07.24:** - Restore qbittorrent-cli as it now supports openssl 3.
+* **05.07.20:** - Shift to Python3
-* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
+* **31.10.19:** - Adding unstable tag.
-* **14.02.24:** - Only set/override torrenting port if the optional env var is set.
-* **14.02.24:** - Add torrenting port support.
-* **31.01.24:** - Remove obsolete compat packages.
-* **25.12.23:** - Only pull stable releases of qbittorrent-cli.
-* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
-* **10.08.23:** - Bump unrar to 6.2.10.
-* **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
-* **10.06.23:** - Bump unrar to 6.2.8.
-* **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
-* **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
-* **31.10.22:** - Add libtorrentv1 branch.
-* **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.
-* **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
-* **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
-* **01.03.22:** - Add python for search plugin support.
-* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
-* **19.02.22:** - Add jq to build-stage
-* **07.01.22:** - Rebase to Alpine, build from source.
-* **06.01.22:** - Deprecate unstable branch.
-* **10.02.21:** - Rebase to focal.
-* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
-* **12.11.20:** - Stop creating /config/data directory on startup
-* **03.04.20:** - Fix adding search engine plugin
 * **02.08.19:** - Add qbitorrent-cli for processing scripts.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.

jenkins-vars.yml

@@ -2,10 +2,11 @@
 
 # jenkins variables
 project_name: docker-qbittorrent
-external_type: alpine_repo
+external_type: na
-release_type: stable
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
-release_tag: latest
+release_type: prerelease
-ls_branch: master
+release_tag: unstable
+ls_branch: unstable
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -14,16 +15,13 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
-  - DIST_IMAGE = 'alpine'
+  - DIST_IMAGE = 'ubuntu'
-  - 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='60'
+  - CI_DELAY='120'
-  - CI_DOCKERENV=''
+  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH=''
+  - CI_AUTH='user:password'
   - CI_WEBPATH=''

package_versions.txt

@@ -1,99 +1,180 @@
-NAME                                                      VERSION           TYPE     
+adduser3.116ubuntu1
-7zip                                                      24.09-r0          apk       
+apt1.6.12ubuntu0.2
-Alba.CsConsoleFormat                                      1.0.0             dotnet    
+apt-utils1.6.12ubuntu0.2
-BencodeNET                                                2.3.0             dotnet    
+base-files10.1ubuntu2.10
-CsvHelper                                                 12.1.2            dotnet    
+base-passwd3.5.44
-IPNetwork2                                                2.5.235           dotnet    
+bash4.4.18-2ubuntu1.2
-McMaster.Extensions.CommandLineUtils                      2.4.4             dotnet    
+bsdutils1:2.31.1-0.4ubuntu3.7
-Mono.Posix.NETStandard                                    1.0.0             dotnet    
+bzip21.0.6-8.1ubuntu0.2
-NJsonSchema                                               9.14.1            dotnet    
+ca-certificates20201027ubuntu0.18.04.1
-Newtonsoft.Json                                           13.0.3            dotnet    
+coreutils8.28-1ubuntu1
-Portable.BouncyCastle                                     1.8.8             dotnet    
+curl7.58.0-2ubuntu3.12
-Portable.Xaml                                             0.18.0            dotnet    
+dash0.5.8-2.10
-QBittorrent.Client                                        1.9.24285.1       dotnet    
+dbus1.12.2-1ubuntu1.2
-System.Security.Cryptography.ProtectedData                5.0.0             dotnet    
+debconf1.5.66ubuntu1
-acl-libs                                                  2.3.2-r1          apk       
+debianutils4.8.4
-alpine-baselayout                                         3.7.0-r0          apk       
+diffutils1:3.6-1
-alpine-baselayout-data                                    3.7.0-r0          apk       
+dirmngr2.2.4-1ubuntu1.3
-alpine-keys                                               2.5-r0            apk       
+dpkg1.19.0.5ubuntu2.3
-apk-tools                                                 2.14.9-r1         apk       
+e2fsprogs1.44.1-1ubuntu1.3
-bash                                                      5.2.37-r0         apk       
+fdisk2.31.1-0.4ubuntu3.7
-brotli-libs                                               1.1.0-r2          apk       
+file1:5.32-2ubuntu0.4
-busybox                                                   1.37.0-r16        apk       
+findutils4.6.0+git+20170828-2
-busybox-binsh                                             1.37.0-r16        apk       
+gcc-8-base8.4.0-1ubuntu1~18.04
-c-ares                                                    1.34.5-r0         apk       
+geoip-bin1.6.12-1
-ca-certificates                                           20241121-r2       apk       
+geoip-database20180315-1
-ca-certificates-bundle                                    20241121-r2       apk       
+gnupg2.2.4-1ubuntu1.3
-catatonit                                                 0.2.1-r0          apk       
+gnupg-l10n2.2.4-1ubuntu1.3
-coreutils                                                 9.7-r1            apk       
+gnupg-utils2.2.4-1ubuntu1.3
-coreutils-env                                             9.7-r1            apk       
+gpg2.2.4-1ubuntu1.3
-coreutils-fmt                                             9.7-r1            apk       
+gpg-agent2.2.4-1ubuntu1.3
-coreutils-sha512sum                                       9.7-r1            apk       
+gpgconf2.2.4-1ubuntu1.3
-curl                                                      8.13.0-r1         apk       
+gpgsm2.2.4-1ubuntu1.3
-dbus-libs                                                 1.16.2-r1         apk       
+gpgv2.2.4-1ubuntu1.3
-double-conversion                                         3.3.1-r0          apk       
+gpg-wks-client2.2.4-1ubuntu1.3
-duktape-libs                                              2.7.0-r2          apk       
+gpg-wks-server2.2.4-1ubuntu1.3
-findutils                                                 4.10.0-r0         apk       
+grep3.1-2build1
-gdbm                                                      1.24-r0           apk       
+gzip1.6-5ubuntu1
-glib                                                      2.84.1-r0         apk       
+hostname3.20
-grep                                                      3.12-r0           apk       
+init-system-helpers1.51
-icu-data-en                                               76.1-r0           apk       
+krb5-locales1.16-2ubuntu0.2
-icu-libs                                                  76.1-r0           apk       
+libacl12.2.52-3build1
-jq                                                        1.7.1-r0          apk       
+libapparmor12.12-4ubuntu5.1
-libapk2                                                   2.14.9-r1         apk       
+libapt-inst2.01.6.12ubuntu0.2
-libattr                                                   2.5.2-r2          apk       
+libapt-pkg5.01.6.12ubuntu0.2
-libb2                                                     0.98.1-r3         apk       
+libasn1-8-heimdal7.5.0+dfsg-1
-libblkid                                                  2.41-r4           apk       
+libassuan02.5.1-2
-libbsd                                                    0.12.2-r0         apk       
+libattr11:2.4.47-2build1
-libbz2                                                    1.0.8-r6          apk       
+libaudit11:2.8.2-1ubuntu1
-libcrypto3                                                3.5.0-r0          apk       
+libaudit-common1:2.8.2-1ubuntu1
-libcurl                                                   8.13.0-r1         apk       
+libblkid12.31.1-0.4ubuntu3.7
-libeconf                                                  0.6.3-r0          apk       
+libboost-system1.65.11.65.1+dfsg-0ubuntu5
-libexpat                                                  2.7.1-r0          apk       
+libbz2-1.01.0.6-8.1ubuntu0.2
-libffi                                                    3.4.8-r0          apk       
+libc62.27-3ubuntu1.4
-libgcc                                                    14.2.0-r5         apk       
+libcap-ng00.7.7-3.1
-libgomp                                                   14.2.0-r5         apk       
+libc-bin2.27-3ubuntu1.4
-libidn2                                                   2.3.7-r0          apk       
+libcom-err21.44.1-1ubuntu1.3
-libintl                                                   0.24-r0           apk       
+libcurl47.58.0-2ubuntu3.12
-libmd                                                     1.1.0-r0          apk       
+libdb5.35.3.28-13.1ubuntu1.1
-libmount                                                  2.41-r4           apk       
+libdbus-1-31.12.2-1ubuntu1.2
-libncursesw                                               6.5_p20250405-r0  apk       
+libdebconfclient00.213ubuntu1
-libpanelw                                                 6.5_p20250405-r0  apk       
+libdouble-conversion12.0.1-4ubuntu1
-libpcre2-16                                               10.43-r1          apk       
+libexpat12.2.5-3ubuntu0.2
-libproc2                                                  4.0.4-r2          apk       
+libext2fs21.44.1-1ubuntu1.3
-libproxy                                                  0.5.9-r0          apk       
+libfdisk12.31.1-0.4ubuntu3.7
-libpsl                                                    0.21.5-r3         apk       
+libffi63.2.1-8
-libssl3                                                   3.5.0-r0          apk       
+libgcc11:8.4.0-1ubuntu1~18.04
-libstdc++                                                 14.2.0-r5         apk       
+libgcrypt201.8.1-4ubuntu1.2
-libtorrent-rasterbar                                      2.0.11-r0         apk       
+libgeoip11.6.12-1
-libunistring                                              1.3-r0            apk       
+libglib2.0-02.56.4-0ubuntu0.18.04.6
-linux-pam                                                 1.7.0-r2          apk       
+libglib2.0-data2.56.4-0ubuntu0.18.04.6
-mpdecimal                                                 4.0.0-r0          apk       
+libgmp102:6.1.2+dfsg-2
-musl                                                      1.2.5-r10         apk       
+libgnutls303.5.18-1ubuntu1.4
-musl-utils                                                1.2.5-r10         apk       
+libgpg-error01.27-6
-ncurses-terminfo-base                                     6.5_p20250405-r0  apk       
+libgssapi3-heimdal7.5.0+dfsg-1
-netcat-openbsd                                            1.228.1-r0        apk       
+libgssapi-krb5-21.16-2ubuntu0.2
-nghttp2-libs                                              1.65.0-r0         apk       
+libhcrypto4-heimdal7.5.0+dfsg-1
-oniguruma                                                 6.9.10-r0         apk       
+libheimbase1-heimdal7.5.0+dfsg-1
-pcre2                                                     10.43-r1          apk       
+libheimntlm0-heimdal7.5.0+dfsg-1
-procps-ng                                                 4.0.4-r2          apk       
+libhogweed43.4-1
-pyc                                                       3.12.10-r0        apk       
+libhx509-5-heimdal7.5.0+dfsg-1
-python3                                                   3.12.10-r0        apk       
+libicu6060.2-3ubuntu3.1
-python3-pyc                                               3.12.10-r0        apk       
+libidn2-02.0.4-1.1ubuntu0.2
-python3-pycache-pyc0                                      3.12.10-r0        apk       
+libk5crypto31.16-2ubuntu0.2
-qbittorrent-nox                                           5.0.4-r0          apk       
+libkeyutils11.5.9-9.2ubuntu2
-qbt                                                       1.8.24285.1       dotnet    
+libkrb5-26-heimdal7.5.0+dfsg-1
-qt6-qtbase                                                6.8.2-r1          apk       
+libkrb5-31.16-2ubuntu0.2
-qt6-qtbase-sqlite                                         6.8.2-r1          apk       
+libkrb5support01.16-2ubuntu0.2
-readline                                                  8.2.13-r0         apk       
+libksba81.3.5-2
-runtimepack.Microsoft.NETCore.App.Runtime.linux-musl-x64  6.0.35            dotnet    
+libldap-2.4-22.4.45+dfsg-1ubuntu1.8
-scanelf                                                   1.3.8-r1          apk       
+libldap-common2.4.45+dfsg-1ubuntu1.8
-shadow                                                    4.17.3-r0         apk       
+liblz4-10.0~r131-2ubuntu3
-skalibs-libs                                              2.14.3.0-r0       apk       
+liblzma55.2.2-1.3
-sqlite-libs                                               3.49.1-r0         apk       
+libmagic11:5.32-2ubuntu0.4
-ssl_client                                                1.37.0-r16        apk       
+libmagic-mgc1:5.32-2ubuntu0.4
-tzdata                                                    2025b-r0          apk       
+libmount12.31.1-0.4ubuntu3.7
-utmps-libs                                                0.1.2.3-r2        apk       
+libmpdec22.4.2-1ubuntu1
-xz-libs                                                   5.8.1-r0          apk       
+libncurses56.1-1ubuntu1.18.04
-zlib                                                      1.3.1-r2          apk       
+libncursesw56.1-1ubuntu1.18.04
-zstd-libs                                                 1.5.7-r0          apk       
+libnettle63.4-1
+libnghttp2-141.30.0-1ubuntu1
+libnpth01.5-3
+libp11-kit00.23.9-2ubuntu0.1
+libpam0g1.1.8-3.6ubuntu2.18.04.2
+libpam-modules1.1.8-3.6ubuntu2.18.04.2
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
+libpam-runtime1.1.8-3.6ubuntu2.18.04.2
+libpcre32:8.39-9
+libprocps62:3.3.12-3ubuntu1.2
+libpsl50.19.1-5build1
+libpython3.6-minimal3.6.9-1~18.04ubuntu1.3
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1.3
+libpython3-stdlib3.6.7-1~18.04
+libqt5core5a5.9.5+dfsg-0ubuntu2.5
+libqt5dbus55.9.5+dfsg-0ubuntu2.5
+libqt5network55.9.5+dfsg-0ubuntu2.5
+libqt5xml55.9.5+dfsg-0ubuntu2.5
+libreadline77.0-3
+libroken18-heimdal7.5.0+dfsg-1
+librtmp12.4+20151223.gitfa8646d.1-1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.3
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libseccomp22.4.3-1ubuntu3.18.04.3
+libselinux12.7-2build2
+libsemanage12.7-2build2
+libsemanage-common2.7-2build2
+libsepol12.7-1
+libsmartcols12.31.1-0.4ubuntu3.7
+libsqlite3-03.22.0-1ubuntu0.4
+libss21.44.1-1ubuntu1.3
+libssl1.0.01.0.2n-1ubuntu5.5
+libssl1.11.1.1-1ubuntu2.1~18.04.7
+libstdc++68.4.0-1ubuntu1~18.04
+libsystemd0237-3ubuntu10.43
+libtasn1-64.13-2
+libtinfo56.1-1ubuntu1.18.04
+libtorrent-rasterbar101.2.12+git20210104.bfafd20428-1ppa1~18.04
+libudev1237-3ubuntu10.43
+libunistring20.9.9-0ubuntu2
+libuuid12.31.1-0.4ubuntu3.7
+libwind0-heimdal7.5.0+dfsg-1
+libxml22.9.4+dfsg1-6.1ubuntu1.3
+libzstd11.3.3+dfsg-2ubuntu1.1
+locales2.27-3ubuntu1.4
+login1:4.5-1ubuntu2
+lsb-base9.20170808ubuntu1
+mawk1.3.3-17ubuntu3
+mime-support3.60ubuntu1
+mount2.31.1-0.4ubuntu3.7
+ncurses-base6.1-1ubuntu1.18.04
+ncurses-bin6.1-1ubuntu1.18.04
+openssl1.1.1-1ubuntu2.1~18.04.7
+p7zip16.02+dfsg-6
+p7zip-full16.02+dfsg-6
+passwd1:4.5-1ubuntu2
+perl-base5.26.1-6ubuntu0.5
+pinentry-curses1.1.0-1
+procps2:3.3.12-3ubuntu1.2
+publicsuffix20180223.1310-1
+python33.6.7-1~18.04
+python3.63.6.9-1~18.04ubuntu1.3
+python3.6-minimal3.6.9-1~18.04ubuntu1.3
+python3-minimal3.6.7-1~18.04
+qbittorrent-cli1.6.20334-1
+qbittorrent-nox4.4.0~202012311433-7161-a579b4a51~ubuntu18.04.1
+qttranslations5-l10n5.9.5-0ubuntu1
+readline-common7.0-3
+sed4.4-2
+sensible-utils0.0.12
+shared-mime-info1.9-2
+sysvinit-utils2.88dsf-59.10ubuntu1
+tar1.29b-2ubuntu0.1
+tzdata2020d-0ubuntu0.18.04
+ubuntu-keyring2018.09.18.1~18.04.0
+unrar1:5.5.8-1
+unzip6.0-21ubuntu1.1
+util-linux2.31.1-0.4ubuntu3.7
+xdg-user-dirs0.17-1ubuntu1
+xz-utils5.2.2-1.3
+zlib1g1:1.2.11.dfsg-0ubuntu2

readme-vars.yml

@@ -6,137 +6,84 @@ project_url: "https://www.qbittorrent.org/"
 project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/qbittorrent-icon.png"
 project_blurb: "The [{{ project_name|capitalize }}]({{ project_url }}) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_categories: "Downloaders"
+
 # supported architectures
 available_architectures:
-  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
+
 # development version
 development_versions: true
 development_versions_items:
-  - {tag: "latest", desc: "Stable qbittorrent releases"}
+  - { tag: "latest", desc: "Stable qbittorrent releases" }
-  - {tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1"}
+  - { tag: "unstable", desc: "Unstable qbittorrent releases" }
+
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files."}
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/downloads", vol_host_path: "</path/to/downloads>", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
-  - {external_port: "8080", internal_port: "8080", port_desc: "WebUI"}
+  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
-  - {external_port: "6881", internal_port: "6881", port_desc: "tcp connection port"}
+  - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
-  - {external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port"}
+  - { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
 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: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
-  - {env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation"}
+  - { env_var: "UMASK_SET", env_value: "022", desc: "for umask setting of qbittorrent, optional , default if left unset is 022"}
-opt_param_usage_include_vols: true
+  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}
-opt_param_volumes:
+
-  - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk."}
+# optional parameters
-readonly_supported: true
+optional_block_1: false
-nonroot_supported: true
+optional_block_1_items: ""
+
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
+  The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+  
+  Change username/password via the webui in the webui section of settings.  
 
-  You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
-
-  If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
 
   ### WEBUI_PORT variable
+  
+  Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
+  
+  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090  
+  
+  This should alleviate the "white screen" issue.  
+  
+  If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
+  
+  edit or add the following lines  
 
-  Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
+  ```
+  WebUI\Address=*
+  
+  WebUI\ServerDomains=*
+  ```
 
-  For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
-
-  ### TORRENTING_PORT
-
-  A bittorrent client can be an active or a passive node. Running your client as an active node has the advantage of being able to connect to both active and passive peers, and can potentially increase the number of incoming connections. This requires an open port on the host machine which might differ from container's internal one.
-
-  Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:6887, -p 6887:6887/udp and -e TORRENTING_PORT=6887 arguments to Docker.
-# init diagram
-init_diagram: |
-  "qbittorrent:latest": {
-    docker-mods
-    base {
-      fix-attr +\nlegacy cont-init
-    }
-    docker-mods -> base
-    legacy-services
-    custom services
-    init-services -> legacy-services
-    init-services -> custom services
-    custom services -> legacy-services
-    legacy-services -> ci-service-check
-    init-migrations -> init-adduser
-    init-os-end -> init-config
-    init-config -> init-config-end
-    init-crontab-config -> init-config-end
-    init-qbittorrent-config -> init-config-end
-    init-config -> init-crontab-config
-    init-mods-end -> init-custom-files
-    base -> init-envfile
-    base -> init-migrations
-    init-config-end -> init-mods
-    init-mods-package-install -> init-mods-end
-    init-mods -> init-mods-package-install
-    init-adduser -> init-os-end
-    init-envfile -> init-os-end
-    init-config -> init-qbittorrent-config
-    init-custom-files -> init-services
-    init-services -> svc-cron
-    svc-cron -> legacy-services
-    init-services -> svc-qbittorrent
-    svc-qbittorrent -> legacy-services
-  }
-  Base Images: {
-    "baseimage-alpine:edge"
-  }
-  "qbittorrent:latest" <- Base Images
 # changelog
 changelogs:
-  - {date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3."}
+  - { date: "05.07.20:", desc: "Shift to Python3" }
-  - {date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
+  - { date: "31.10.19:", desc: "Adding unstable tag." }
-  - {date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set."}
+  - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
-  - {date: "14.02.24:", desc: "Add torrenting port support."}
+  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - {date: "31.01.24:", desc: "Remove obsolete compat packages."}
+  - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
-  - {date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
+  - { date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3." }
-  - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - { date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2." }
-  - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1." }
-  - {date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)."}
+  - { date: "26.04.18:", desc: "Bump libtorrent to 1.1.7." }
-  - {date: "10.06.23:", desc: "Bump unrar to 6.2.8."}
+  - { date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6." }
-  - {date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - { date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
-  - {date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli."}
+  - { date: "19.12.17:", desc: "Update to v4.0.3." }
-  - {date: "31.10.22:", desc: "Add libtorrentv1 branch."}
+  - { date: "09.02.17:", desc: "Rebase to alpine 3.7" }
-  - {date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases."}
+  - { date: "01.12.17:", desc: "Update to v4.0.2." }
-  - {date: "12.08.22:", desc: "Bump unrar to 6.1.7."}
+  - { date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds." }
-  - {date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge."}
+  - { date: "16.09.17:", desc: "Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui." }
-  - {date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo."}
+  - { date: "01.08.17:", desc: "Initial Release." }
-  - {date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli."}
+  - { date: "12.02.18:", desc: "Initial Release." }
-  - {date: "01.03.22:", desc: "Add python for search plugin support."}
-  - {date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos."}
-  - {date: "19.02.22:", desc: "Add jq to build-stage"}
-  - {date: "07.01.22:", desc: "Rebase to Alpine, build from source."}
-  - {date: "06.01.22:", desc: "Deprecate unstable branch."}
-  - {date: "10.02.21:", desc: "Rebase to focal."}
-  - {date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."}
-  - {date: "12.11.20:", desc: "Stop creating /config/data directory on startup"}
-  - {date: "03.04.20:", desc: "Fix adding search engine plugin"}
-  - {date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts."}
-  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - {date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic."}
-  - {date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3."}
-  - {date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2."}
-  - {date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1."}
-  - {date: "26.04.18:", desc: "Bump libtorrent to 1.1.7."}
-  - {date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6."}
-  - {date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling."}
-  - {date: "19.12.17:", desc: "Update to v4.0.3."}
-  - {date: "09.02.17:", desc: "Rebase to alpine 3.7"}
-  - {date: "01.12.17:", desc: "Update to v4.0.2."}
-  - {date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds."}
-  - {date: "16.09.17:", desc: "Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui."}
-  - {date: "01.08.17:", desc: "Initial Release."}
-  - {date: "12.02.18:", desc: "Initial Release."}

root/etc/cont-init.d/30-config

@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p \
+	/config/qBittorrent \
+	/config/data
+
+# copy config
+[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
+	cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
+
+# chown download directory if currently set to root
+if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+	chown -R abc:abc /downloads
+fi
+
+# permissions
+chown -R abc:abc \
+	/config

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

@@ -1,21 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# make our folder
-mkdir -p /config/qBittorrent
-
-# copy default config
-if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
-    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-fi
-
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    # chown download directory if currently not set to abc
-    if grep -qe ' /downloads ' /proc/mounts; then
-        lsiown abc:abc /downloads
-    fi
-
-    # permissions
-    lsiown -R abc:abc \
-        /config
-fi

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

@@ -1 +0,0 @@
-oneshot

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

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd

@@ -1 +0,0 @@
-3

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

@@ -1,21 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-WEBUI_PORT=${WEBUI_PORT:-8080}
-if [[ -n "${TORRENTING_PORT}" ]]; then
-    TORRENTING_PORT_ARG="--torrenting-port=${TORRENTING_PORT}"
-fi
-
-WEBUI_ADDRESS=$(grep -Po "^WebUI\\\Address=\K(.*)" /config/qBittorrent/qBittorrent.conf)
-if [[ -z ${WEBUI_ADDRESS} ]] || [[ ${WEBUI_ADDRESS} == "*" ]]; then
-    WEBUI_ADDRESS="localhost"
-fi
-
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
-        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
-else
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
-        /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
-fi

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

@@ -1 +0,0 @@
-longrun

root/etc/services.d/qbittorrent/run

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+UMASK_SET=${UMASK_SET:-022}
+WEBUI_PORT=${WEBUI_PORT:-8080}
+
+umask "$UMASK_SET"
+
+exec \
+	s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"

root/usr/bin/qbt

@@ -1,15 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# qbt bash wrapper to prompt user when trying to save password
-if [[ "$@" == "settings set password" ]]; then
-  echo "Setting password is not supported"
-  echo "Please use --ask-for-password or --password"
-elif [[ "$@" == "settings set"* ]]; then
-  /qbt/qbt "$@"
-elif [[ "$@" != *"--ask-for-password"* ]] && [[ "$@" != *"--password"* ]];then
-  echo "Please use --ask-for-password or --password and ensure username/url are set"
-  /qbt/qbt "$@"
-else
-  /qbt/qbt "$@"
-fi