Bot Updating Package Versions

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.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,14 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+
+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/greetings.yml

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

.github/workflows/package_trigger_scheduler.yml

@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '43 3 * * 1'
+    - cron:  '48 6 * * 0'
   workflow_dispatch:
 
 jobs:

.github/workflows/permissions.yml

@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  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,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,14 +20,14 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
-    python3 && \
+    python3 \
+    qt6-qtbase-sqlite && \
   echo "**** install unrar from source ****" && \
   mkdir /tmp/unrar && \
   curl -o \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,14 +20,14 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
-    python3 && \
+    python3 \
+    qt6-qtbase-sqlite && \
   echo "**** install unrar from source ****" && \
   mkdir /tmp/unrar && \
   curl -o \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,14 +20,14 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
-    python3 && \
+    python3 \
+    qt6-qtbase-sqlite && \
   echo "**** install unrar from source ****" && \
   mkdir /tmp/unrar && \
   curl -o \

Jenkinsfile

@@ -57,7 +57,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.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'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -67,7 +67,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 libtorrentv1-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -231,17 +231,14 @@ pipeline {
           }
           sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/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.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache py3-pip && \
+                    pip install 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" || :'''
         }
       }
     }
@@ -278,7 +275,7 @@ pipeline {
                 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"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -295,7 +292,7 @@ pipeline {
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old templates"
+                echo "Deleting old and deprecated templates"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
@@ -443,7 +440,8 @@ pipeline {
       }
       steps {
         echo "Running on node: ${NODE_NAME}"
-        sh "docker build \
+        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+        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\" \
@@ -456,7 +454,7 @@ pipeline {
           --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 -t ${IMAGE}:${META_TAG} \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -473,7 +471,8 @@ pipeline {
         stage('Build X86') {
           steps {
             echo "Running on node: ${NODE_NAME}"
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+            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\" \
@@ -486,7 +485,7 @@ pipeline {
               --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 -t ${IMAGE}:amd64-${META_TAG} \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -500,7 +499,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            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\" \
@@ -513,7 +513,7 @@ pipeline {
               --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} \
+              --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) {
@@ -534,7 +534,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+            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\" \
@@ -547,7 +548,7 @@ pipeline {
               --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.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
@@ -576,26 +577,12 @@ pipeline {
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
               fi
-              if [ "${DIST_IMAGE}" == "alpine" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apk info -v > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "fedora" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  rpm -qa > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "arch" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  pacman -Q > /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              fi
+              touch ${TEMPDIR}/package_versions.txt
+              docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                -v ${TEMPDIR}:/tmp \
+                ghcr.io/anchore/syft:latest \
+                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
@@ -806,19 +793,19 @@ pipeline {
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
                   for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-libtorrentv1
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-libtorrentv1
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-libtorrentv1
                     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-libtorrentv1
                     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-libtorrentv1
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -826,13 +813,13 @@ pipeline {
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-libtorrentv1
-                    docker push ${MANIFESTIMAGE}:arm32v7-libtorrentv1
-                    docker push ${MANIFESTIMAGE}:arm64v8-libtorrentv1
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-libtorrentv1
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-libtorrentv1
                     docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-libtorrentv1
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -978,12 +965,12 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }

README.md

@@ -56,7 +56,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| armhf | ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
@@ -66,7 +66,6 @@ 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`.  
@@ -109,7 +108,7 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
       - WEBUI_PORT=8080
     volumes:
       - /path/to/appdata/config:/config
@@ -128,7 +127,7 @@ docker run -d \
   --name=qbittorrent \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Europe/London \
+  -e TZ=Etc/UTC \
   -e WEBUI_PORT=8080 \
   -p 8080:8080 \
   -p 6881:6881 \
@@ -137,6 +136,7 @@ docker run -d \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent:libtorrentv1
+
 ```
 
 ## Parameters
@@ -150,7 +150,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 6881/udp` | udp connection port |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
+| `-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 |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
@@ -264,6 +264,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
+* **15.01.23:** - Rebase to Alpine 3.17, add openssl1.1-compat.
 * **29.11.22:** - Add icu-libs to support qbittorrent-cli.
 * **30.10.22:** - Add libtorrent v1 branch.
 * **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.

package_versions.txt

@@ -1,51 +1,197 @@
-alpine-baselayout-3.2.0-r23
-alpine-baselayout-data-3.2.0-r23
-alpine-keys-2.4-r1
-apk-tools-2.12.9-r3
-bash-5.1.16-r2
-brotli-libs-1.0.9-r6
-busybox-1.35.0-r17
-ca-certificates-20220614-r0
-ca-certificates-bundle-20220614-r0
-coreutils-9.1-r0
-curl-7.83.1-r4
-expat-2.5.0-r0
-gdbm-1.23-r0
-gmp-6.2.1-r2
-icu-data-en-71.1-r2
-icu-libs-71.1-r2
-jq-1.6-r1
-libacl-2.3.1-r0
-libattr-2.5.1-r1
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1s-r0
-libcurl-7.83.1-r4
-libffi-3.4.2-r1
-libgcc-11.2.1_git20220219-r2
-libintl-0.21-r2
-libproc-3.3.17-r1
-libssl1.1-1.1.1s-r0
-libstdc++-11.2.1_git20220219-r2
-linux-pam-1.5.2-r0
-mpdecimal-2.5.1-r1
-musl-1.2.3-r2
-musl-utils-1.2.3-r2
-ncurses-libs-6.3_p20220521-r0
-ncurses-terminfo-base-6.3_p20220521-r0
-nghttp2-libs-1.47.0-r0
-oniguruma-6.9.8-r0
-p7zip-17.04-r2
-procps-3.3.17-r1
-python3-3.10.9-r0
-readline-8.1.2-r0
-scanelf-1.3.4-r0
-shadow-4.10-r3
-skalibs-2.11.2.0-r0
-sqlite-libs-3.38.5-r0
-ssl_client-1.35.0-r17
-tzdata-2022f-r1
-utmps-libs-0.1.2.0-r0
-xz-5.2.5-r1
-xz-libs-5.2.5-r1
-zlib-1.2.12-r3
+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     
+alpine-release                                                                 3.17.2-r0              apk     
+apk-tools                                                                      2.12.10-r1             apk     
+bash                                                                           5.2.15-r0              apk     
+brotli-libs                                                                    1.0.9-r9               apk     
+busybox                                                                        1.35.0                 binary  
+busybox                                                                        1.35.0-r29             apk     
+busybox-binsh                                                                  1.35.0-r29             apk     
+ca-certificates                                                                20220614-r4            apk     
+ca-certificates-bundle                                                         20220614-r4            apk     
+coreutils                                                                      9.1-r0                 apk     
+curl                                                                           7.88.1-r1              apk     
+dbus-libs                                                                      1.14.4-r0              apk     
+double-conversion                                                              3.2.1-r0               apk     
+gdbm                                                                           1.23-r0                apk     
+glib                                                                           2.74.6-r0              apk     
+icu-data-en                                                                    72.1-r1                apk     
+icu-libs                                                                       72.1-r1                apk     
+jq                                                                             1.6-r2                 apk     
+libacl                                                                         2.3.1-r1               apk     
+libattr                                                                        2.5.1-r2               apk     
+libb2                                                                          0.98.1-r2              apk     
+libblkid                                                                       2.38.1-r1              apk     
+libbsd                                                                         0.11.7-r0              apk     
+libbz2                                                                         1.0.8-r4               apk     
+libc-utils                                                                     0.7.2-r3               apk     
+libcrypto1.1                                                                   1.1.1t-r2              apk     
+libcrypto3                                                                     3.0.8-r1               apk     
+libcurl                                                                        7.88.1-r1              apk     
+libexpat                                                                       2.5.0-r0               apk     
+libffi                                                                         3.4.4-r0               apk     
+libgcc                                                                         12.2.1_git20220924-r4  apk     
+libgomp                                                                        12.2.1_git20220924-r4  apk     
+libintl                                                                        0.21.1-r1              apk     
+libmd                                                                          1.0.4-r0               apk     
+libmount                                                                       2.38.1-r1              apk     
+libpcre2-16                                                                    10.42-r0               apk     
+libproc                                                                        3.3.17-r2              apk     
+libssl1.1                                                                      1.1.1t-r2              apk     
+libssl3                                                                        3.0.8-r1               apk     
+libstdc++                                                                      12.2.1_git20220924-r4  apk     
+linux-pam                                                                      1.5.2-r1               apk     
+mpdecimal                                                                      2.5.1-r1               apk     
+musl                                                                           1.2.3-r4               apk     
+musl-utils                                                                     1.2.3-r4               apk     
+ncurses-libs                                                                   6.3_p20221119-r0       apk     
+ncurses-terminfo-base                                                          6.3_p20221119-r0       apk     
+netcat-openbsd                                                                 1.130-r4               apk     
+nghttp2-libs                                                                   1.51.0-r0              apk     
+oniguruma                                                                      6.9.8-r0               apk     
+openssl1.1-compat                                                              1.1.1t-r2              apk     
+p7zip                                                                          17.04-r3               apk     
+pcre2                                                                          10.42-r0               apk     
+procps                                                                         3.3.17-r2              apk     
+python                                                                         3.10.10                binary  
+python3                                                                        3.10.10-r0             apk     
+qt6-qtbase                                                                     6.4.2-r0               apk     
+qt6-qtbase-sqlite                                                              6.4.2-r0               apk     
+readline                                                                       8.2.0-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.5-r1               apk     
+shadow                                                                         4.13-r0                apk     
+skalibs                                                                        2.12.0.1-r0            apk     
+sqlite-libs                                                                    3.40.1-r0              apk     
+ssl_client                                                                     1.35.0-r29             apk     
+tzdata                                                                         2023b-r1               apk     
+utmps-libs                                                                     0.1.2.0-r1             apk     
+xz                                                                             5.2.9-r0               apk     
+xz-libs                                                                        5.2.9-r0               apk     
+zlib                                                                           1.2.13-r0              apk     

readme-vars.yml

@@ -69,6 +69,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - { date: "15.01.23:", desc: "Rebase to Alpine 3.17, add openssl1.1-compat." }
   - { date: "29.11.22:", desc: "Add icu-libs to support qbittorrent-cli." }
   - { date: "30.10.22:", desc: "Add libtorrent v1 branch." }
   - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }

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

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make our folder
 mkdir -p /config/qBittorrent

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

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 WEBUI_PORT=${WEBUI_PORT:-8080}