From 628bc5705ec73bd511ef388409181ee58a301340 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 9 Jun 2019 13:57:27 +0100 Subject: [PATCH] update to 2.x version using deluge ppa --- Dockerfile | 40 ++++++++---------------------- Dockerfile.aarch64 | 40 ++++++++---------------------- Dockerfile.armhf | 40 ++++++++---------------------- readme-vars.yml | 1 + root/etc/services.d/deluge-web/run | 2 +- 5 files changed, 35 insertions(+), 88 deletions(-) diff --git a/Dockerfile b/Dockerfile index bddc7b5..8015439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="sparklyballs, aptalca" # environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs" # install software RUN \ + echo "**** add repositories ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C5E6A5ED249AD24C && \ + echo "deb http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ + echo "deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ echo "**** install packages ****" && \ apt-get update && \ apt-get install -y \ @@ -20,36 +30,8 @@ RUN \ deluge-web \ p7zip-full \ unrar \ - unzip \ - libssl1.0.0 \ - openssl && \ - echo "**** install build deps ****" && \ - apt-get install -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - echo "**** install pip packages ****" && \ - pip install --no-cache-dir -U \ - incremental \ - crypto \ - mako \ - markupsafe \ - pyopenssl \ - service_identity \ - six \ - twisted \ - zope.interface && \ + unzip && \ echo "**** cleanup ****" && \ - apt-get purge -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - apt-get --purge autoremove -y && \ - apt-get clean && \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0131214..a6bb06a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,10 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="sparklyballs, aptalca" # environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs" # install software RUN \ + echo "**** add repositories ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C5E6A5ED249AD24C && \ + echo "deb http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ + echo "deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ echo "**** install packages ****" && \ apt-get update && \ apt-get install -y \ @@ -20,36 +30,8 @@ RUN \ deluge-web \ p7zip-full \ unrar \ - unzip \ - libssl1.0.0 \ - openssl && \ - echo "**** install build deps ****" && \ - apt-get install -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - echo "**** install pip packages ****" && \ - pip install --no-cache-dir -U \ - incremental \ - crypto \ - mako \ - markupsafe \ - pyopenssl \ - service_identity \ - six \ - twisted \ - zope.interface && \ + unzip && \ echo "**** cleanup ****" && \ - apt-get purge -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - apt-get --purge autoremove -y && \ - apt-get clean && \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 566f7a3..9310e5c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,10 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="sparklyballs, aptalca" # environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs" # install software RUN \ + echo "**** add repositories ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C5E6A5ED249AD24C && \ + echo "deb http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ + echo "deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \ + /etc/apt/sources.list.d/deluge.list && \ echo "**** install packages ****" && \ apt-get update && \ apt-get install -y \ @@ -20,36 +30,8 @@ RUN \ deluge-web \ p7zip-full \ unrar \ - unzip \ - libssl1.0.0 \ - openssl && \ - echo "**** install build deps ****" && \ - apt-get install -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - echo "**** install pip packages ****" && \ - pip install --no-cache-dir -U \ - incremental \ - crypto \ - mako \ - markupsafe \ - pyopenssl \ - service_identity \ - six \ - twisted \ - zope.interface && \ + unzip && \ echo "**** cleanup ****" && \ - apt-get purge -y \ - libssl-dev \ - python-dev \ - build-essential \ - libffi-dev \ - python-pip && \ - apt-get --purge autoremove -y && \ - apt-get clean && \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ diff --git a/readme-vars.yml b/readme-vars.yml index 37ba0a8..3a535d7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "09.06.19:", desc: "Update to 2.x using deluge ppa." } - { date: "02.05.19:", desc: "Install full version of 7zip." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "15.11.18:", desc: "Add deluge-console." } diff --git a/root/etc/services.d/deluge-web/run b/root/etc/services.d/deluge-web/run index 7566762..3a37cf3 100644 --- a/root/etc/services.d/deluge-web/run +++ b/root/etc/services.d/deluge-web/run @@ -6,4 +6,4 @@ umask "$UMASK_SET" exec \ s6-setuidgid abc /usr/bin/deluge-web \ - -c /config --loglevel=info + -d -c /config --loglevel=info