Merge pull request #145 from linuxserver/deprecate-unstable

2022-01-06 17:46:27 +00:00
parent 5dfa827b3d 0d725cf71d
commit 263256cb90
5 changed files with 25 additions and 118 deletions
--- a/40
+++ b/40
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+FROM ghcr.io/linuxserver/qbittorrent:unstable

 # set version label
 ARG BUILD_DATE
@@ -7,44 +7,6 @@ ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"

-# environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-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://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-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/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-unstable/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/ /

--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+FROM ghcr.io/linuxserver/qbittorrent:arm64v8-unstable

 # set version label
 ARG BUILD_DATE
@@ -7,44 +7,6 @@ ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"

-# environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-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://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-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/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-unstable/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/ /

--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+FROM ghcr.io/linuxserver/qbittorrent:arm32v7-unstable

 # set version label
 ARG BUILD_DATE
@@ -7,44 +7,6 @@ ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"

-# environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-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://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-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
-  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/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-unstable/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/ /

--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -17,7 +17,6 @@ available_architectures:
 development_versions: true
 development_versions_items:
  - { tag: "latest", desc: "Stable qbittorrent releases" }
-  - { tag: "unstable", desc: "Unstable qbittorrent releases" }

 # container parameters
 common_param_env_vars_enabled: true
@@ -70,6 +69,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "06.01.22:", desc: "Deprecate unstable branch." }
  - { date: "24.03.21:", desc: "Rebase to focal." }
  - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
  - { date: "05.07.20:", desc: "Shift to Python3" }
--- a/root/etc/cont-init.d/99-deprecate
+++ b/root/etc/cont-init.d/99-deprecate
@@ -0,0 +1,21 @@
+#! /usr/bin/with-contenv bash
+
+echo '
+******************************************************
+******************************************************
+*                                                    *
+*                                                    *
+*             This image is deprecated.              *
+*      We will not offer support for this image      *
+*             and it will not be updated.            *
+*                                                    *
+*                                                    *
+******************************************************
+******************************************************
+
+We recommend our stable qbittorrent branch instead:
+https://github.com/linuxserver/docker-qbittorrent
+
+
+******************************************************
+******************************************************'