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

upgrade software to latest versions

Browse Source
This commit is contained in:
Rik Veenboer
2017-06-13 13:13:55 +01:00
parent bce647dba8
commit 77eb5e9c73
15 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/Makefile
View File

@@ -1,7 +1,7 @@
FROM = debian:jessie FROM = debian:jessie
MODE = minimal MODE = minimal
PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1) PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1)
TIMEZONE = Europe/Amsterdam TIMEZONE = Europe/London
JOBS = 2 JOBS = 2
CLEANUP = true CLEANUP = true
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=false
@@ -45,7 +45,7 @@ endef
build: build:
ifneq ($(CLEANUP),) ifneq ($(CLEANUP),)
$(call script,cleanup) $(call script,cleanup)
endif endif
@echo 'RUN chmod +x -R /opt/init.d' >> ${FILE} @echo 'RUN chmod +x -R /opt/init.d' >> ${FILE}
docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build
@rm -f ${FILE} @rm -f ${FILE}
@@ -55,7 +55,7 @@ prepare:
@rm -f $(DOCKER_HOME)/build/tmp.* @rm -f $(DOCKER_HOME)/build/tmp.*
@echo FROM $(FROM) > ${FILE} @echo FROM $(FROM) > ${FILE}
ifneq ($(PROXY),) ifneq ($(PROXY),)
$(call arg,PROXY,http://$(PROXY):3142) $(call arg,HTTP_PROXY,http://$(PROXY):3142)
endif endif
ifneq ($(TIMEZONE),) ifneq ($(TIMEZONE),)
$(call arg,TIMEZONE,$(TIMEZONE)) $(call arg,TIMEZONE,$(TIMEZONE))

6
build/make/jenkins.mk
View File

@@ -1,4 +1,4 @@
jenkins: jenkins:
sed -i "s,\(FROM\s*\).*,\1jenkins:2.0\nUSER root," ${FILE} sed -i "s,\(FROM\s*\).*,\1jenkins:2.46.3\nUSER root," ${FILE}
echo 'ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]' >> ${FILE} echo 'ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]' >> ${FILE}
$(call script,$@) $(call script,$@)

4
build/make/redis.mk
View File

@@ -1,3 +1,3 @@
redis: base redis: base compile
$(call script,$@) $(call script,$@)
$(call runit,$@) $(call runit,$@)

5
build/scripts/automysqlbackup.sh
View File

@@ -5,6 +5,9 @@ export_env AUTOMYSQLBACKUP_VERSION v${AUTOMYSQLBACKUP_VERSION_MAJOR}_${AUTOMYSQL
export_env AUTOMYSQLBACKUP_CONFIG /etc/automysqlbackup/automysqlbackup.conf export_env AUTOMYSQLBACKUP_CONFIG /etc/automysqlbackup/automysqlbackup.conf
export_env AUTOMYSQLBACKUP_DATA /host/var/backup/db export_env AUTOMYSQLBACKUP_DATA /host/var/backup/db
## Dependency
apt_install_permanent pigz
## AutoMySQLBackup ## AutoMySQLBackup
apt_install_permanent mysql-client apt_install_permanent mysql-client
cd /opt 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_username=\).*$,\1'backup'," $AUTOMYSQLBACKUP_CONFIG
sed -i "s,^#\(CONFIG_mysql_dump_host=\).*$,\1'mysql'," $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_backup_dir=\).*$,\1'/host/var/backup/db'," $AUTOMYSQLBACKUP_CONFIG
sed -i "s,^#\(CONFIG_db_exclude=\).*$,\1( 'mysql' 'information_schema' 'performance_schema' )," $AUTOMYSQLBACKUP_CONFIG sed -i "s,^#\(CONFIG_db_exclude=\).*$,\1( 'mysql' 'information_schema' 'performance_schema' )," $AUTOMYSQLBACKUP_CONFIG

4
build/scripts/hamachi.sh
View File

@@ -1,9 +1,9 @@
## Environment ## Environment
export_env HAMACHI_DATA /host/var/lib/logmein-hamachi 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 ## Dependencies
apt_install_permanent lsb-core net-tools socat strace apt_install_permanent lsb-core net-tools socat strace
## Hamachi ## Hamachi
wget -P /opt -O hamachi.deb https://secure.logmein.com/labs/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb wget -P /opt -O hamachi.deb https://www.vpn.net/installers/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb

2
build/scripts/handbrake.sh
View File

@@ -1,2 +1,2 @@
# Handbrake # Handbrake
apt_install_permanent --force-yes handbrake-cli apt_install_permanent handbrake-cli

4
build/scripts/lighttpd.sh
View File

@@ -1,6 +1,6 @@
## Environment ## Environment
export_env LIGHTTPD_VERSION_MAJOR 1.4 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_VERSION $LIGHTTPD_VERSION_MAJOR.$LIGHTTPD_VERSION_MINOR
export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf
export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log
@@ -30,4 +30,4 @@ if [ $MODE == "minimal" ]; then
cd /opt cd /opt
rm -r lighttpd-$LIGHTTPD_VERSION rm -r lighttpd-$LIGHTTPD_VERSION
rm lighttpd-$LIGHTTPD_VERSION.tar.gz rm lighttpd-$LIGHTTPD_VERSION.tar.gz
fi fi

