Merge pull request #310 from linuxserver/drop-cli

Drop qbittorrent-cli

Dockerfile

@@ -31,18 +31,7 @@ RUN \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
-  mkdir /qbt && \
-  if [ -z ${QBT_CLI_VERSION+x} ]; then \
-    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
-      | jq -r '. | .tag_name'); \
-  fi && \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-${QBT_CLI_VERSION#v}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
   echo "**** cleanup ****" && \
   rm -rf \
     /root/.cache \

Dockerfile.aarch64

@@ -31,18 +31,7 @@ RUN \
   fi && \
   apk add -U --upgrade --no-cache \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
-  mkdir /qbt && \
-  if [ -z ${QBT_CLI_VERSION+x} ]; then \
-    QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \
-      | jq -r '. | .tag_name'); \
-  fi && \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-${QBT_CLI_VERSION#v}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
   echo "**** cleanup ****" && \
   rm -rf \
     /root/.cache \

Jenkinsfile

@@ -33,9 +33,9 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8080'
     CI_SSL='false'
-    CI_DELAY='120'
+    CI_DELAY='60'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
-    CI_AUTH='user:password'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -105,7 +105,7 @@ services:
       - WEBUI_PORT=8080
       - TORRENTING_PORT=6881
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/qbittorrent/appdata/config:/config
       - /path/to/downloads:/downloads
     ports:
       - 8080:8080
@@ -127,7 +127,7 @@ docker run -d \
   -p 8080:8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/qbittorrent/appdata/config:/config \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
   lscr.io/linuxserver/qbittorrent:latest
@@ -311,6 +311,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
 * **14.02.24:** - Only set/override torrenting port if the optional env var is set.
 * **14.02.24:** - Add torrenting port support.
 * **31.01.24:** - Remove obsolete compat packages.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: alpine_repo
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - CONTAINER_NAME = 'qbittorrent'
   - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -24,7 +23,7 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='8080'
   - CI_SSL='false'
-  - CI_DELAY='120'
+  - CI_DELAY='60'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV=''
-  - CI_AUTH='user:password'
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -23,7 +23,7 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Contains all relevant configuration files." }
   - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
@@ -58,6 +58,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL." }
   - { date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
   - { date: "14.02.24:", desc: "Add torrenting port support." }
   - { date: "31.01.24:", desc: "Remove obsolete compat packages."}

root/usr/bin/qbt

@@ -1,14 +0,0 @@
-#!/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