Merge pull request #56 from thelamer/unstable

Rebase to bionic add some common python deps

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/ubuntu:xenial
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
@@ -13,29 +13,40 @@ 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_CLEAN=$(echo "${SABNZBD_VERSION}"| sed 's/..$//') && \
 	SABNZBD="sabnzbdplus=${SABNZBD_CLEAN}"; \
  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/* \

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,12 +16,16 @@ 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"; \
@@ -33,12 +37,19 @@ RUN \
  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/* \

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,12 +16,16 @@ 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"; \
@@ -33,12 +37,19 @@ RUN \
  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/* \

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'
         }

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.

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

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." }