3
build/scripts/multimedia.sh
View File

@@ -2,4 +2,5 @@
echo 'deb http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list 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 echo 'deb-src http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
apt update apt update
apt_install_permanent --force-yes deb-multimedia-keyring apt_install_permanent deb-multimedia-keyring
apt update

4
build/scripts/php.sh
View File

@@ -1,7 +1,7 @@
## Environment ## 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_CONFIG /usr/local/lib/php.ini
export_env PHP_TIMEZONE $TIMEZONE export_env PHP_TIMEZONE $TIMEZONE
## Dependencies ## Dependencies
apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev libssl-dev pkg-config apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev libssl-dev pkg-config

4
build/scripts/phpmyadmin.sh
View File

@@ -1,5 +1,5 @@
## Configuration ## 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_ROOT /var/www/html
export_env PMA_CONFIG $PMA_ROOT/config.inc.php export_env PMA_CONFIG $PMA_ROOT/config.inc.php
@@ -27,4 +27,4 @@ EOF
if [ $MODE == "minimal" ]; then if [ $MODE == "minimal" ]; then
cd /opt cd /opt
rm phpMyAdmin-$PMA_VERSION-all-languages.tar.gz rm phpMyAdmin-$PMA_VERSION-all-languages.tar.gz
fi fi

10
build/scripts/redis.sh
View File

@@ -1,8 +1,8 @@
## Environment ## Environment
export_env REDIS_CONFIG=/etc/redis/redis.conf export_env REDIS_CONFIG /etc/redis/redis.conf
export_env REDIS_LOG=/host/var/log/redis/redis.log export_env REDIS_LOG /host/var/log/redis/redis.log
export_env REDIS_DATA=/host/var/lib/redis export_env REDIS_DATA /host/var/lib/redis
export_env REDIS_VERSION=stable export_env REDIS_VERSION stable
## Redis (repository) ## Redis (repository)
apt_install_permanent redis-server apt_install_permanent redis-server
@@ -18,4 +18,4 @@ make
mkdir -p `dirname $REDIS_CONFIG` mkdir -p `dirname $REDIS_CONFIG`
sed -i "s,^\(daemonize\s*\).*$,\1no," $REDIS_CONFIG sed -i "s,^\(daemonize\s*\).*$,\1no," $REDIS_CONFIG
sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG
sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG

7
build/scripts/sabnzbd.sh
View File

@@ -1,11 +1,12 @@
## Environment ## Environmen t
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 echo 'deb http://ppa.launchpad.net/jcfp/nobetas/ubuntu precise main' >> /etc/apt/sources.list.d/sabnzbdplus.list
apt update apt update
apt install -f
apt_install_permanent sabnzbdplus apt_install_permanent sabnzbdplus
## Utilities ## Utilities

8
build/scripts/sonarr.sh
View File

@@ -1,12 +1,12 @@
## Environment ## Environment
export_env SONARR_DATA /host/var/lib/sonarr export_env SONARR_DATA /host/var/lib/sonarr
## Dependency ## Dependencies
apt_install_permanent libmono-cil-dev apt_install_permanent libmono-cil-dev sqlite3 mediainfo
## Sonarr ## Sonarr
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC
echo "deb http://apt.sonarr.tv/ develop main" | tee -a /etc/apt/sources.list echo "deb http://apt.sonarr.tv/ develop main" | tee -a /etc/apt/sources.list
apt update apt update
apt_install_permanent nzbdrone mediainfo apt_install_permanent nzbdrone
chmod +x /opt/NzbDrone/NzbDrone.exe chmod +x /opt/NzbDrone/NzbDrone.exe

6
build/scripts/syncthing.sh
View File

@@ -1,13 +1,13 @@
## Configuration ## Configuration
export_env SYNCTHING_CONFIG /host/etc/syncthing export_env SYNCTHING_CONFIG /host/etc/syncthing
export_env SYNCTHING_VERSION 0.12.23 export_env SYNCTHING_VERSION 0.14.30
# Syncthing # Syncthing
cd /opt 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 tar -xzvf syncthing.tar.gz
rm -f syncthing.tar.gz rm -f syncthing.tar.gz
mv syncthing-linux-amd64-v* syncthing mv syncthing-linux-amd64-v* syncthing
rm -rf syncthing/etc rm -rf syncthing/etc
rm -rf syncthing/*.pdf rm -rf syncthing/*.pdf
mkdir -p $SYNCTHING_CONFIG mkdir -p $SYNCTHING_CONFIG

2
build/scripts/transcoder.sh
View File

@@ -10,7 +10,7 @@ dpkg -i libdvdcss2_$LIBDVDCSS_VERSION-0_amd64.deb
apt_install_permanent vobcopy apt_install_permanent vobcopy
## Audio ## 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 ## Remove installation files
if [ $MODE == "minimal" ]; then if [ $MODE == "minimal" ]; then