From 77eb5e9c73adba33f5d52456530c454cf18d469c Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Tue, 13 Jun 2017 13:13:55 +0100 Subject: [PATCH] upgrade software to latest versions --- build/Makefile | 6 +++--- build/make/jenkins.mk | 6 +++--- build/make/redis.mk | 4 ++-- build/scripts/automysqlbackup.sh | 5 ++++- build/scripts/hamachi.sh | 4 ++-- build/scripts/handbrake.sh | 2 +- build/scripts/lighttpd.sh | 4 ++-- build/scripts/multimedia.sh | 3 ++- build/scripts/php.sh | 4 ++-- build/scripts/phpmyadmin.sh | 4 ++-- build/scripts/redis.sh | 10 +++++----- build/scripts/sabnzbd.sh | 7 ++++--- build/scripts/sonarr.sh | 8 ++++---- build/scripts/syncthing.sh | 6 +++--- build/scripts/transcoder.sh | 2 +- 15 files changed, 40 insertions(+), 35 deletions(-) diff --git a/build/Makefile b/build/Makefile index dc1f331..3738bb3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,7 +1,7 @@ FROM = debian:jessie MODE = minimal PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1) -TIMEZONE = Europe/Amsterdam +TIMEZONE = Europe/London JOBS = 2 CLEANUP = true ARGS = --rm=false --no-cache=false @@ -45,7 +45,7 @@ endef build: ifneq ($(CLEANUP),) $(call script,cleanup) -endif +endif @echo 'RUN chmod +x -R /opt/init.d' >> ${FILE} docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build @rm -f ${FILE} @@ -55,7 +55,7 @@ prepare: @rm -f $(DOCKER_HOME)/build/tmp.* @echo FROM $(FROM) > ${FILE} ifneq ($(PROXY),) - $(call arg,PROXY,http://$(PROXY):3142) + $(call arg,HTTP_PROXY,http://$(PROXY):3142) endif ifneq ($(TIMEZONE),) $(call arg,TIMEZONE,$(TIMEZONE)) diff --git a/build/make/jenkins.mk b/build/make/jenkins.mk index 4d33887..9f30443 100644 --- a/build/make/jenkins.mk +++ b/build/make/jenkins.mk @@ -1,4 +1,4 @@ jenkins: - sed -i "s,\(FROM\s*\).*,\1jenkins:2.0\nUSER root," ${FILE} - echo 'ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]' >> ${FILE} - $(call script,$@) \ No newline at end of file + sed -i "s,\(FROM\s*\).*,\1jenkins:2.46.3\nUSER root," ${FILE} + echo 'ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]' >> ${FILE} + $(call script,$@) diff --git a/build/make/redis.mk b/build/make/redis.mk index 4f3730b..24a3153 100644 --- a/build/make/redis.mk +++ b/build/make/redis.mk @@ -1,3 +1,3 @@ -redis: base +redis: base compile $(call script,$@) - $(call runit,$@) \ No newline at end of file + $(call runit,$@) diff --git a/build/scripts/automysqlbackup.sh b/build/scripts/automysqlbackup.sh index f0d1d9b..e33dd06 100644 --- a/build/scripts/automysqlbackup.sh +++ b/build/scripts/automysqlbackup.sh @@ -5,6 +5,9 @@ export_env AUTOMYSQLBACKUP_VERSION v${AUTOMYSQLBACKUP_VERSION_MAJOR}_${AUTOMYSQL export_env AUTOMYSQLBACKUP_CONFIG /etc/automysqlbackup/automysqlbackup.conf export_env AUTOMYSQLBACKUP_DATA /host/var/backup/db +## Dependency +apt_install_permanent pigz + ## AutoMySQLBackup apt_install_permanent mysql-client cd /opt @@ -18,4 +21,4 @@ cp /opt/automysqlbackup/automysqlbackup.conf $AUTOMYSQLBACKUP_CONFIG sed -i "s,^#\(CONFIG_mysql_dump_username=\).*$,\1'backup'," $AUTOMYSQLBACKUP_CONFIG sed -i "s,^#\(CONFIG_mysql_dump_host=\).*$,\1'mysql'," $AUTOMYSQLBACKUP_CONFIG sed -i "s,^#\(CONFIG_backup_dir=\).*$,\1'/host/var/backup/db'," $AUTOMYSQLBACKUP_CONFIG -sed -i "s,^#\(CONFIG_db_exclude=\).*$,\1( 'mysql' 'information_schema' 'performance_schema' )," $AUTOMYSQLBACKUP_CONFIG \ No newline at end of file +sed -i "s,^#\(CONFIG_db_exclude=\).*$,\1( 'mysql' 'information_schema' 'performance_schema' )," $AUTOMYSQLBACKUP_CONFIG diff --git a/build/scripts/hamachi.sh b/build/scripts/hamachi.sh index 16e2c3b..7dd159f 100644 --- a/build/scripts/hamachi.sh +++ b/build/scripts/hamachi.sh @@ -1,9 +1,9 @@ ## Environment export_env HAMACHI_DATA /host/var/lib/logmein-hamachi -export_env HAMACHI_VERSION 2.1.0.119 +export_env HAMACHI_VERSION 2.1.0.174 ## Dependencies apt_install_permanent lsb-core net-tools socat strace ## Hamachi -wget -P /opt -O hamachi.deb https://secure.logmein.com/labs/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb \ No newline at end of file +wget -P /opt -O hamachi.deb https://www.vpn.net/installers/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb diff --git a/build/scripts/handbrake.sh b/build/scripts/handbrake.sh index 8e65fec..8d8183b 100644 --- a/build/scripts/handbrake.sh +++ b/build/scripts/handbrake.sh @@ -1,2 +1,2 @@ # Handbrake -apt_install_permanent --force-yes handbrake-cli +apt_install_permanent handbrake-cli diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh index 0418a91..6375fd0 100644 --- a/build/scripts/lighttpd.sh +++ b/build/scripts/lighttpd.sh @@ -1,6 +1,6 @@ ## Environment export_env LIGHTTPD_VERSION_MAJOR 1.4 -export_env LIGHTTPD_VERSION_MINOR 39 +export_env LIGHTTPD_VERSION_MINOR 45 export_env LIGHTTPD_VERSION $LIGHTTPD_VERSION_MAJOR.$LIGHTTPD_VERSION_MINOR export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log @@ -30,4 +30,4 @@ if [ $MODE == "minimal" ]; then cd /opt rm -r lighttpd-$LIGHTTPD_VERSION rm lighttpd-$LIGHTTPD_VERSION.tar.gz -fi \ No newline at end of file +fi diff --git a/build/scripts/multimedia.sh b/build/scripts/multimedia.sh index 805c4c3..6b525bb 100644 --- a/build/scripts/multimedia.sh +++ b/build/scripts/multimedia.sh @@ -2,4 +2,5 @@ echo 'deb http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list echo 'deb-src http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list apt update -apt_install_permanent --force-yes deb-multimedia-keyring +apt_install_permanent deb-multimedia-keyring +apt update diff --git a/build/scripts/php.sh b/build/scripts/php.sh index 7fa2b81..8685b67 100644 --- a/build/scripts/php.sh +++ b/build/scripts/php.sh @@ -1,7 +1,7 @@ ## Environment -export_env PHP_VERSION 5.6.23 +export_env PHP_VERSION 7.1.6 export_env PHP_CONFIG /usr/local/lib/php.ini -export_env PHP_TIMEZONE $TIMEZONE +export_env PHP_TIMEZONE $TIMEZONE ## Dependencies apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev libssl-dev pkg-config diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh index 05ab491..66ffb37 100644 --- a/build/scripts/phpmyadmin.sh +++ b/build/scripts/phpmyadmin.sh @@ -1,5 +1,5 @@ ## Configuration -export_env PMA_VERSION 4.6.0 +export_env PMA_VERSION 4.7.1 export_env PMA_ROOT /var/www/html export_env PMA_CONFIG $PMA_ROOT/config.inc.php @@ -27,4 +27,4 @@ EOF if [ $MODE == "minimal" ]; then cd /opt rm phpMyAdmin-$PMA_VERSION-all-languages.tar.gz -fi \ No newline at end of file +fi diff --git a/build/scripts/redis.sh b/build/scripts/redis.sh index 5fce40e..457173f 100644 --- a/build/scripts/redis.sh +++ b/build/scripts/redis.sh @@ -1,8 +1,8 @@ ## Environment -export_env REDIS_CONFIG=/etc/redis/redis.conf -export_env REDIS_LOG=/host/var/log/redis/redis.log -export_env REDIS_DATA=/host/var/lib/redis -export_env REDIS_VERSION=stable +export_env REDIS_CONFIG /etc/redis/redis.conf +export_env REDIS_LOG /host/var/log/redis/redis.log +export_env REDIS_DATA /host/var/lib/redis +export_env REDIS_VERSION stable ## Redis (repository) apt_install_permanent redis-server @@ -18,4 +18,4 @@ make mkdir -p `dirname $REDIS_CONFIG` sed -i "s,^\(daemonize\s*\).*$,\1no," $REDIS_CONFIG sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG -sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG \ No newline at end of file +sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG diff --git a/build/scripts/sabnzbd.sh b/build/scripts/sabnzbd.sh index caad1a1..98b9662 100644 --- a/build/scripts/sabnzbd.sh +++ b/build/scripts/sabnzbd.sh @@ -1,11 +1,12 @@ -## Environment +## Environmen t export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini export_env SABNZBD_DATA /host/var/lib/sabnzbd ## SABnzbd -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 +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/nobetas/ubuntu precise main' >> /etc/apt/sources.list.d/sabnzbdplus.list apt update +apt install -f apt_install_permanent sabnzbdplus ## Utilities diff --git a/build/scripts/sonarr.sh b/build/scripts/sonarr.sh index 478b11a..228fd60 100644 --- a/build/scripts/sonarr.sh +++ b/build/scripts/sonarr.sh @@ -1,12 +1,12 @@ ## Environment export_env SONARR_DATA /host/var/lib/sonarr -## Dependency -apt_install_permanent libmono-cil-dev +## Dependencies +apt_install_permanent libmono-cil-dev sqlite3 mediainfo ## Sonarr apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC echo "deb http://apt.sonarr.tv/ develop main" | tee -a /etc/apt/sources.list apt update -apt_install_permanent nzbdrone mediainfo -chmod +x /opt/NzbDrone/NzbDrone.exe \ No newline at end of file +apt_install_permanent nzbdrone +chmod +x /opt/NzbDrone/NzbDrone.exe diff --git a/build/scripts/syncthing.sh b/build/scripts/syncthing.sh index 03dd944..6e13f15 100644 --- a/build/scripts/syncthing.sh +++ b/build/scripts/syncthing.sh @@ -1,13 +1,13 @@ ## Configuration export_env SYNCTHING_CONFIG /host/etc/syncthing -export_env SYNCTHING_VERSION 0.12.23 +export_env SYNCTHING_VERSION 0.14.30 # Syncthing cd /opt -curl -L -o syncthing.tar.gz http://archive.syncthing.net/v$SYNCTHING_VERSION/syncthing-linux-amd64-v$SYNCTHING_VERSION.tar.gz +curl -L -o syncthing.tar.gz https://github.com/syncthing/syncthing/releases/download/v$SYNCTHING_VERSION/syncthing-linux-amd64-v$SYNCTHING_VERSION.tar.gz tar -xzvf syncthing.tar.gz rm -f syncthing.tar.gz mv syncthing-linux-amd64-v* syncthing rm -rf syncthing/etc rm -rf syncthing/*.pdf -mkdir -p $SYNCTHING_CONFIG \ No newline at end of file +mkdir -p $SYNCTHING_CONFIG diff --git a/build/scripts/transcoder.sh b/build/scripts/transcoder.sh index 8fc275f..3fc5f4e 100644 --- a/build/scripts/transcoder.sh +++ b/build/scripts/transcoder.sh @@ -10,7 +10,7 @@ dpkg -i libdvdcss2_$LIBDVDCSS_VERSION-0_amd64.deb apt_install_permanent vobcopy ## Audio -apt_install_permanent --force-yes libmp3lame0 libavcodec-extra* libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev libopenjpeg-dev libx264-* libfaac-dev +apt_install_permanent libmp3lame0 libavcodec-extra* libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev libopenjpeg-dev libx264-* libfaac-dev ## Remove installation files if [ $MODE == "minimal" ]; then