Bot Updating Package Versions

Drop qbittorrent-cli

.github/ISSUE_TEMPLATE/issue.bug.yml

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

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

Dockerfile

@@ -8,7 +8,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:edge
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
+ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
@@ -19,15 +19,9 @@ XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
@@ -37,19 +31,8 @@ RUN \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
-  mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Dockerfile.aarch64

@@ -8,7 +8,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
+ARG QBT_CLI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
@@ -19,15 +19,9 @@ XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
   echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache \
     icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
     p7zip \
     python3 \
     qt6-qtbase-sqlite && \
@@ -37,19 +31,8 @@ RUN \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
-  mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Jenkinsfile

@@ -16,6 +16,7 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
     CONTAINER_NAME = 'qbittorrent'
     BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
     LS_USER = 'linuxserver'
@@ -32,9 +33,9 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8080'
     CI_SSL='false'
-    CI_DELAY='120'
+    CI_DELAY='60'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
-    CI_AUTH='user:password'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
@@ -61,11 +62,16 @@ pipeline {
           env.COMMIT_SHA = sh(
             script: '''git rev-parse HEAD''',
             returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
           env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
         }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
         script{
           env.LS_RELEASE_NUMBER = sh(
             script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -124,7 +130,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
             returnStdout: true).trim()
 
           def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -142,7 +148,7 @@ pipeline {
           }
 
           if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
               env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
             }
             println("SEMVER: ${env.SEMVER}")
@@ -243,9 +249,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -264,8 +272,15 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Cloned repo paths for templating:
-              # Stage 1 - Jenkinsfile update
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
@@ -274,16 +289,17 @@ pipeline {
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "Jenkinsfile is up to date."
               fi
-              # Stage 2 - Delete old templates
+              echo "Starting Stage 2 - Delete old templates"
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -298,15 +314,16 @@ pipeline {
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "No templates to delete"
               fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 3 - Update templates"
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -327,19 +344,34 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
               fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
               mkdir -p ${TEMPDIR}/docs
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                 cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                 git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
               fi
               mkdir -p ${TEMPDIR}/unraid
               git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
@@ -349,9 +381,13 @@ pipeline {
               elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -362,7 +398,42 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
               fi
               rm -Rf ${TEMPDIR}'''
         script{
@@ -426,6 +497,8 @@ pipeline {
             "merge_requests_access_level":"disabled",\
             "repository_access_level":"enabled",\
             "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
       } 
     }
     /* ###############
@@ -456,6 +529,7 @@ pipeline {
           --label \"org.opencontainers.image.title=Qbittorrent\" \
           --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -487,6 +561,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Qbittorrent\" \
               --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -515,6 +590,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Qbittorrent\" \
               --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
@@ -541,7 +617,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -562,7 +638,8 @@ pipeline {
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -637,7 +714,7 @@ pipeline {
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
                 -e PORT=\"${CI_PORT}\" \
@@ -665,12 +742,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -681,7 +752,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -712,12 +783,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -728,7 +793,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -757,35 +822,13 @@ pipeline {
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                  done
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                     if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
                     fi
                   done
                '''
@@ -858,39 +901,6 @@ EOF
           ) '''
       }
     }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
-      when {
-        environment name: 'CHANGE_ID', value: ''
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
-      }
-    }
     // If this is a Pull request send the CI link as a comment on it
     stage('Pull Request Comment') {
       when {

README.md

@@ -28,7 +28,7 @@ Find us at:
 
 # [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fqbittorrent)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
@@ -68,29 +68,23 @@ This image provides various versions that are available via tags. Please read th
 
 ## Application Setup
 
-The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
 
-Change username/password via the webui in the webui section of settings.  
+You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
+
+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.  
+Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
 
 For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
 
-This should alleviate the "white screen" issue.  
+### TORRENTING_PORT
 
-If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
+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.
 
-edit or add the following lines  
+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.
-
-```text
-WebUI\Address=*
-
-WebUI\ServerDomains=*
-```
-
-If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
 
 ## Usage
 
@@ -100,7 +94,6 @@ To help you get started creating a container from this image you can either use
 
 ```yaml
 ---
-version: "2.1"
 services:
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -110,8 +103,9 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
       - WEBUI_PORT=8080
+      - TORRENTING_PORT=6881
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/qbittorrent/appdata:/config
       - /path/to/downloads:/downloads
     ports:
       - 8080:8080
@@ -129,10 +123,11 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
   -e WEBUI_PORT=8080 \
+  -e TORRENTING_PORT=6881 \
   -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/qbittorrent/appdata:/config \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent:latest
@@ -150,7 +145,8 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
+| `-e WEBUI_PORT=8080` | for changing the port of the web UI, see below for explanation |
+| `-e TORRENTING_PORT=6881` | for changing the port of tcp/udp connection, see below for explanation |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 
@@ -223,7 +219,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
@@ -288,21 +284,6 @@ Below are the instructions for updating containers:
     docker image prune
     ```
 
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-    ```bash
-    docker run --rm \
-      -v /var/run/docker.sock:/var/run/docker.sock \
-      containrrr/watchtower \
-      --run-once qbittorrent
-    ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**warning**: 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)
 
 **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
@@ -330,6 +311,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
+* **14.02.24:** - Only set/override torrenting port if the optional env var is set.
+* **14.02.24:** - Add torrenting port support.
+* **31.01.24:** - Remove obsolete compat packages.
+* **25.12.23:** - Only pull stable releases of qbittorrent-cli.
 * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.
 * **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).

jenkins-vars.yml

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

package_versions.txt

@@ -1,261 +1,83 @@
 NAME                    VERSION                TYPE   
 7zip                    23.01-r0               apk     
-Alba.CsConsoleFormat                               1.0.0.89               dotnet  
+alpine-baselayout       3.6.5-r0               apk     
-BencodeNET                                         2.3.0.0                dotnet  
+alpine-baselayout-data  3.6.5-r0               apk     
-BouncyCastle.Crypto                                1.8.8.2                dotnet  
-CsvHelper                                          12.0.0.0               dotnet  
-Json.NET.NETStandard2.0                            13.0.1.25517           dotnet  
-McMaster.Extensions.CommandLineUtils               2.4.4.0                dotnet  
-Microsoft.CSharp                                   4.700.22.56512         dotnet  
-Microsoft.VisualBasic                              4.700.22.56512         dotnet  
-Microsoft.VisualBasic.Core                         4.700.22.56512         dotnet  
-Microsoft.Win32.Primitives                         4.700.22.56512         dotnet  
-Microsoft.Win32.Registry                           4.700.22.56512         dotnet  
-Mono.Posix.NETStandard.dll                         1.0.0.0                dotnet  
-NJsonSchema                                        9.14.1.0               dotnet  
-Portable.Xaml.dll                                  0.18.0.0               dotnet  
-QBittorrent.Client                                 1.8.23016.2            dotnet  
-System                                             4.700.22.56512         dotnet  
-System.AppContext                                  4.700.22.56512         dotnet  
-System.Buffers                                     4.700.22.56512         dotnet  
-System.Collections                                 4.700.22.56512         dotnet  
-System.Collections.Concurrent                      4.700.22.56512         dotnet  
-System.Collections.Immutable                       4.700.22.56512         dotnet  
-System.Collections.NonGeneric                      4.700.22.56512         dotnet  
-System.Collections.Specialized                     4.700.22.56512         dotnet  
-System.ComponentModel                              4.700.22.56512         dotnet  
-System.ComponentModel.Annotations                  4.700.22.56512         dotnet  
-System.ComponentModel.DataAnnotations              4.700.22.56512         dotnet  
-System.ComponentModel.EventBasedAsync              4.700.22.56512         dotnet  
-System.ComponentModel.Primitives                   4.700.22.56512         dotnet  
-System.ComponentModel.TypeConverter                4.700.22.56512         dotnet  
-System.Configuration                               4.700.22.56512         dotnet  
-System.Console                                     4.700.22.56512         dotnet  
-System.Core                                        4.700.22.56512         dotnet  
-System.Data                                        4.700.22.56512         dotnet  
-System.Data.Common                                 4.700.22.56512         dotnet  
-System.Data.DataSetExtensions                      4.700.22.56512         dotnet  
-System.Diagnostics.Contracts                       4.700.22.56512         dotnet  
-System.Diagnostics.Debug                           4.700.22.56512         dotnet  
-System.Diagnostics.DiagnosticSource                4.700.22.56512         dotnet  
-System.Diagnostics.FileVersionInfo                 4.700.22.56512         dotnet  
-System.Diagnostics.Process                         4.700.22.56512         dotnet  
-System.Diagnostics.StackTrace                      4.700.22.56512         dotnet  
-System.Diagnostics.TextWriterTraceListener         4.700.22.56512         dotnet  
-System.Diagnostics.Tools                           4.700.22.56512         dotnet  
-System.Diagnostics.TraceSource                     4.700.22.56512         dotnet  
-System.Diagnostics.Tracing                         4.700.22.56512         dotnet  
-System.Drawing                                     4.700.22.56512         dotnet  
-System.Drawing.Primitives                          4.700.22.56512         dotnet  
-System.Dynamic.Runtime                             4.700.22.56512         dotnet  
-System.Globalization                               4.700.22.56512         dotnet  
-System.Globalization.Calendars                     4.700.22.56512         dotnet  
-System.Globalization.Extensions                    4.700.22.56512         dotnet  
-System.IO                                          4.700.22.56512         dotnet  
-System.IO.Compression                              4.700.22.56512         dotnet  
-System.IO.Compression.Brotli                       4.700.22.56512         dotnet  
-System.IO.Compression.FileSystem                   4.700.22.56512         dotnet  
-System.IO.Compression.ZipFile                      4.700.22.56512         dotnet  
-System.IO.FileSystem                               4.700.22.56512         dotnet  
-System.IO.FileSystem.AccessControl                 4.700.22.56512         dotnet  
-System.IO.FileSystem.DriveInfo                     4.700.22.56512         dotnet  
-System.IO.FileSystem.Primitives                    4.700.22.56512         dotnet  
-System.IO.FileSystem.Watcher                       4.700.22.56512         dotnet  
-System.IO.IsolatedStorage                          4.700.22.56512         dotnet  
-System.IO.MemoryMappedFiles                        4.700.22.56512         dotnet  
-System.IO.Pipes                                    4.700.22.56512         dotnet  
-System.IO.Pipes.AccessControl                      4.700.22.56512         dotnet  
-System.IO.UnmanagedMemoryStream                    4.700.22.56512         dotnet  
-System.Linq                                        4.700.22.56512         dotnet  
-System.Linq.Expressions                            4.700.22.56512         dotnet  
-System.Linq.Parallel                               4.700.22.56512         dotnet  
-System.Linq.Queryable                              4.700.22.56512         dotnet  
-System.Memory                                      4.700.22.56512         dotnet  
-System.Net                                         4.700.22.56512         dotnet  
-System.Net.Http                                    4.700.22.56512         dotnet  
-System.Net.HttpListener                            4.700.22.56512         dotnet  
-System.Net.IPNetwork                               2.5.235                dotnet  
-System.Net.Mail                                    4.700.22.56512         dotnet  
-System.Net.NameResolution                          4.700.22.56512         dotnet  
-System.Net.NetworkInformation                      4.700.22.56512         dotnet  
-System.Net.Ping                                    4.700.22.56512         dotnet  
-System.Net.Primitives                              4.700.22.56512         dotnet  
-System.Net.Requests                                4.700.22.56512         dotnet  
-System.Net.Security                                4.700.22.56512         dotnet  
-System.Net.ServicePoint                            4.700.22.56512         dotnet  
-System.Net.Sockets                                 4.700.22.56512         dotnet  
-System.Net.WebClient                               4.700.22.56512         dotnet  
-System.Net.WebHeaderCollection                     4.700.22.56512         dotnet  
-System.Net.WebProxy                                4.700.22.56512         dotnet  
-System.Net.WebSockets                              4.700.22.56512         dotnet  
-System.Net.WebSockets.Client                       4.700.22.56512         dotnet  
-System.Numerics                                    4.700.22.56512         dotnet  
-System.Numerics.Vectors                            4.700.22.56512         dotnet  
-System.ObjectModel                                 4.700.22.56512         dotnet  
-System.Private.CoreLib                             4.700.22.55902         dotnet  
-System.Private.DataContractSerialization           4.700.22.56512         dotnet  
-System.Private.Uri                                 4.700.22.56512         dotnet  
-System.Private.Xml                                 4.700.22.56512         dotnet  
-System.Private.Xml.Linq                            4.700.22.56512         dotnet  
-System.Reflection                                  4.700.22.56512         dotnet  
-System.Reflection.DispatchProxy                    4.700.22.56512         dotnet  
-System.Reflection.Emit                             4.700.22.56512         dotnet  
-System.Reflection.Emit.ILGeneration                4.700.22.56512         dotnet  
-System.Reflection.Emit.Lightweight                 4.700.22.56512         dotnet  
-System.Reflection.Extensions                       4.700.22.56512         dotnet  
-System.Reflection.Metadata                         4.700.22.56512         dotnet  
-System.Reflection.Primitives                       4.700.22.56512         dotnet  
-System.Reflection.TypeExtensions                   4.700.22.56512         dotnet  
-System.Resources.Reader                            4.700.22.56512         dotnet  
-System.Resources.ResourceManager                   4.700.22.56512         dotnet  
-System.Resources.Writer                            4.700.22.56512         dotnet  
-System.Runtime                                     4.700.22.56512         dotnet  
-System.Runtime.CompilerServices.VisualC            4.700.22.56512         dotnet  
-System.Runtime.Extensions                          4.700.22.56512         dotnet  
-System.Runtime.Handles                             4.700.22.56512         dotnet  
-System.Runtime.InteropServices                     4.700.22.56512         dotnet  
-System.Runtime.InteropServices.RuntimeInformation  4.700.22.56512         dotnet  
-System.Runtime.InteropServices.WindowsRuntime      4.700.22.56512         dotnet  
-System.Runtime.Intrinsics                          4.700.22.56512         dotnet  
-System.Runtime.Loader                              4.700.22.56512         dotnet  
-System.Runtime.Numerics                            4.700.22.56512         dotnet  
-System.Runtime.Serialization                       4.700.22.56512         dotnet  
-System.Runtime.Serialization.Formatters            4.700.22.56512         dotnet  
-System.Runtime.Serialization.Json                  4.700.22.56512         dotnet  
-System.Runtime.Serialization.Primitives            4.700.22.56512         dotnet  
-System.Runtime.Serialization.Xml                   4.700.22.56512         dotnet  
-System.Runtime.WindowsRuntime                      4.700.22.56512         dotnet  
-System.Runtime.WindowsRuntime.UI.Xaml              4.700.22.56512         dotnet  
-System.Security                                    4.700.22.56512         dotnet  
-System.Security.AccessControl                      4.700.22.56512         dotnet  
-System.Security.Claims                             4.700.22.56512         dotnet  
-System.Security.Cryptography.Algorithms            4.700.22.56512         dotnet  
-System.Security.Cryptography.Cng                   4.700.22.56512         dotnet  
-System.Security.Cryptography.Csp                   4.700.22.56512         dotnet  
-System.Security.Cryptography.Encoding              4.700.22.56512         dotnet  
-System.Security.Cryptography.OpenSsl               4.700.22.56512         dotnet  
-System.Security.Cryptography.Primitives            4.700.22.56512         dotnet  
-System.Security.Cryptography.ProtectedData         5.0.20.51904           dotnet  
-System.Security.Cryptography.X509Certificates      4.700.22.56512         dotnet  
-System.Security.Principal                          4.700.22.56512         dotnet  
-System.Security.Principal.Windows                  4.700.22.56512         dotnet  
-System.Security.SecureString                       4.700.22.56512         dotnet  
-System.ServiceModel.Web                            4.700.22.56512         dotnet  
-System.ServiceProcess                              4.700.22.56512         dotnet  
-System.Text.Encoding                               4.700.22.56512         dotnet  
-System.Text.Encoding.CodePages                     4.700.22.56512         dotnet  
-System.Text.Encoding.Extensions                    4.700.22.56512         dotnet  
-System.Text.Encodings.Web                          4.700.22.56512         dotnet  
-System.Text.Json                                   4.700.22.56512         dotnet  
-System.Text.RegularExpressions                     4.700.22.56512         dotnet  
-System.Threading                                   4.700.22.56512         dotnet  
-System.Threading.Channels                          4.700.22.56512         dotnet  
-System.Threading.Overlapped                        4.700.22.56512         dotnet  
-System.Threading.Tasks                             4.700.22.56512         dotnet  
-System.Threading.Tasks.Dataflow                    4.700.22.56512         dotnet  
-System.Threading.Tasks.Extensions                  4.700.22.56512         dotnet  
-System.Threading.Tasks.Parallel                    4.700.22.56512         dotnet  
-System.Threading.Thread                            4.700.22.56512         dotnet  
-System.Threading.ThreadPool                        4.700.22.56512         dotnet  
-System.Threading.Timer                             4.700.22.56512         dotnet  
-System.Transactions                                4.700.22.56512         dotnet  
-System.Transactions.Local                          4.700.22.56512         dotnet  
-System.ValueTuple                                  4.700.22.56512         dotnet  
-System.Web                                         4.700.22.56512         dotnet  
-System.Web.HttpUtility                             4.700.22.56512         dotnet  
-System.Windows                                     4.700.22.56512         dotnet  
-System.Xml                                         4.700.22.56512         dotnet  
-System.Xml.Linq                                    4.700.22.56512         dotnet  
-System.Xml.ReaderWriter                            4.700.22.56512         dotnet  
-System.Xml.Serialization                           4.700.22.56512         dotnet  
-System.Xml.XDocument                               4.700.22.56512         dotnet  
-System.Xml.XPath                                   4.700.22.56512         dotnet  
-System.Xml.XPath.XDocument                         4.700.22.56512         dotnet  
-System.Xml.XmlDocument                             4.700.22.56512         dotnet  
-System.Xml.XmlSerializer                           4.700.22.56512         dotnet  
-WindowsBase                                        4.700.22.56512         dotnet  
-alpine-baselayout                                  3.4.3-r2               apk     
-alpine-baselayout-data                             3.4.3-r2               apk     
 alpine-keys             2.4-r1                 apk     
-apk-tools                                          2.14.0-r5              apk     
+apk-tools               2.14.4-r0              apk     
-bash                                               5.2.15-r6              apk     
+bash                    5.2.26-r0              apk     
-brotli-libs                                        1.1.0-r1               apk     
+brotli-libs             1.1.0-r2               apk     
-busybox                                            1.36.1-r15             apk     
+busybox                 1.36.1-r28             apk     
-busybox-binsh                                      1.36.1-r15             apk     
+busybox-binsh           1.36.1-r28             apk     
-c-ares                                             1.22.1-r0              apk     
+c-ares                  1.28.1-r0              apk     
-ca-certificates                                    20230506-r0            apk     
+ca-certificates         20240226-r0            apk     
-ca-certificates-bundle                             20230506-r0            apk     
+ca-certificates-bundle  20240226-r0            apk     
-coreutils                                          9.4-r1                 apk     
+catatonit               0.2.0-r0               apk     
-coreutils-env                                      9.4-r1                 apk     
+coreutils               9.5-r1                 apk     
-coreutils-fmt                                      9.4-r1                 apk     
+coreutils-env           9.5-r1                 apk     
-coreutils-sha512sum                                9.4-r1                 apk     
+coreutils-fmt           9.5-r1                 apk     
-curl                                               8.4.0-r0               apk     
+coreutils-sha512sum     9.5-r1                 apk     
-dbus-libs                                          1.14.10-r0             apk     
+curl                    8.8.0-r0               apk     
+dbus-libs               1.14.10-r1             apk     
 double-conversion       3.3.0-r0               apk     
 duktape                 2.7.0-r1               apk     
+findutils               4.9.0-r5               apk     
 gdbm                    1.23-r1                apk     
-glib                                               2.78.1-r0              apk     
+glib                    2.80.2-r0              apk     
-icu-data-en                                        74.1-r0                apk     
+icu-data-en             74.2-r0                apk     
-icu-libs                                           74.1-r0                apk     
+icu-libs                74.2-r0                apk     
-jq                                                 1.7-r2                 apk     
+jq                      1.7.1-r0               apk     
-libacl                                             2.3.1-r4               apk     
+libacl                  2.3.2-r0               apk     
-libattr                                            2.5.1-r5               apk     
+libattr                 2.5.2-r0               apk     
 libb2                   0.98.1-r3              apk     
-libblkid                                           2.39.2-r1              apk     
+libblkid                2.40.1-r1              apk     
-libbsd                                             0.11.7-r3              apk     
+libbsd                  0.12.2-r0              apk     
 libbz2                  1.0.8-r6               apk     
-libc-utils                                         0.7.2-r5               apk     
+libcrypto3              3.3.0-r2               apk     
-libcrypto1.1                                       1.1.1w-r0              apk     
+libcurl                 8.8.0-r0               apk     
-libcrypto3                                         3.1.4-r1               apk     
+libeconf                0.6.3-r0               apk     
-libcurl                                            8.4.0-r0               apk     
+libexpat                2.6.2-r0               apk     
-libexpat                                           2.5.0-r2               apk     
+libffi                  3.4.6-r0               apk     
-libffi                                             3.4.4-r3               apk     
+libgcc                  13.2.1_git20240309-r0  apk     
-libgcc                                             13.2.1_git20231014-r0  apk     
+libgomp                 13.2.1_git20240309-r0  apk     
-libgomp                                            13.2.1_git20231014-r0  apk     
+libidn2                 2.3.7-r0               apk     
-libidn2                                            2.3.4-r4               apk     
+libintl                 0.22.5-r0              apk     
-libintl                                            0.22.3-r0              apk     
 libmd                   1.1.0-r0               apk     
-libmount                                           2.39.2-r1              apk     
+libmount                2.40.1-r1              apk     
-libncursesw                                        6.4_p20231007-r0       apk     
+libncursesw             6.4_p20240420-r0       apk     
-libpanelw                                          6.4_p20231007-r0       apk     
+libpanelw               6.4_p20240420-r0       apk     
-libpcre2-16                                        10.42-r1               apk     
+libpcre2-16             10.43-r0               apk     
 libproc2                4.0.4-r0               apk     
-libproxy                                           0.5.3-r0               apk     
+libproxy                0.5.6-r0               apk     
-libssl1.1                                          1.1.1w-r0              apk     
+libpsl                  0.21.5-r1              apk     
-libssl3                                            3.1.4-r1               apk     
+libssl3                 3.3.0-r2               apk     
-libstdc++                                          13.2.1_git20231014-r0  apk     
+libstdc++               13.2.1_git20240309-r0  apk     
-libtorrent-rasterbar                               2.0.9-r2               apk     
+libtorrent-rasterbar    2.0.10-r2              apk     
-libunistring                                       1.1-r2                 apk     
+libunistring            1.2-r0                 apk     
-linux-pam                                          1.5.3-r7               apk     
+linux-pam               1.6.0-r0               apk     
-mpdecimal                                          2.5.1-r2               apk     
+mpdecimal               4.0.0-r0               apk     
-mscorlib                                           4.700.22.56512         dotnet  
+musl                    1.2.5-r1               apk     
-musl                                               1.2.4_git20230717-r4   apk     
+musl-utils              1.2.5-r1               apk     
-musl-utils                                         1.2.4_git20230717-r4   apk     
+ncurses-terminfo-base   6.4_p20240420-r0       apk     
-ncurses-terminfo-base                              6.4_p20231007-r0       apk     
 netcat-openbsd          1.226-r0               apk     
-netstandard                                        4.700.22.56512         dotnet  
+nghttp2-libs            1.62.0-r0              apk     
-nghttp2-libs                                       1.58.0-r0              apk     
 oniguruma               6.9.9-r0               apk     
-openssl                                            3.1.4-r1               apk     
+pcre2                   10.43-r0               apk     
-openssl1.1-compat                                  1.1.1w-r0              apk     
-pcre2                                              10.42-r1               apk     
 procps-ng               4.0.4-r0               apk     
-pyc                                                3.11.6-r1              apk     
+pyc                     3.12.3-r1              apk     
-python3                                            3.11.6-r1              apk     
+python3                 3.12.3-r1              apk     
-python3-pyc                                        3.11.6-r1              apk     
+python3-pyc             3.12.3-r1              apk     
-python3-pycache-pyc0                               3.11.6-r1              apk     
+python3-pycache-pyc0    3.12.3-r1              apk     
-qbittorrent-nox                                    4.6.1-r0               apk     
+qbittorrent-nox         4.6.4-r1               apk     
-qbt                                                1.7.23016.1            dotnet  
+qt6-qtbase              6.6.3-r0               apk     
-qt6-qtbase                                         6.6.0-r2               apk     
+qt6-qtbase-sqlite       6.6.3-r0               apk     
-qt6-qtbase-sqlite                                  6.6.0-r2               apk     
+readline                8.2.10-r0              apk     
-readline                                           8.2.1-r2               apk     
 scanelf                 1.3.7-r2               apk     
-shadow                                             4.14.2-r0              apk     
+shadow                  4.15.1-r0              apk     
-skalibs                                            2.14.0.1-r0            apk     
+skalibs                 2.14.1.1-r0            apk     
-sqlite-libs                                        3.44.2-r0              apk     
+sqlite-libs             3.46.0-r0              apk     
-ssl_client                                         1.36.1-r15             apk     
+ssl_client              1.36.1-r28             apk     
-tzdata                                             2023c-r1               apk     
+tzdata                  2024a-r1               apk     
-utmps-libs                                         0.1.2.2-r0             apk     
+utmps-libs              0.1.2.2-r1             apk     
-xz-libs                                            5.4.5-r0               apk     
+xz-libs                 5.6.1-r3               apk     
-zlib                                               1.3-r2                 apk     
+zlib                    1.3.1-r1               apk     
-zstd-libs                                          1.5.5-r8               apk     
+zstd-libs               1.5.6-r0               apk     

readme-vars.yml

@@ -23,7 +23,7 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files." }
   - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
@@ -32,42 +32,37 @@ param_ports:
   - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
+  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the web UI, see below for explanation"}
-  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}
+  - { env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation" }
-
-# optional parameters
-optional_block_1: false
-optional_block_1_items: ""
 
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+  The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
 
-  Change username/password via the webui in the webui section of settings.  
+  You must then change username/password in the web UI section of settings. If you do not change the password a new one will be generated every time the container starts.
-
-  ### WEBUI_PORT variable
-  
-  Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
-  
-  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090  
-  
-  This should alleviate the "white screen" issue.  
-  
-  If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
-  
-  edit or add the following lines  
-
-  ```text
-  WebUI\Address=*
-  
-  WebUI\ServerDomains=*
-  ```
 
   If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
 
+  ### WEBUI_PORT variable
+
+  Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
+
+  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
+
+  ### TORRENTING_PORT
+
+  A bittorrent client can be an active or a passive node. Running your client as an active node has the advantage of being able to connect to both active and passive peers, and can potentially increase the number of incoming connections. This requires an open port on the host machine which might differ from container's internal one.
+
+  Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:6887, -p 6887:6887/udp and -e TORRENTING_PORT=6887 arguments to Docker.
+
 # changelog
 changelogs:
+  - { date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL." }
+  - { date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
+  - { date: "14.02.24:", desc: "Add torrenting port support." }
+  - { date: "31.01.24:", desc: "Remove obsolete compat packages."}
+  - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
   - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
   - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
   - { date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }

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

@@ -2,7 +2,10 @@
 # shellcheck shell=bash
 
 WEBUI_PORT=${WEBUI_PORT:-8080}
+if [[ -n "${TORRENTING_PORT}" ]]; then
+    TORRENTING_PORT_ARG="--torrenting-port=${TORRENTING_PORT}"
+fi
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
-        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
+        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}

root/usr/bin/qbt

@@ -1,14 +0,0 @@
-#!/usr/bin/with-contenv 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