Bot Updating Templated Files

do not override torrenting port unless var is set

.github/ISSUE_TEMPLATE/issue.bug.yml

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

.github/workflows/call_invalid_helper.yml

@@ -1,12 +0,0 @@
-name: Comment on invalid interaction
-on:
-  issues:
-    types:
-      - labeled
-jobs:
-  add-comment-on-invalid:
-    if: github.event.label.name == 'invalid'
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
-    secrets: inherit

.github/workflows/call_issue_pr_tracker.yml

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -7,16 +7,18 @@ 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'
         run: |
           if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
             echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
+          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
           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://')
@@ -31,6 +33,7 @@ jobs:
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
           echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/qbittorrent"
           tag="latest"
@@ -66,14 +69,26 @@ jobs:
             exit 1
           fi
           echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            exit 0
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+            echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all arch repos are updated yet. Will try again later."
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 0
           elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
             response=$(curl -iX POST \
               https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -83,6 +98,7 @@ jobs:
             buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
             buildurl="${buildurl%$'\r'}"
             echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
             echo "**** Attempting to change the Jenkins job description ****"
             curl -iX POST \
               "${buildurl}submitDescription" \

.github/workflows/external_trigger_scheduler.yml

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

.github/workflows/package_trigger.yml

@@ -7,20 +7,23 @@ 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'
         run: |
           if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER }}" ]; then
             echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
