Bot Updating Package Versions

Fix ports order

Dockerfile

@@ -9,16 +9,39 @@ 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
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --upgrade --virtual=build-dependencies \
+    make \
+    g++ \
+    gcc && \
+  echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     bash \
     curl \
+    icu-libs \
+    libstdc++ \
+    openssl \
+    p7zip \
     python3 && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
     QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
@@ -26,19 +49,18 @@ RUN \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
-  if [ -z ${QBT_VERSION+x} ]; then \
-    QBT_VERSION=$(curl -sX GET "https://api.github.com/repos/ludviglundgren/qbittorrent-cli/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  fi && \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/ludviglundgren/qbittorrent-cli/releases/download/${QBT_VERSION}/qbittorrent-cli_$(echo $QBT_VERSION | cut -c2-)_linux_amd64.tar.gz" && \
-  tar xzf \
+  mkdir /qbt && \
+  curl -L \
+    -o /tmp/qbt.tar.gz \
+    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt.tar.gz" && \
+  tar xf \
     /tmp/qbt.tar.gz -C \
-    /tmp && \
-    mv /tmp/qbt /usr/bin && \
+    /qbt && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
+    /root/.cache \
     /tmp/*
 
 # add local files

Dockerfile.aarch64

@@ -9,36 +9,58 @@ 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
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --upgrade --virtual=build-dependencies \
+    make \
+    g++ \
+    gcc && \
+  echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     bash \
     curl \
+    icu-libs \
+    libstdc++ \
+    openssl \
+    p7zip \
     python3 && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
-  if [ -z ${QBT_VERSION+x} ]; then \
-    QBT_VERSION=$(curl -sX GET "https://api.github.com/repos/ludviglundgren/qbittorrent-cli/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  fi && \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/ludviglundgren/qbittorrent-cli/releases/download/${QBT_VERSION}/qbittorrent-cli_$(echo $QBT_VERSION | cut -c2-)_linux_arm64.tar.gz" && \
-  tar xzf \
+  mkdir /qbt && \
+  curl -L \
+    -o /tmp/qbt.tar.gz \
+    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm64.tar.gz" && \
+  tar xf \
     /tmp/qbt.tar.gz -C \
-    /tmp && \
-    mv /tmp/qbt /usr/bin && \
+    /qbt && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
+    /root/.cache \
     /tmp/*
 
 # add local files

Dockerfile.armhf

@@ -9,36 +9,60 @@ 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
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
 # install runtime packages and qbitorrent-cli
 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --upgrade --virtual=build-dependencies \
+    make \
+    g++ \
+    gcc && \
+  echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     bash \
     curl \
+    gcompat \
+    icu-libs \
+    libc6-compat \
+    libstdc++ \
+    openssl \
+    p7zip \
     python3 && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
-  if [ -z ${QBT_VERSION+x} ]; then \
-    QBT_VERSION=$(curl -sX GET "https://api.github.com/repos/ludviglundgren/qbittorrent-cli/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  fi && \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/ludviglundgren/qbittorrent-cli/releases/download/${QBT_VERSION}/qbittorrent-cli_$(echo $QBT_VERSION | cut -c2-)_linux_armv6.tar.gz" && \
-  tar xzf \
+  mkdir /qbt && \
+  curl -L \
+    -o /tmp/qbt.tar.gz \
+    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm.tar.gz" && \
+  tar xf \
     /tmp/qbt.tar.gz -C \
-    /tmp && \
-    mv /tmp/qbt /usr/bin && \
+    /qbt && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
+    /root/.cache \
     /tmp/*
 
 # add local files

README.md

@@ -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,9 +130,9 @@ 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 \
@@ -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 |
@@ -264,6 +264,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **19.02.22:** - Add jq to build-stage

package_versions.txt

@@ -1,42 +1,46 @@
-alpine-baselayout-3.2.0-r19
+alpine-baselayout-3.2.0-r20
+alpine-baselayout-data-3.2.0-r20
 alpine-keys-2.4-r1
-apk-tools-2.12.9-r1
-bash-5.1.16-r0
+apk-tools-2.12.9-r2
+bash-5.1.16-r2
 brotli-libs-1.0.9-r6
-busybox-1.35.0-r3
+busybox-1.35.0-r10
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
-coreutils-9.0-r3
-curl-7.81.0-r1
-dbus-libs-1.12.22-r0
-expat-2.4.6-r0
+coreutils-9.1-r0
+curl-7.82.0-r1
+dbus-libs-1.12.22-r1
+double-conversion-3.1.5-r0
+expat-2.4.8-r0
+file-5.41-r0
 gdbm-1.23-r0
-glib-2.70.4-r0
-icu-libs-70.1-r0
-libacl-2.2.53-r0
+glib-2.72.1-r0
+icu-libs-71.1-r0
+libacl-2.3.1-r0
 libattr-2.5.1-r1
-libblkid-2.37.4-r1
-libbsd-0.11.5-r0
+libb2-0.98.1-r2
+libblkid-2.38-r1
+libbsd-0.11.6-r2
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1m-r2
-libcurl-7.81.0-r1
-libexecinfo-1.1-r1
+libcrypto1.1-1.1.1n-r0
+libcurl-7.82.0-r1
 libffi-3.4.2-r1
-libgcc-11.2.1_git20220219-r1
+libgcc-11.2.1_git20220219-r2
+libgomp-11.2.1_git20220219-r2
 libice-1.0.10-r0
-libintl-0.21-r1
+libintl-0.21-r2
+libmagic-5.41-r0
 libmd-1.0.3-r0
-libmount-2.37.4-r1
+libmount-2.38-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.1m-r2
-libstdc++-11.2.1_git20220219-r1
-libtorrent-rasterbar-2.0.5-r2
-libuuid-2.37.4-r1
-libx11-1.7.3.1-r0
+libssl1.1-1.1.1n-r0
+libstdc++-11.2.1_git20220219-r2
+libtorrent-rasterbar-2.0.6-r0
+libuuid-2.38-r1
+libx11-1.7.5-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
@@ -45,28 +49,30 @@ libxmu-1.1.3-r0
 libxt-1.2.1-r0
 linux-pam-1.5.2-r0
 mpdecimal-2.5.1-r1
-musl-1.2.2-r7
-musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20220219-r0
-ncurses-terminfo-base-6.3_p20220219-r0
+musl-1.2.3-r0
+musl-utils-1.2.3-r0
+ncurses-libs-6.3_p20220416-r0
+ncurses-terminfo-base-6.3_p20220416-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
+python3-3.10.3-r1
+qbittorrent-nox-4.4.2-r4
+qt6-qtbase-6.2.4-r1
 readline-8.1.2-r0
 scanelf-1.3.3-r0
 shadow-4.10-r3
-skalibs-2.11.1.0-r0
-sqlite-libs-3.37.2-r0
-ssl_client-1.35.0-r3
-tzdata-2021e-r0
-utmps-libs-0.1.1.0-r2
-xdg-utils-1.1.3-r2
+skalibs-2.11.2.0-r0
+sqlite-libs-3.38.2-r0
+ssl_client-1.35.0-r10
+tzdata-2022a-r0
+utmps-libs-0.1.2.0-r0
+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
+xz-5.2.5-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r1
+zstd-libs-1.5.2-r1

readme-vars.yml

@@ -27,9 +27,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"}
@@ -69,6 +69,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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." }
   - { date: "19.02.22:", desc: "Add jq to build-stage" }

root/usr/bin/qbt

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+# qbt bash wrapper to prompt user when trying to save password
+if [[ "$@" == "settings set password" ]]; then
+  echo "Setting password is not supported"
+  echo "Please use --ask-for-password or --password"
+elif [[ "$@" == "settings set"* ]]; then
+  /qbt/qbt "$@"
+elif [[ "$@" != *"--ask-for-password"* ]] && [[ "$@" != *"--password"* ]];then
+  echo "Please use --ask-for-password or --password and ensure username/url are set"
+  /qbt/qbt "$@"
+else
+  /qbt/qbt "$@"
+fi