Bot Updating Package Versions

Dockerfile

@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-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 "**** 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 \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+    gnupg \
+    python3 && \
+  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.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 \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.aarch64

@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-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 "**** 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 \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+    gnupg \
+    python3 && \
+  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.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 \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.armhf

@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-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 "**** 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 \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+    gnupg \
+    python3 && \
+  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.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 \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
-VOLUME /config /downloads
+VOLUME /config

package_versions.txt

@@ -88,8 +88,8 @@ 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-common2.4.49+dfsg-2ubuntu1.7
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
+libldap-common2.4.49+dfsg-2ubuntu1.8
 liblz4-11.9.2-2
 liblzma55.2.4-1ubuntu1
 libmagic11:5.38-4
@@ -148,7 +148,7 @@ libuuid12.34-0.1ubuntu9.1
 libwind0-heimdal7.7.0+dfsg-1ubuntu1
 libxml22.9.10+dfsg-5
 libzstd11.4.4+dfsg-3ubuntu0.1
-locales2.31-0ubuntu9.2
+locales2.31-0ubuntu9.3
 login1:4.8.1-1ubuntu5.20.04
 logsave1.45.5-2ubuntu1
 lsb-base11.1.0ubuntu2
@@ -172,8 +172,8 @@ python33.8.2-0ubuntu2
 python3.83.8.5-1~20.04.2
 python3.8-minimal3.8.5-1~20.04.2
 python3-minimal3.8.2-0ubuntu2
-qbittorrent-cli1.6.20334-1
-qbittorrent-nox1:4.3.4.99~202104250604-7352-b2a43eeff~ubuntu20.04.1
+qbittorrent-cli1.7.21116-1
+qbittorrent-nox1:4.3.4.99~202104281424-7353-7dd9e7343~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
-	chown -R abc:abc /downloads
+if [[ -d /downloads ]]; then
+  if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+    chown -R abc:abc /downloads
+  fi
 fi
 
 # permissions