+          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\`" >> $GITHUB_STEP_SUMMARY
           response=$(curl -iX POST \
             https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -30,6 +33,7 @@ jobs:
           buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
           buildurl="${buildurl%$'\r'}"
           echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
           echo "**** Attempting to change the Jenkins job description ****"
           curl -iX POST \
             "${buildurl}submitDescription" \

.github/workflows/package_trigger_scheduler.yml

@@ -2,14 +2,14 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '43 3 * * 1'
+    - cron:  '48 6 * * 0'
   workflow_dispatch:
 
 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'
 
@@ -17,18 +17,16 @@ jobs:
         run: |
           echo "**** Branches found: ****"
           git for-each-ref --format='%(refname:short)' 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
             br=$(echo "$br" | sed 's|origin/||g')
             echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml | yq -r '.ls_branch')
             if [ "${br}" == "${ls_branch}" ]; then
               echo "**** Branch ${br} appears to be live; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
                 echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 triggered_branches="${triggered_branches}${br} "
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
@@ -38,9 +36,11 @@ jobs:
                 sleep 30
               else
                 echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
               echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done
           echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"

.github/workflows/permissions.yml

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

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v6.0.1
-      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 }}

Dockerfile

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

Dockerfile.aarch64

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

Dockerfile.armhf

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

Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
     CONTAINER_NAME = 'qbittorrent'
     BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
     LS_USER = 'linuxserver'
@@ -42,10 +42,16 @@ pipeline {
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
+        sh '''#! /bin/bash
+              containers=$(docker ps -aq)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -56,11 +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/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.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' ''',
@@ -119,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+)/
@@ -137,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}")
@@ -161,7 +172,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
@@ -184,7 +195,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
@@ -207,12 +218,12 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
@@ -232,19 +243,18 @@ pipeline {
           script{
             env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                 docker run --rm \
-                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
-                -e FILE_NAME="shellcheck-result.xml" \
-                -e MIMETYPE="text/xml" \
-                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
-                python /upload.py'''
+                  -v ${WORKSPACE}:/mnt \
+                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
+                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache python3 && \
+                    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" || :'''
         }
       }
     }
@@ -262,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 
-              # Stage 1 - Jenkinsfile update
+              # Cloned repo paths for templating:
+              # ${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}
@@ -272,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
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
+              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"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -296,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 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)
@@ -317,35 +336,55 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
                 cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                   echo ".jenkins-external" >> .gitignore
                   git add .gitignore
                 fi
-                git add ${TEMPLATED_FILES}
+                git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
               fi
-              mkdir -p ${TEMPDIR}/gitbook
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
-                cd ${TEMPDIR}/gitbook/docker-documentation/
-                git add images/docker-${CONTAINER_NAME}.md
+              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}" == "${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
               git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
               if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   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/
@@ -357,7 +396,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{
@@ -383,6 +457,26 @@ pipeline {
         }
       }
     }
+    // If this is a master build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
     /* #######################
            GitLab Mirroring
        ####################### */
@@ -393,44 +487,16 @@ pipeline {
       }
       steps{
         sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
-      } 
-    }
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "master"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .uuid')
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/qbittorrent",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-qbittorrent",\
-                       "backendUrl":"https://ghcr.io/linuxserver/qbittorrent",\
-                       "publicUrl":"https://lscr.io/linuxserver/qbittorrent"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+            "name":"'${LS_REPO}'",
+            "mirror":true,\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "issues_access_level":"disabled",\
+            "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" '''
       } 
     }
     /* ###############
@@ -495,41 +561,6 @@ pipeline {
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          steps {
-            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Qbittorrent\" \
-              --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-          }
-        }
         stage('Build ARM64') {
           agent {
             label 'ARM64'
@@ -560,9 +591,12 @@ pipeline {
             retry(5) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''docker rmi \
-                  ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            sh '''#! /bin/bash
+                  containers=$(docker ps -aq)
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -578,7 +612,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}
@@ -599,7 +633,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
@@ -623,13 +658,6 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -647,13 +675,6 @@ pipeline {
         }
       }
       steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -675,14 +696,13 @@ pipeline {
         ]) {
           script{
             env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
           }
           sh '''#! /bin/bash
                 set -e
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
@@ -701,8 +721,6 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
-                -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -719,12 +737,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -735,7 +747,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
@@ -755,17 +767,6 @@ pipeline {
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
         }
       }
     }
@@ -777,12 +778,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -793,13 +788,11 @@ 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
                   if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
@@ -807,49 +800,47 @@ pipeline {
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-latest
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
                     docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
+                    docker manifest 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 manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest 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} 
@@ -859,29 +850,6 @@ pipeline {
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
-                done
-                docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
         }
       }
     }
@@ -915,49 +883,117 @@ pipeline {
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
     }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
+    // Add protection to the release branch
+    stage('Github-Release-Branch-Protection') {
       when {
+        branch "master"
         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} '''
-        }
+        echo "Setting up protection for release branch master"
+        sh '''#! /bin/bash
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          -d $(jq -c .  << EOF
+            {
+              "required_status_checks": null,
+              "enforce_admins": false,
+              "required_pull_request_reviews": {
+                "dismiss_stale_reviews": false,
+                "require_code_owner_reviews": false,
+                "require_last_push_approval": false,
+                "required_approving_review_count": 1
+              },
+              "restrictions": null,
+              "required_linear_history": false,
+              "allow_force_pushes": false,
+              "allow_deletions": false,
+              "block_creations": false,
+              "required_conversation_resolution": true,
+              "lock_branch": false,
+              "allow_fork_syncing": false,
+              "required_signatures": false
+            }
+EOF
+          ) '''
       }
     }
     // If this is a Pull request send the CI link as a comment on it
     stage('Pull Request Comment') {
       when {
         not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
       }
     }
   }
@@ -983,6 +1019,14 @@ pipeline {
       }
     }
     cleanup {
+      sh '''#! /bin/bash
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
       cleanWs()
     }
   }

README.md

@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -46,7 +45,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 ## Supported Architectures
 
-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
 Simply pulling `lscr.io/linuxserver/qbittorrent:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
@@ -56,7 +55,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |
 
 ## Version Tags
 
@@ -66,41 +65,35 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | latest | ✅ | Stable qbittorrent releases |
 | libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
+
 ## Application Setup
 
-The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+The web UI is at `<your-ip>:8080` and a temporary password for the `admin` user will be printed to the container log on startup.
 
-Change username/password via the webui in the webui section of settings.  
-
-### 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=*
-```
+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 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.
+
 ## Usage
 
-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
-version: "2.1"
 services:
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -110,6 +103,7 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
       - WEBUI_PORT=8080
+      - TORRENTING_PORT=6881
     volumes:
       - /path/to/appdata/config:/config
       - /path/to/downloads:/downloads
@@ -129,6 +123,7 @@ 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 \
@@ -136,12 +131,11 @@ docker run -d \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent:latest
-
 ```
 
 ## Parameters
 
-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
@@ -151,7 +145,8 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
+| `-e WEBUI_PORT=8080` | for changing the port of the web UI, see below for explanation |
+| `-e TORRENTING_PORT=6881` | for changing the port of tcp/udp connection, see below for explanation |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 
@@ -162,10 +157,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:
 
 ```bash
--e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```
 
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
 
 ## Umask for running applications
 
@@ -174,15 +169,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
 
 ```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -193,53 +193,100 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Support Info
 
-* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
-* container version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
-* image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it qbittorrent /bin/bash
+    ```
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f qbittorrent
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
+    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
 
