rik/docker-deployment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update rar version and add 7zip in sabnzbd container

Browse Source
This commit is contained in:
Rik Veenboer
2016-12-27 10:30:12 +01:00
parent f7c125e19a
commit 2cc7047e7f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile
View File

@@ -4,7 +4,7 @@ PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1)
TIMEZONE = Europe/Amsterdam TIMEZONE = Europe/Amsterdam
JOBS = 2 JOBS = 2
CLEANUP = true CLEANUP = true
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=true
include $(wildcard $(DOCKER_HOME)/build/make/*.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
define add define add

7
build/scripts/sabnzbd.sh
View File

@@ -1,10 +1,8 @@
## Environment ## Environment
export_env RAR_VERSION 4.1.1 export_env RAR_VERSION 5.4.0
export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini
export_env SABNZBD_DATA /host/var/lib/sabnzbd export_env SABNZBD_DATA /host/var/lib/sabnzbd
## SABnzbd ## SABnzbd
echo 'deb http://ppa.launchpad.net/jcfp/ppa/ubuntu precise main' > /etc/apt/sources.list.d/sabnzbdplus.list echo 'deb http://ppa.launchpad.net/jcfp/ppa/ubuntu precise main' > /etc/apt/sources.list.d/sabnzbdplus.list
apt-key adv --keyserver hkp://pool.sks-keyservers.net:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F apt-key adv --keyserver hkp://pool.sks-keyservers.net:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F
@@ -19,3 +17,6 @@ cd /opt
wget http://www.rarlab.com/rar/rarlinux-x64-$RAR_VERSION.tar.gz wget http://www.rarlab.com/rar/rarlinux-x64-$RAR_VERSION.tar.gz
tar xzf rarlinux-x64-$RAR_VERSION.tar.gz tar xzf rarlinux-x64-$RAR_VERSION.tar.gz
ln -s /opt/rar/rar /usr/bin ln -s /opt/rar/rar /usr/bin
## 7zip
apt_install_permanent p7zip-full