Bot Updating Package Versions

Fix ports order

Dockerfile

@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -24,8 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
     icu-libs \
     libstdc++ \
     openssl \
@@ -50,9 +47,11 @@ RUN \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt.tar.gz" && \
+  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  curl -o \
+    /tmp/qbt.tar.gz -L \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \

Dockerfile.aarch64

@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -24,8 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
     icu-libs \
     libstdc++ \
     openssl \
@@ -50,9 +47,11 @@ RUN \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm64.tar.gz" && \
+  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  curl -o \
+    /tmp/qbt.tar.gz -L \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \

Dockerfile.armhf

@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -24,9 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
-    gcompat \
     icu-libs \
     libc6-compat \
     libstdc++ \
@@ -52,9 +48,11 @@ RUN \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm.tar.gz" && \
+  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 && \

Jenkinsfile

@@ -347,9 +347,11 @@ pipeline {
               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
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml
@@ -712,7 +714,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -46,25 +46,26 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. 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://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/).
 
-Simply pulling `lscr.io/linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+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.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
-| Tag | Description |
-| :----: | --- |
-| latest | Stable qbittorrent releases |
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable qbittorrent releases |
+| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
 
 ## Application Setup
 
@@ -72,7 +73,6 @@ The webui is at `<your-ip>:8080` and the default username/password is `admin/adm
 
 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.  
@@ -85,7 +85,7 @@ If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
 
 edit or add the following lines  
 
-```
+```text
 WebUI\Address=*
 
 WebUI\ServerDomains=*
@@ -104,7 +104,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent
+    image: lscr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent
     environment:
       - PUID=1000
@@ -115,9 +115,9 @@ services:
       - /path/to/appdata/config:/config
       - /path/to/downloads:/downloads
     ports:
+      - 8080:8080
       - 6881:6881
       - 6881:6881/udp
-      - 8080:8080
     restart: unless-stopped
 ```
 
@@ -130,13 +130,13 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -e WEBUI_PORT=8080 \
+  -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -p 8080:8080 \
   -v /path/to/appdata/config:/config \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent
+  lscr.io/linuxserver/qbittorrent:latest
 ```
 
 ## Parameters
@@ -145,9 +145,9 @@ Container images are configured using parameters passed at runtime (such as thos
 
 | Parameter | Function |
 | :----: | --- |
+| `-p 8080` | WebUI |
 | `-p 6881` | tcp connection port |
 | `-p 6881/udp` | udp connection port |
-| `-p 8080` | http gui |
 | `-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 |
@@ -198,7 +198,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * 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`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest`
 
 ## Updating Info
 
@@ -216,7 +216,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/qbittorrent`
+* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:latest`
 * Stop the running container: `docker stop qbittorrent`
 * Delete the container: `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)
@@ -264,6 +264,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.10.22:** - Add libtorrentv1 branch.
+* **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
+* **12.08.22:** - Bump unrar to 6.1.7.
+* **16.06.22:** - Rebase to Alpine 3.16 from edge.
+* **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
 * **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
 * **01.03.22:** - Add python for search plugin support.
 * **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.

package_versions.txt

@@ -1,77 +1,64 @@
-alpine-baselayout-3.2.0-r20
-alpine-baselayout-data-3.2.0-r20
+alpine-baselayout-3.3.0-r3
+alpine-baselayout-data-3.3.0-r3
 alpine-keys-2.4-r1
-apk-tools-2.12.9-r1
-bash-5.1.16-r0
-brotli-libs-1.0.9-r6
-busybox-1.35.0-r5
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
-coreutils-9.0-r3
-curl-7.82.0-r0
-dbus-libs-1.12.22-r0
-expat-2.4.7-r0
-file-5.41-r0
+apk-tools-2.12.10-r1
+bash-5.2.2-r0
+brotli-libs-1.0.9-r9
+busybox-1.35.0-r27
+busybox-binsh-1.35.0-r27
+ca-certificates-20220614-r2
+ca-certificates-bundle-20220614-r2
+coreutils-9.1-r0
+curl-7.86.0-r1
+dbus-libs-1.14.4-r0
+double-conversion-3.2.1-r0
 gdbm-1.23-r0
-glib-2.70.5-r0
-icu-libs-70.1-r0
-libacl-2.2.53-r0
+glib-2.74.1-r2
+icu-data-en-72.1-r1
+icu-libs-72.1-r1
+jq-1.6-r2
+libacl-2.3.1-r1
 libattr-2.5.1-r1
-libblkid-2.37.4-r1
-libbsd-0.11.5-r0
-libbz2-1.0.8-r1
+libb2-0.98.1-r2
+libblkid-2.38.1-r0
+libbz2-1.0.8-r3
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1n-r0
-libcurl-7.82.0-r0
-libexecinfo-1.1-r1
-libffi-3.4.2-r1
-libgcc-11.2.1_git20220219-r1
-libice-1.0.10-r0
-libintl-0.21-r1
-libmagic-5.41-r0
-libmd-1.0.3-r0
-libmount-2.37.4-r1
-libpcre2-16-10.39-r0
-libproc-3.3.17-r1
-libretls-3.4.2-r0
-libsm-1.2.3-r0
-libssl1.1-1.1.1n-r0
-libstdc++-11.2.1_git20220219-r1
-libtorrent-rasterbar-2.0.5-r2
-libuuid-2.37.4-r1
-libx11-1.7.3.1-r0
-libxau-1.0.9-r0
-libxcb-1.14-r2
-libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxmu-1.1.3-r0
-libxt-1.2.1-r0
-linux-pam-1.5.2-r0
+libcrypto3-3.0.7-r0
+libcurl-7.86.0-r1
+libexpat-2.5.0-r0
+libffi-3.4.4-r0
+libgcc-12.2.1_git20220924-r4
+libgomp-12.2.1_git20220924-r4
+libintl-0.21.1-r1
+libmount-2.38.1-r0
+libpcre2-16-10.40-r0
+libproc-3.3.17-r2
+libssl3-3.0.7-r0
+libstdc++-12.2.1_git20220924-r4
+libtorrent-rasterbar-2.0.8-r0
+linux-pam-1.5.2-r1
 mpdecimal-2.5.1-r1
-musl-1.2.2-r7
-musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20220312-r0
-ncurses-terminfo-base-6.3_p20220312-r0
-nghttp2-libs-1.47.0-r0
-openssl-1.1.1n-r0
-p7zip-17.04-r2
-pcre-8.45-r2
-procps-3.3.17-r1
-python3-3.10.2-r0
-qbittorrent-nox-4.4.1-r0
-qt5-qtbase-5.15.3_git20220217-r0
-readline-8.1.2-r0
-scanelf-1.3.3-r0
+musl-1.2.3-r2
+musl-utils-1.2.3-r1
+ncurses-libs-6.3_p20221029-r0
+ncurses-terminfo-base-6.3_p20221029-r0
+nghttp2-libs-1.50.0-r0
+oniguruma-6.9.8-r0
+openssl-3.0.7-r0
+p7zip-17.04-r3
+pcre2-10.40-r0
+procps-3.3.17-r2
+python3-3.10.8-r3
+qbittorrent-nox-4.4.5-r2
+qt6-qtbase-6.4.0-r1
+readline-8.2.0-r0
+scanelf-1.3.5-r1
 shadow-4.10-r3
-skalibs-2.11.2.0-r0
-sqlite-libs-3.37.2-r0
-ssl_client-1.35.0-r5
-tzdata-2021e-r0
-utmps-libs-0.1.1.0-r2
-xdg-utils-1.1.3-r3
-xprop-1.2.5-r0
-xset-1.2.4-r0
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
-zstd-libs-1.5.2-r0
+skalibs-2.12.0.1-r0
+sqlite-libs-3.39.4-r0
+ssl_client-1.35.0-r27
+tzdata-2022f-r0
+utmps-libs-0.1.2.0-r1
+xz-5.2.7-r0
+xz-libs-5.2.7-r0
+zlib-1.2.13-r0

readme-vars.yml

@@ -17,6 +17,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable qbittorrent releases" }
+  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }  
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -27,9 +28,9 @@ param_volumes:
   - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
