Bot Updating Package Versions

.editorconfig

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

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
 * Read, and fill the Pull Request template
-  * If this is a fix for a typo in code or documentation in the README please file an issue
+  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
   * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
 * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
 

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v3
       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."

Dockerfile

@@ -20,11 +20,11 @@ RUN \
   apt-get install -y \
     gnupg \
     python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
@@ -50,4 +50,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.aarch64

@@ -20,11 +20,11 @@ RUN \
   apt-get install -y \
     gnupg \
     python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
@@ -50,4 +50,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.armhf

@@ -20,11 +20,11 @@ RUN \
   apt-get install -y \
     gnupg \
     python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
@@ -50,4 +50,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

Jenkinsfile

@@ -55,7 +55,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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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/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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -260,7 +260,6 @@ pipeline {
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
                 git checkout -f master
-                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
@@ -521,6 +520,15 @@ pipeline {
                   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
               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"

README.md

@@ -33,7 +33,6 @@ Find us at:
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
 [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
-[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
@@ -95,9 +94,7 @@ WebUI\ServerDomains=*
 
 Here are some example snippets to help you get started creating a container.
 
-### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
+### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
-
-Compatible with docker-compose v2 schemas.
 
 ```yaml
 ---
@@ -121,7 +118,7 @@ services:
     restart: unless-stopped
 ```
 
-### docker cli
+### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
 
 ```bash
 docker run -d \

package_versions.txt

@@ -1,6 +1,6 @@
 adduser3.118ubuntu2
-apt2.0.5
+apt2.0.6
-apt-utils2.0.5
+apt-utils2.0.6
 base-files11ubuntu5.3
 base-passwd3.5.47
 bash5.0-6ubuntu1.1
@@ -20,7 +20,7 @@ e2fsprogs1.45.5-2ubuntu1
 fdisk2.34-0.1ubuntu9.1
 file1:5.38-4
 findutils4.7.0-1ubuntu1
-gcc-10-base10.2.0-5ubuntu1~20.04
+gcc-10-base10.3.0-1ubuntu1~20.04
 geoip-bin1.6.12-6build1
 geoip-database20191224-2
 gnupg2.2.19-3ubuntu2.1
@@ -40,7 +40,7 @@ init-system-helpers1.57
 krb5-locales1.17-6ubuntu4.1
 libacl12.2.53-6
 libapparmor12.13.3-7ubuntu5.1
-libapt-pkg6.02.0.5
+libapt-pkg6.02.0.6
 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
 libassuan02.5.3-7ubuntu2
 libattr11:2.4.48-5
@@ -63,7 +63,7 @@ libexpat12.2.9-1build1
 libext2fs21.45.5-2ubuntu1
 libfdisk12.34-0.1ubuntu9.1
 libffi73.3-4
-libgcc-s110.2.0-5ubuntu1~20.04
+libgcc-s110.3.0-1ubuntu1~20.04
 libgcrypt201.8.5-5ubuntu1
 libgdbm61.18.1-5
 libgdbm-compat41.18.1-5
@@ -78,7 +78,7 @@ libgssapi-krb5-21.17-6ubuntu4.1
 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
-libhogweed53.5.1+really3.5.1-2
+libhogweed53.5.1+really3.5.1-2ubuntu0.2
 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
 libicu6666.1-2ubuntu2
 libidn2-02.2.0-2
@@ -88,9 +88,9 @@ libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
 libkrb5-31.17-6ubuntu4.1
 libkrb5support01.17-6ubuntu4.1
 libksba81.3.5-2
-libldap-2.4-22.4.49+dfsg-2ubuntu1.7
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
-libldap-common2.4.49+dfsg-2ubuntu1.7
+libldap-common2.4.49+dfsg-2ubuntu1.8
-liblz4-11.9.2-2
+liblz4-11.9.2-2ubuntu0.20.04.1
 liblzma55.2.4-1ubuntu1
 libmagic11:5.38-4
 libmagic-mgc1:5.38-4
@@ -99,22 +99,22 @@ libmpdec22.4.2-3
 libncurses66.2-0ubuntu2
 libncursesw66.2-0ubuntu2
 libnetaddr-ip-perl4.079+dfsg-1build4
-libnettle73.5.1+really3.5.1-2
+libnettle73.5.1+really3.5.1-2ubuntu0.2
 libnghttp2-141.40.0-1build1
 libnpth01.6-1
 libp11-kit00.23.20-1ubuntu0.1
-libpam0g1.3.1-5ubuntu4.1
+libpam0g1.3.1-5ubuntu4.2
-libpam-modules1.3.1-5ubuntu4.1
+libpam-modules1.3.1-5ubuntu4.2
-libpam-modules-bin1.3.1-5ubuntu4.1
+libpam-modules-bin1.3.1-5ubuntu4.2
-libpam-runtime1.3.1-5ubuntu4.1
+libpam-runtime1.3.1-5ubuntu4.2
 libpcre2-16-010.34-7
 libpcre2-8-010.34-7
 libpcre32:8.39-12build1
 libperl5.305.30.0-9ubuntu0.2
-libprocps82:3.3.16-1ubuntu2
+libprocps82:3.3.16-1ubuntu2.2
 libpsl50.21.0-1ubuntu1
-libpython3.8-minimal3.8.5-1~20.04.2
+libpython3.8-minimal3.8.10-0ubuntu1~20.04
-libpython3.8-stdlib3.8.5-1~20.04.2
+libpython3.8-stdlib3.8.10-0ubuntu1~20.04
 libpython3-stdlib3.8.2-0ubuntu2
 libqt5core5a5.12.8+dfsg-0ubuntu1
 libqt5dbus55.12.8+dfsg-0ubuntu1
@@ -126,7 +126,7 @@ librtmp12.4+20151223.gitfa8646d.1-2build1
 libsasl2-22.1.27+dfsg-2
 libsasl2-modules2.1.27+dfsg-2
 libsasl2-modules-db2.1.27+dfsg-2
-libseccomp22.4.3-1ubuntu3.20.04.3
+libseccomp22.5.1-1ubuntu1~20.04.1
 libselinux13.0-1build2
 libsemanage13.0-1build2
 libsemanage-common3.0-1build2
@@ -136,17 +136,17 @@ libsocket6-perl0.29-1build1
 libsqlite3-03.31.1-4ubuntu0.2
 libss21.45.5-2ubuntu1
 libssh-40.9.3-2ubuntu2.1
-libssl1.11.1.1f-1ubuntu2.3
+libssl1.11.1.1f-1ubuntu2.4
-libstdc++610.2.0-5ubuntu1~20.04
+libstdc++610.3.0-1ubuntu1~20.04
-libsystemd0245.4-4ubuntu3.6
+libsystemd0245.4-4ubuntu3.7
 libtasn1-64.16.0-2
 libtinfo66.2-0ubuntu2
-libtorrent-rasterbar101.2.13+git20210323.34a979720b-1ppa1~20.04
+libtorrent-rasterbar101.2.14+git20210623.c996ed7ef7-1ppa1~20.04
-libudev1245.4-4ubuntu3.6
+libudev1245.4-4ubuntu3.7
 libunistring20.9.10-2
 libuuid12.34-0.1ubuntu9.1
 libwind0-heimdal7.7.0+dfsg-1ubuntu1
-libxml22.9.10+dfsg-5
+libxml22.9.10+dfsg-5ubuntu0.20.04.1
 libzstd11.4.4+dfsg-3ubuntu0.1
 locales2.31-0ubuntu9.2
 login1:4.8.1-1ubuntu5.20.04
@@ -158,7 +158,7 @@ mount2.34-0.1ubuntu9.1
 ncurses-base6.2-0ubuntu2
 ncurses-bin6.2-0ubuntu2
 netbase6.1
-openssl1.1.1f-1ubuntu2.3
+openssl1.1.1f-1ubuntu2.4
 p7zip16.02+dfsg-7build1
 p7zip-full16.02+dfsg-7build1
 passwd1:4.8.1-1ubuntu5.20.04
@@ -166,14 +166,14 @@ perl5.30.0-9ubuntu0.2
 perl-base5.30.0-9ubuntu0.2
 perl-modules-5.305.30.0-9ubuntu0.2
 pinentry-curses1.1.0-3build1
-procps2:3.3.16-1ubuntu2
+procps2:3.3.16-1ubuntu2.2
 publicsuffix20200303.0012-1
 python33.8.2-0ubuntu2
-python3.83.8.5-1~20.04.2
+python3.83.8.10-0ubuntu1~20.04
-python3.8-minimal3.8.5-1~20.04.2
+python3.8-minimal3.8.10-0ubuntu1~20.04
 python3-minimal3.8.2-0ubuntu2
-qbittorrent-cli1.6.20334-1
+qbittorrent-cli1.7.21116-1
-qbittorrent-nox1:4.3.4.99~202104180633-7350-2c8f322af~ubuntu20.04.1
+qbittorrent-nox1:4.3.6.99~202107121017-7389-3ac8c97e6~ubuntu20.04.1
 qttranslations5-l10n5.12.8-0ubuntu1
 readline-common8.0-4
 sed4.7-1

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

@@ -15,8 +15,10 @@ mkdir -p /config/qBittorrent
 	mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
 
 # chown download directory if currently not set to abc
-if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+if [[ -d /downloads ]]; then
+  if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
     chown -R abc:abc /downloads
+  fi
 fi
 
 # permissions