-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull qbittorrent`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d qbittorrent`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull qbittorrent
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d qbittorrent
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:latest`
-* Stop the running container: `docker stop qbittorrent`
-* Delete the container: `docker rm qbittorrent`
+* Update the image:
+
+    ```bash
+    docker pull lscr.io/linuxserver/qbittorrent:latest
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop qbittorrent
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm qbittorrent
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:
 
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once qbittorrent
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+    ```bash
+    docker image prune
+    ```
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -264,6 +311,14 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.02.24:** - Only set/override torrenting port if the optional env var is set.
+* **14.02.24:** - Add torrenting port support.
+* **31.01.24:** - Remove obsolete compat packages.
+* **25.12.23:** - Only pull stable releases of qbittorrent-cli.
+* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
+* **10.08.23:** - Bump unrar to 6.2.10.
+* **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
+* **10.06.23:** - Bump unrar to 6.2.8.
 * **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
 * **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
 * **31.10.22:** - Add libtorrentv1 branch.

jenkins-vars.yml

@@ -6,6 +6,7 @@ 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'

package_versions.txt

@@ -1,197 +1,259 @@
-NAME                                                                           VERSION                TYPE   
-Alba.CsConsoleFormat                                                           1.0.0                  dotnet  
-BencodeNET                                                                     2.3.0                  dotnet  
-CsvHelper                                                                      12.1.2                 dotnet  
-IPNetwork2                                                                     2.5.235                dotnet  
-McMaster.Extensions.CommandLineUtils                                           2.4.4                  dotnet  
-Microsoft.CSharp                                                               4.4.0                  dotnet  
-Microsoft.NETCore.Platforms                                                    1.1.0                  dotnet  
-Microsoft.NETCore.Targets                                                      1.1.0                  dotnet  
-Microsoft.Win32.Primitives                                                     4.3.0                  dotnet  
-Mono.Posix.NETStandard                                                         1.0.0                  dotnet  
-NETStandard.Library                                                            1.6.1                  dotnet  
-NJsonSchema                                                                    9.14.1                 dotnet  
-Newtonsoft.Json                                                                13.0.1                 dotnet  
-Portable.BouncyCastle                                                          1.8.8                  dotnet  
-Portable.Xaml                                                                  0.18.0                 dotnet  
-QBittorrent.Client                                                             1.8.23016.2            dotnet  
-System.AppContext                                                              4.3.0                  dotnet  
-System.Buffers                                                                 4.3.0                  dotnet  
-System.Collections                                                             4.3.0                  dotnet  
-System.Collections.Concurrent                                                  4.3.0                  dotnet  
-System.Collections.NonGeneric                                                  4.3.0                  dotnet  
-System.Collections.Specialized                                                 4.3.0                  dotnet  
-System.ComponentModel                                                          4.3.0                  dotnet  
-System.ComponentModel.Annotations                                              4.4.1                  dotnet  
-System.ComponentModel.Primitives                                               4.3.0                  dotnet  
-System.ComponentModel.TypeConverter                                            4.3.0                  dotnet  
-System.Console                                                                 4.3.0                  dotnet  
-System.Diagnostics.Debug                                                       4.3.0                  dotnet  
-System.Diagnostics.DiagnosticSource                                            4.3.0                  dotnet  
-System.Diagnostics.Tools                                                       4.3.0                  dotnet  
-System.Diagnostics.Tracing                                                     4.3.0                  dotnet  
-System.Globalization                                                           4.3.0                  dotnet  
-System.Globalization.Calendars                                                 4.3.0                  dotnet  
-System.Globalization.Extensions                                                4.3.0                  dotnet  
-System.IO                                                                      4.3.0                  dotnet  
-System.IO.Compression                                                          4.3.0                  dotnet  
-System.IO.Compression.ZipFile                                                  4.3.0                  dotnet  
-System.IO.FileSystem                                                           4.3.0                  dotnet  
-System.IO.FileSystem.Primitives                                                4.3.0                  dotnet  
-System.Linq                                                                    4.3.0                  dotnet  
-System.Linq.Expressions                                                        4.3.0                  dotnet  
-System.Net.Http                                                                4.3.0                  dotnet  
-System.Net.NameResolution                                                      4.3.0                  dotnet  
-System.Net.Primitives                                                          4.3.0                  dotnet  
-System.Net.Sockets                                                             4.3.0                  dotnet  
-System.ObjectModel                                                             4.3.0                  dotnet  
-System.Private.Uri                                                             4.3.0                  dotnet  
-System.Reflection                                                              4.3.0                  dotnet  
-System.Reflection.Emit                                                         4.3.0                  dotnet  
-System.Reflection.Emit.ILGeneration                                            4.3.0                  dotnet  
-System.Reflection.Emit.Lightweight                                             4.3.0                  dotnet  
-System.Reflection.Extensions                                                   4.3.0                  dotnet  
-System.Reflection.Primitives                                                   4.3.0                  dotnet  
-System.Reflection.TypeExtensions                                               4.4.0                  dotnet  
-System.Resources.ResourceManager                                               4.3.0                  dotnet  
-System.Runtime                                                                 4.3.0                  dotnet  
-System.Runtime.Extensions                                                      4.3.0                  dotnet  
-System.Runtime.Handles                                                         4.3.0                  dotnet  
-System.Runtime.InteropServices                                                 4.3.0                  dotnet  
-System.Runtime.InteropServices.RuntimeInformation                              4.3.0                  dotnet  
-System.Runtime.Numerics                                                        4.3.0                  dotnet  
-System.Runtime.Serialization.Primitives                                        4.3.0                  dotnet  
-System.Security.Claims                                                         4.3.0                  dotnet  
-System.Security.Cryptography.Algorithms                                        4.3.0                  dotnet  
-System.Security.Cryptography.Cng                                               4.3.0                  dotnet  
-System.Security.Cryptography.Csp                                               4.3.0                  dotnet  
-System.Security.Cryptography.Encoding                                          4.3.0                  dotnet  
-System.Security.Cryptography.OpenSsl                                           4.3.0                  dotnet  
-System.Security.Cryptography.Primitives                                        4.3.0                  dotnet  
-System.Security.Cryptography.ProtectedData                                     5.0.0                  dotnet  
-System.Security.Cryptography.X509Certificates                                  4.3.0                  dotnet  
-System.Security.Principal                                                      4.3.0                  dotnet  
-System.Security.Principal.Windows                                              4.3.0                  dotnet  
-System.Text.Encoding                                                           4.3.0                  dotnet  
-System.Text.Encoding.Extensions                                                4.3.0                  dotnet  
-System.Text.RegularExpressions                                                 4.3.0                  dotnet  
-System.Threading                                                               4.3.0                  dotnet  
-System.Threading.Tasks                                                         4.3.0                  dotnet  
-System.Threading.Tasks.Extensions                                              4.3.0                  dotnet  
-System.Threading.ThreadPool                                                    4.3.0                  dotnet  
-System.Threading.Timer                                                         4.3.0                  dotnet  
-System.Xml.ReaderWriter                                                        4.3.0                  dotnet  
-System.Xml.XDocument                                                           4.3.0                  dotnet  
-System.Xml.XmlDocument                                                         4.3.0                  dotnet  
-alpine-baselayout                                                              3.4.0-r0               apk     
-alpine-baselayout-data                                                         3.4.0-r0               apk     
-alpine-keys                                                                    2.4-r1                 apk     
-apk-tools                                                                      2.12.11-r0             apk     
-bash                                                                           5.2.15-r0              apk     
-brotli-libs                                                                    1.0.9-r11              apk     
-busybox                                                                        1.36.0                 binary  
-busybox                                                                        1.36.0-r4              apk     
-busybox-binsh                                                                  1.36.0-r4              apk     
-ca-certificates                                                                20230106-r0            apk     
-ca-certificates-bundle                                                         20230106-r0            apk     
-coreutils                                                                      9.1-r0                 apk     
-curl                                                                           7.88.1-r1              apk     
-dbus-libs                                                                      1.14.6-r1              apk     
-double-conversion                                                              3.2.1-r0               apk     
-gdbm                                                                           1.23-r0                apk     
-glib                                                                           2.74.6-r0              apk     
-icu-data-en                                                                    72.1-r2                apk     
-icu-libs                                                                       72.1-r2                apk     
-jq                                                                             1.6-r2                 apk     
-libacl                                                                         2.3.1-r1               apk     
-libattr                                                                        2.5.1-r3               apk     
-libb2                                                                          0.98.1-r2              apk     
-libblkid                                                                       2.38.1-r5              apk     
-libbsd                                                                         0.11.7-r0              apk     
-libbz2                                                                         1.0.8-r4               apk     
-libc-utils                                                                     0.7.2-r4               apk     
-libcrypto1.1                                                                   1.1.1t-r0              apk     
-libcrypto3                                                                     3.0.8-r0               apk     
-libcurl                                                                        7.88.1-r1              apk     
-libexpat                                                                       2.5.0-r0               apk     
-libffi                                                                         3.4.4-r0               apk     
-libgcc                                                                         12.2.1_git20220924-r9  apk     
-libgomp                                                                        12.2.1_git20220924-r9  apk     
-libintl                                                                        0.21.1-r1              apk     
-libmd                                                                          1.0.4-r1               apk     
-libmount                                                                       2.38.1-r5              apk     
-libncursesw                                                                    6.4_p20230225-r0       apk     
-libpanelw                                                                      6.4_p20230225-r0       apk     
-libpcre2-16                                                                    10.42-r0               apk     
-libssl1.1                                                                      1.1.1t-r0              apk     
-libssl3                                                                        3.0.8-r0               apk     
-libstdc++                                                                      12.2.1_git20220924-r9  apk     
-libtorrent-rasterbar                                                           2.0.8-r2               apk     
-linux-pam                                                                      1.5.2-r3               apk     
-mpdecimal                                                                      2.5.1-r1               apk     
-musl                                                                           1.2.3-r4               apk     
-musl-utils                                                                     1.2.3-r4               apk     
-ncurses-terminfo-base                                                          6.4_p20230225-r0       apk     
-netcat-openbsd                                                                 1.219-r0               apk     
-nghttp2-libs                                                                   1.52.0-r0              apk     
-oniguruma                                                                      6.9.8-r0               apk     
-openssl                                                                        3.0.8-r0               apk     
-openssl1.1-compat                                                              1.1.1t-r0              apk     
-p7zip                                                                          17.05-r1               apk     
-pcre2                                                                          10.42-r0               apk     
-python                                                                         3.11.2                 binary  
-python3                                                                        3.11.2-r0              apk     
-qbittorrent-nox                                                                4.5.2-r0               apk     
-qt6-qtbase                                                                     6.4.2-r0               apk     
-qt6-qtbase-sqlite                                                              6.4.2-r0               apk     
-readline                                                                       8.2.1-r0               apk     
-runtime.any.System.Collections                                                 4.3.0                  dotnet  
-runtime.any.System.Diagnostics.Tools                                           4.3.0                  dotnet  
-runtime.any.System.Diagnostics.Tracing                                         4.3.0                  dotnet  
-runtime.any.System.Globalization                                               4.3.0                  dotnet  
-runtime.any.System.Globalization.Calendars                                     4.3.0                  dotnet  
-runtime.any.System.IO                                                          4.3.0                  dotnet  
-runtime.any.System.Reflection                                                  4.3.0                  dotnet  
-runtime.any.System.Reflection.Extensions                                       4.3.0                  dotnet  
-runtime.any.System.Reflection.Primitives                                       4.3.0                  dotnet  
-runtime.any.System.Resources.ResourceManager                                   4.3.0                  dotnet  
-runtime.any.System.Runtime                                                     4.3.0                  dotnet  
-runtime.any.System.Runtime.Handles                                             4.3.0                  dotnet  
-runtime.any.System.Runtime.InteropServices                                     4.3.0                  dotnet  
-runtime.any.System.Text.Encoding                                               4.3.0                  dotnet  
-runtime.any.System.Text.Encoding.Extensions                                    4.3.0                  dotnet  
-runtime.any.System.Threading.Tasks                                             4.3.0                  dotnet  
-runtime.any.System.Threading.Timer                                             4.3.0                  dotnet  
-runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl       4.3.0                  dotnet  
-runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.native.System                                                          4.3.0                  dotnet  
-runtime.native.System.IO.Compression                                           4.3.0                  dotnet  
-runtime.native.System.Net.Http                                                 4.3.0                  dotnet  
-runtime.native.System.Security.Cryptography.Apple                              4.3.0                  dotnet  
-runtime.native.System.Security.Cryptography.OpenSsl                            4.3.0                  dotnet  
-runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                  dotnet  
-runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                  dotnet  
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple        4.3.0                  dotnet  
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl         4.3.0                  dotnet  
-runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.unix.Microsoft.Win32.Primitives                                        4.3.0                  dotnet  
-runtime.unix.System.Console                                                    4.3.0                  dotnet  
-runtime.unix.System.Diagnostics.Debug                                          4.3.0                  dotnet  
-runtime.unix.System.IO.FileSystem                                              4.3.0                  dotnet  
-runtime.unix.System.Net.Primitives                                             4.3.0                  dotnet  
-runtime.unix.System.Net.Sockets                                                4.3.0                  dotnet  
-runtime.unix.System.Private.Uri                                                4.3.0                  dotnet  
-runtime.unix.System.Runtime.Extensions                                         4.3.0                  dotnet  
-scanelf                                                                        1.3.7-r0               apk     
-shadow                                                                         4.13-r2                apk     
-skalibs                                                                        2.13.1.0-r0            apk     
-sqlite-libs                                                                    3.41.0-r0              apk     
-ssl_client                                                                     1.36.0-r4              apk     
-tzdata                                                                         2022g-r0               apk     
-utmps-libs                                                                     0.1.2.1-r0             apk     
-xz-libs                                                                        5.4.1-r0               apk     
-zlib                                                                           1.2.13-r0              apk     
+NAME                                               VERSION                                                                                  TYPE     
+7zip                                               23.01-r0                                                                                 apk       
+Alba.CsConsoleFormat                               1.0.0.89                                                                                 dotnet    
+BencodeNET                                         2.3.0.0                                                                                  dotnet    
+Bouncy Castle for .NET (netstandard2.0)            1.8.8.2                                                                                  dotnet    
+CommandLineUtils                                   2.4.4+3c2a4909757a51602dcca9b961d577511b85fd31.3c2a4909757a51602dcca9b961d577511b85fd31  dotnet    
+CsvHelper                                          12.1.2                                                                                   dotnet    
+Json.NET                                           13.0.3.27908                                                                             dotnet    
+Microsoft.CSharp                                   4.700.22.56512                                                                           dotnet    
+Microsoft.VisualBasic                              4.700.22.56512                                                                           dotnet    
+Microsoft.VisualBasic.Core                         4.700.22.56512                                                                           dotnet    
+Microsoft.Win32.Primitives                         4.700.22.56512                                                                           dotnet    
+Microsoft.Win32.Registry                           4.700.22.56512                                                                           dotnet    
+Mono.Posix.NETStandard                             1.0.0.0                                                                                  dotnet    
+NJsonSchema                                        9.14.1.0                                                                                 dotnet    
+Portable.Xaml.dll                                  0.18.0.0                                                                                 dotnet    
+QBittorrent.Client                                 1.9.23349.1                                                                              dotnet    
+System                                             4.700.22.56512                                                                           dotnet    
+System.AppContext                                  4.700.22.56512                                                                           dotnet    
+System.Buffers                                     4.700.22.56512                                                                           dotnet    
+System.Collections                                 4.700.22.56512                                                                           dotnet    
+System.Collections.Concurrent                      4.700.22.56512                                                                           dotnet    
+System.Collections.Immutable                       4.700.22.56512                                                                           dotnet    
+System.Collections.NonGeneric                      4.700.22.56512                                                                           dotnet    
+System.Collections.Specialized                     4.700.22.56512                                                                           dotnet    
+System.ComponentModel                              4.700.22.56512                                                                           dotnet    
+System.ComponentModel.Annotations                  4.700.22.56512                                                                           dotnet    
+System.ComponentModel.DataAnnotations              4.700.22.56512                                                                           dotnet    
+System.ComponentModel.EventBasedAsync              4.700.22.56512                                                                           dotnet    
+System.ComponentModel.Primitives                   4.700.22.56512                                                                           dotnet    
+System.ComponentModel.TypeConverter                4.700.22.56512                                                                           dotnet    
+System.Configuration                               4.700.22.56512                                                                           dotnet    
+System.Console                                     4.700.22.56512                                                                           dotnet    
+System.Core                                        4.700.22.56512                                                                           dotnet    
+System.Data                                        4.700.22.56512                                                                           dotnet    
+System.Data.Common                                 4.700.22.56512                                                                           dotnet    
+System.Data.DataSetExtensions                      4.700.22.56512                                                                           dotnet    
+System.Diagnostics.Contracts                       4.700.22.56512                                                                           dotnet    
+System.Diagnostics.Debug                           4.700.22.56512                                                                           dotnet    
+System.Diagnostics.DiagnosticSource                4.700.22.56512                                                                           dotnet    
+System.Diagnostics.FileVersionInfo                 4.700.22.56512                                                                           dotnet    
+System.Diagnostics.Process                         4.700.22.56512                                                                           dotnet    
+System.Diagnostics.StackTrace                      4.700.22.56512                                                                           dotnet    
+System.Diagnostics.TextWriterTraceListener         4.700.22.56512                                                                           dotnet    
+System.Diagnostics.Tools                           4.700.22.56512                                                                           dotnet    
+System.Diagnostics.TraceSource                     4.700.22.56512                                                                           dotnet    
+System.Diagnostics.Tracing                         4.700.22.56512                                                                           dotnet    
+System.Drawing                                     4.700.22.56512                                                                           dotnet    
+System.Drawing.Primitives                          4.700.22.56512                                                                           dotnet    
+System.Dynamic.Runtime                             4.700.22.56512                                                                           dotnet    
+System.Globalization                               4.700.22.56512                                                                           dotnet    
+System.Globalization.Calendars                     4.700.22.56512                                                                           dotnet    
+System.Globalization.Extensions                    4.700.22.56512                                                                           dotnet    
+System.IO                                          4.700.22.56512                                                                           dotnet    
+System.IO.Compression                              4.700.22.56512                                                                           dotnet    
+System.IO.Compression.Brotli                       4.700.22.56512                                                                           dotnet    
+System.IO.Compression.FileSystem                   4.700.22.56512                                                                           dotnet    
+System.IO.Compression.ZipFile                      4.700.22.56512                                                                           dotnet    
+System.IO.FileSystem                               4.700.22.56512                                                                           dotnet    
+System.IO.FileSystem.AccessControl                 4.700.22.56512                                                                           dotnet    
+System.IO.FileSystem.DriveInfo                     4.700.22.56512                                                                           dotnet    
+System.IO.FileSystem.Primitives                    4.700.22.56512                                                                           dotnet    
+System.IO.FileSystem.Watcher                       4.700.22.56512                                                                           dotnet    
+System.IO.IsolatedStorage                          4.700.22.56512                                                                           dotnet    
+System.IO.MemoryMappedFiles                        4.700.22.56512                                                                           dotnet    
+System.IO.Pipes                                    4.700.22.56512                                                                           dotnet    
+System.IO.Pipes.AccessControl                      4.700.22.56512                                                                           dotnet    
+System.IO.UnmanagedMemoryStream                    4.700.22.56512                                                                           dotnet    
+System.Linq                                        4.700.22.56512                                                                           dotnet    
+System.Linq.Expressions                            4.700.22.56512                                                                           dotnet    
+System.Linq.Parallel                               4.700.22.56512                                                                           dotnet    
+System.Linq.Queryable                              4.700.22.56512                                                                           dotnet    
+System.Memory                                      4.700.22.56512                                                                           dotnet    
+System.Net                                         4.700.22.56512                                                                           dotnet    
+System.Net.Http                                    4.700.22.56512                                                                           dotnet    
+System.Net.HttpListener                            4.700.22.56512                                                                           dotnet    
+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.6.4-r0                                                                                 apk       
+alpine-baselayout-data                             3.6.4-r0                                                                                 apk       
+alpine-keys                                        2.4-r1                                                                                   apk       
+apk-tools                                          2.14.4-r0                                                                                apk       
+bash                                               5.2.26-r0                                                                                apk       
+brotli-libs                                        1.1.0-r2                                                                                 apk       
+busybox                                            1.36.1-r26                                                                               apk       
+busybox-binsh                                      1.36.1-r26                                                                               apk       
+c-ares                                             1.28.1-r0                                                                                apk       
+ca-certificates                                    20240226-r0                                                                              apk       
+ca-certificates-bundle                             20240226-r0                                                                              apk       
+coreutils                                          9.5-r1                                                                                   apk       
+coreutils-env                                      9.5-r1                                                                                   apk       
+coreutils-fmt                                      9.5-r1                                                                                   apk       
+coreutils-sha512sum                                9.5-r1                                                                                   apk       
+curl                                               8.7.1-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.80.0-r3                                                                                apk       
+icu-data-en                                        74.2-r0                                                                                  apk       
+icu-libs                                           74.2-r0                                                                                  apk       
+jq                                                 1.7.1-r0                                                                                 apk       
+libacl                                             2.3.2-r0                                                                                 apk       
+libattr                                            2.5.2-r0                                                                                 apk       
+libb2                                              0.98.1-r3                                                                                apk       
+libblkid                                           2.40-r2                                                                                  apk       
+libbsd                                             0.12.2-r0                                                                                apk       
+libbz2                                             1.0.8-r6                                                                                 apk       
+libcrypto3                                         3.3.0-r1                                                                                 apk       
+libcurl                                            8.7.1-r0                                                                                 apk       
+libeconf                                           0.6.2-r0                                                                                 apk       
+libexpat                                           2.6.2-r0                                                                                 apk       
+libffi                                             3.4.6-r0                                                                                 apk       
+libgcc                                             13.2.1_git20240309-r0                                                                    apk       
+libgomp                                            13.2.1_git20240309-r0                                                                    apk       
+libidn2                                            2.3.7-r0                                                                                 apk       
+libintl                                            0.22.5-r0                                                                                apk       
+libmd                                              1.1.0-r0                                                                                 apk       
+libmount                                           2.40-r2                                                                                  apk       
+libncursesw                                        6.4_p20240330-r0                                                                         apk       
+libpanelw                                          6.4_p20240330-r0                                                                         apk       
+libpcre2-16                                        10.43-r0                                                                                 apk       
+libproc2                                           4.0.4-r0                                                                                 apk       
+libproxy                                           0.5.6-r0                                                                                 apk       
+libpsl                                             0.21.5-r1                                                                                apk       
+libssl3                                            3.3.0-r1                                                                                 apk       
+libstdc++                                          13.2.1_git20240309-r0                                                                    apk       
+libtorrent-rasterbar                               2.0.10-r2                                                                                apk       
+libunistring                                       1.2-r0                                                                                   apk       
+linux-pam                                          1.6.0-r0                                                                                 apk       
+mpdecimal                                          4.0.0-r0                                                                                 apk       
+mscorlib                                           4.700.22.56512                                                                           dotnet    
+musl                                               1.2.5-r0                                                                                 apk       
+musl-utils                                         1.2.5-r0                                                                                 apk       
+ncurses-terminfo-base                              6.4_p20240330-r0                                                                         apk       
+netcat-openbsd                                     1.226-r0                                                                                 apk       
+netstandard                                        4.700.22.56512                                                                           dotnet    
+nghttp2-libs                                       1.61.0-r0                                                                                apk       
+oniguruma                                          6.9.9-r0                                                                                 apk       
+pcre2                                              10.43-r0                                                                                 apk       
+procps-ng                                          4.0.4-r0                                                                                 apk       
+pyc                                                3.12.3-r1                                                                                apk       
+python3                                            3.12.3-r1                                                                                apk       
+python3-pyc                                        3.12.3-r1                                                                                apk       
+python3-pycache-pyc0                               3.12.3-r1                                                                                apk       
+qbittorrent-nox                                    4.6.4-r1                                                                                 apk       
+qbt                                                1.8.24012.1+00a638ba43f1a80a03cc8be139f586ce9886c908                                     dotnet    
+qt6-qtbase                                         6.6.3-r0                                                                                 apk       
+qt6-qtbase-sqlite                                  6.6.3-r0                                                                                 apk       
+readline                                           8.2.10-r0                                                                                apk       
+scanelf                                            1.3.7-r2                                                                                 apk       
+shadow                                             4.15.1-r0                                                                                apk       
+skalibs                                            2.14.1.1-r0                                                                              apk       
+sqlite-libs                                        3.45.3-r0                                                                                apk       
+ssl_client                                         1.36.1-r26                                                                               apk       
+tzdata                                             2024a-r1                                                                                 apk       
+utmps-libs                                         0.1.2.2-r1                                                                               apk       
+xz-libs                                            5.6.1-r3                                                                                 apk       
+zlib                                               1.3.1-r1                                                                                 apk       
+zstd-libs                                          1.5.6-r0                                                                                 apk       

readme-vars.yml

@@ -11,13 +11,12 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable qbittorrent releases" }
-  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }  
+  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -33,42 +32,40 @@ 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 webui, see below for explanation"}
-
-# optional parameters
-optional_block_1: false
-optional_block_1_items: ""
+  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the web UI, see below for explanation"}
+  - { env_var: "TORRENTING_PORT", env_value: "6881", desc: "for changing the port of tcp/udp connection, see below for explanation" }
 
 # 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`.  
-  
-  Change username/password via the webui in the webui section of settings.  
+  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 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)
+  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: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
+  - { date: "14.02.24:", desc: "Add torrenting port support." }
+  - { date: "31.01.24:", desc: "Remove obsolete compat packages."}
+  - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
+  - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
+  - { date: "10.06.23:", desc: "Bump unrar to 6.2.8." }
   - { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
   - { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
   - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }

root/etc/s6-overlay/s6-rc.d/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}