+  - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
   - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
   - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
-  - { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
@@ -46,7 +47,6 @@ app_setup_block: |
   
   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.  
@@ -59,7 +59,7 @@ app_setup_block: |
   
   edit or add the following lines  
 
-  ```
+  ```text
   WebUI\Address=*
   
   WebUI\ServerDomains=*
@@ -69,6 +69,11 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
+  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
+  - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
+  - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
+  - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
   - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
   - { date: "01.03.22:", desc: "Add python for search plugin support." }
   - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }

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

@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folder
-mkdir -p /config/qBittorrent
-
-# copy config
-[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
-    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-
-# v4.3.3 BT_backup migration
-[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
-    mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \
-    mkdir /config/qBittorrent/BT_backup/ && \
-    cp -a /config/data/qBittorrent/BT_backup/.  /config/qBittorrent/BT_backup/ && \
-    mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
-
-# chown download directory if currently not set to abc
-if [[ -d /downloads ]]; then
-    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
-        chown -R abc:abc /downloads
-    fi
-fi
-
-# permissions
-chown -R abc:abc \
-    /config

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

@@ -0,0 +1,20 @@
+#!/usr/bin/with-contenv bash
+
+# make our folder
+mkdir -p /config/qBittorrent
+
+# copy default config
+if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
+    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
+fi
+
+# chown download directory if currently not set to abc
+if [[ -d /downloads ]]; then
+    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+        chown -R abc:abc /downloads
+    fi
+fi
+
+# permissions
+chown -R abc:abc \
+    /config

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

@@ -0,0 +1 @@
+oneshot

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

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd

@@ -0,0 +1 @@
+3

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

@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+WEBUI_PORT=${WEBUI_PORT:-8080}
+
+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}"

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

@@ -0,0 +1 @@
+longrun

root/etc/services.d/qbittorrent/run

@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-WEBUI_PORT=${WEBUI_PORT:-8080}
-
-exec \
-    s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"