From fa78e3f0fc537a9ea8aaca16b0b9312463f3581c Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 25 Feb 2019 23:11:39 -0800 Subject: [PATCH 1/3] rebasing to bionic and adding some popular script dependancies --- Dockerfile | 28 +++++++++++++++++++--------- Dockerfile.aarch64 | 28 +++++++++++++++++++--------- Dockerfile.armhf | 28 +++++++++++++++++++--------- Jenkinsfile | 2 +- README.md | 3 ++- jenkins-vars.yml | 2 +- readme-vars.yml | 4 +++- 7 files changed, 64 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3383d3e..6c26499 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:xenial +FROM lsiobase/ubuntu:bionic # set version label ARG BUILD_DATE @@ -13,29 +13,39 @@ ENV HOME="/config" \ PYTHONIOENCODING=utf-8 RUN \ + echo "***** install gnupg ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ echo "***** add sabnzbd repositories ****" && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F && \ - echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ echo "**** install packages ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ - SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ + SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ fi && \ apt-get update && \ apt-get install -y \ p7zip-full \ par2-tbb \ - python-sabyenc \ - rolldice \ + python-pip \ ${SABNZBD} \ unrar \ unzip && \ + pip install --no-cache-dir \ + apprise \ + chardet \ + pynzb \ + requests \ + sabyenc && \ echo "**** cleanup ****" && \ + apt-get purge --auto-remove -y \ + python-pip && \ apt-get clean && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index fdd04af..647b526 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu.arm64:xenial +FROM lsiobase/ubuntu.arm64:bionic # Add qemu to build on x86_64 systems COPY qemu-aarch64-static /usr/bin @@ -16,29 +16,39 @@ ENV HOME="/config" \ PYTHONIOENCODING=utf-8 RUN \ + echo "***** install gnupg ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ echo "***** add sabnzbd repositories ****" && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F && \ - echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ echo "**** install packages ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ - SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ + SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ fi && \ apt-get update && \ apt-get install -y \ p7zip-full \ par2-tbb \ - python-sabyenc \ - rolldice \ + python-pip \ ${SABNZBD} \ unrar \ unzip && \ + pip install --no-cache-dir \ + apprise \ + chardet \ + pynzb \ + requests \ + sabyenc && \ echo "**** cleanup ****" && \ + apt-get purge --auto-remove -y \ + python-pip && \ apt-get clean && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 88107e9..d54d2ec 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu.armhf:xenial +FROM lsiobase/ubuntu.armhf:bionic # Add qemu to build on x86_64 systems COPY qemu-arm-static /usr/bin @@ -16,29 +16,39 @@ ENV HOME="/config" \ PYTHONIOENCODING=utf-8 RUN \ + echo "***** install gnupg ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ echo "***** add sabnzbd repositories ****" && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F && \ - echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ - echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/ppa/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ + echo "deb-src http://ppa.launchpad.net/jcfp/sab-addons/ubuntu bionic main" >> /etc/apt/sources.list.d/sabnzbd.list && \ echo "**** install packages ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ - SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ + SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ fi && \ apt-get update && \ apt-get install -y \ p7zip-full \ par2-tbb \ - python-sabyenc \ - rolldice \ + python-pip \ ${SABNZBD} \ unrar \ unzip && \ + pip install --no-cache-dir \ + apprise \ + chardet \ + pynzb \ + requests \ + sabyenc && \ echo "**** cleanup ****" && \ + apt-get purge --auto-remove -y \ + python-pip && \ apt-get clean && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 747fbc5..1278338 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sX GET http://ppa.launchpad.net/jcfp/ppa/ubuntu/dists/xenial/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: sabnzbdplus' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/$/-u/' ''', + script: ''' curl -sX GET http://ppa.launchpad.net/jcfp/ppa/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: sabnzbdplus' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/$/-u/' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 80a58c7..4d0f551 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel Initial setup is done from the http port. Https access for sabnzbd needs to be enabled in either the intial setup wizard or in the configure settings of the webui, be sure to use 9090 as port for https. -See here for info on some of the switch settings for sabnzbd http://wiki.sabnzbd.org/configure-switches +See here for info on some of the switch settings for sabnzbd https://sabnzbd.org/wiki/configuration/2.3/switches . @@ -166,6 +166,7 @@ Below are the instructions for updating containers: ## Versions +* **25.02.19:** - Rebase to Bionic, add python deps for scripts. * **26.01.19:** - Add pipeline logic and multi arch. * **13.12.17:** - Fix continuation lines. * **12.07.17:** - Add inspect commands to README, move to jenkins build and push. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e6de214..221750e 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-sabnzbd external_type: na -custom_version_command: "curl -sX GET http://ppa.launchpad.net/jcfp/ppa/ubuntu/dists/xenial/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: sabnzbdplus' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/$/-u/'" +custom_version_command: "curl -sX GET http://ppa.launchpad.net/jcfp/ppa/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: sabnzbdplus' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/$/-u/'" release_type: prerelease release_tag: unstable ls_branch: unstable diff --git a/readme-vars.yml b/readme-vars.yml index 072a9b6..745dadd 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -53,10 +53,12 @@ app_setup_block_enabled: true app_setup_block: | Initial setup is done from the http port. Https access for sabnzbd needs to be enabled in either the intial setup wizard or in the configure settings of the webui, be sure to use 9090 as port for https. - See here for info on some of the switch settings for sabnzbd http://wiki.sabnzbd.org/configure-switches + See here for info on some of the switch settings for sabnzbd https://sabnzbd.org/wiki/configuration/2.3/switches . + # changelog changelogs: + - { date: "25.02.19:", desc: "Rebase to Bionic, add python deps for scripts." } - { date: "26.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "13.12.17:", desc: "Fix continuation lines." } - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." } From b2d723e79d5914df59f3a301c71bf8da94017d21 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 25 Feb 2019 23:13:56 -0800 Subject: [PATCH 2/3] syntax error --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.armhf | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6c26499..e6685d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,10 +39,10 @@ RUN \ unzip && \ pip install --no-cache-dir \ apprise \ - chardet \ - pynzb \ + chardet \ + pynzb \ requests \ - sabyenc && \ + sabyenc && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ python-pip && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 647b526..9529e07 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -42,10 +42,10 @@ RUN \ unzip && \ pip install --no-cache-dir \ apprise \ - chardet \ - pynzb \ + chardet \ + pynzb \ requests \ - sabyenc && \ + sabyenc && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ python-pip && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d54d2ec..7723bd2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -42,10 +42,10 @@ RUN \ unzip && \ pip install --no-cache-dir \ apprise \ - chardet \ - pynzb \ + chardet \ + pynzb \ requests \ - sabyenc && \ + sabyenc && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ python-pip && \ From 30b9e3e1cc5cfefef50669052d850d90d3eae493 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 25 Feb 2019 23:25:07 -0800 Subject: [PATCH 3/3] updating dockerfiles for unstable forgot about verion tag stripping --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6685d6..af0fd4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,8 @@ RUN \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ + SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ + SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ fi && \ apt-get update && \ apt-get install -y \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9529e07..cfd6e77 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,8 @@ RUN \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ + SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ + SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ fi && \ apt-get update && \ apt-get install -y \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7723bd2..20494fc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -30,7 +30,8 @@ RUN \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD="sabnzbdplus"; \ else \ - SABNZBD="sabnzbdplus=${SABNZBD_VERSION}"; \ + SABNZBD_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \ + SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \ fi && \ apt-get update && \ apt-get install -y \