From db769dc00c628a50b3257adee41228898bbb4796 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Feb 2021 17:49:24 -0500 Subject: [PATCH] rebase to focal --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 12 ++++++------ Dockerfile.aarch64 | 12 ++++++------ Dockerfile.armhf | 12 ++++++------ Jenkinsfile | 2 +- README.md | 11 ++++++----- jenkins-vars.yml | 2 +- readme-vars.yml | 7 ++++--- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index fb93f9d..7daad28 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}') + EXT_RELEASE=$(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}') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for qbittorrent branch master" diff --git a/Dockerfile b/Dockerfile index 43dc340..140520a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE ARG VERSION ARG QBITTORRENT_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -22,12 +22,12 @@ RUN \ 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 bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ + 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/bionic/main/binary-amd64/Packages.gz | gunzip -c \ + 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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6028fe5..e1ba008 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,11 +1,11 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE ARG VERSION ARG QBITTORRENT_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -22,12 +22,12 @@ RUN \ 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 bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ + 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/bionic/main/binary-amd64/Packages.gz | gunzip -c \ + 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 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index cbca41b..634f4c4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,11 +1,11 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE ARG VERSION ARG QBITTORRENT_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -22,12 +22,12 @@ RUN \ 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 bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ - echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \ + 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/bionic/main/binary-amd64/Packages.gz | gunzip -c \ + 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 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 7466205..0349eab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''', + script: ''' 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}' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 8e8665e..0965985 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,8 @@ services: - TZ=Europe/London - WEBUI_PORT=8080 volumes: - - :/config - - :/downloads + - /path/to/appdata/config:/config + - /path/to/downloads:/downloads ports: - 6881:6881 - 6881:6881/udp @@ -107,8 +107,8 @@ docker run -d \ -p 6881:6881 \ -p 6881:6881/udp \ -p 8080:8080 \ - -v :/config \ - -v :/downloads \ + -v /path/to/appdata/config:/config \ + -v /path/to/downloads:/downloads \ --restart unless-stopped \ ghcr.io/linuxserver/qbittorrent ``` @@ -259,7 +259,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.01.21:"** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. +* **10.02.21:** - Rebase to focal. +* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **12.11.20:** - Stop creating /config/data directory on startup * **03.04.20:** - Fix adding search engine plugin * **02.08.19:** - Add qbitorrent-cli for processing scripts. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 07a0d2c..2d74223 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-qbittorrent external_type: na -custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'" +custom_version_command: "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}'" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index de39005..a8effd1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,8 +24,8 @@ common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Contains all relevant configuration files." } - - { vol_path: "/downloads", vol_host_path: "", desc: "Location of downloads on disk." } + - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", 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: - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" } @@ -68,7 +68,8 @@ app_setup_block: | # changelog changelogs: - - { date: 20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } + - { date: "10.02.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: "12.11.20:", desc: "Stop creating /config/data directory on startup" } - { date: "03.04.20:", desc: "Fix adding search engine plugin" } - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }