Merge pull request #28 from linuxserver/2.0_release

bump to version 2.0

Dockerfile

@@ -6,48 +6,23 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 PYTHONIOENCODING=utf-8
 
-# build packages as variable
-ARG BUILD_PACKAGES="\
-	build-essential \
-	debhelper \
-	devscripts \
-	dh-autoreconf \
-	git \
-	libtbb-dev"
-
 # install packages
 RUN \
  echo "deb http://ppa.launchpad.net/jcfp/nobetas/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \
- echo "deb-src http://ppa.launchpad.net/jcfp/nobetas/ubuntu xenial main" >> /etc/apt/sources.list.d/sabnzbd.list && \ 
+ echo "deb-src http://ppa.launchpad.net/jcfp/nobetas/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 && \
  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F && \
  apt-get update && \
  apt-get install -y \
 	p7zip-full \
-	libtbb2 \
+	par2-tbb \
+	python-sabyenc \
 	sabnzbdplus \
 	unrar \
 	unzip && \
 
-# install build packages
- apt-get install -y \
-	$BUILD_PACKAGES && \
-
-# compile par2 multicore
- apt-get remove -y \
-	par2 && \
- git clone https://github.com/jcfp/debpkg-par2tbb.git \
-	/tmp/par2 && \
- cd /tmp/par2 && \
- uscan --force-download && \
- dpkg-buildpackage -S -us -uc -d && \
- dpkg-source -x ../par2cmdline-tbb_*.dsc && \
- cd /tmp/par2/par2cmdline-tbb-* && \
- dpkg-buildpackage -b -us -uc && \
- dpkg -i $(readlink -f ../par2-tbb_*.deb) && \
-
 # cleanup
- apt-get purge -y --auto-remove \
-	$BUILD_PACKAGES && \
  apt-get clean && \
  rm -rf \
 	/tmp/* \

README.md

@@ -87,6 +87,7 @@ See here for info on some of the switch settings for sabnzbd http://wiki.sabnzbd
 
 ## Versions
 
++ **10.04.17:** Bump to 2.0 Release.
 + **25.02.17:** Switch to nobetas repo for master/latest branch and add unstable branch.
 + **08.02.17:** Add pythonioenconding=utf8 as env.
 + **15.09.16:** Compile par2 multicore as per latest info sabnzbd git [readme](https://github.com/sabnzbd/sabnzbd#resolving-dependencies)