From d4381991e17ab2fb4f7bcf6a0e9200bc98b31aff Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Thu, 31 Dec 2015 13:39:36 +0100 Subject: [PATCH] Cleanups, write log files of sonarr and mysql to host --- build/config | 16 ++++++---------- build/runit/mysql | 2 +- build/runit/sonarr | 2 +- build/scripts/automysqlbackup.sh | 2 +- build/scripts/backintime.sh | 2 +- build/scripts/chrome.sh | 2 +- build/scripts/cleanup.sh | 2 +- build/scripts/collectd.sh | 2 +- build/scripts/compile.sh | 2 +- build/scripts/cron.sh | 2 +- build/scripts/firefox.sh | 2 +- build/scripts/ftp.sh | 4 ++-- build/scripts/gmrender.sh | 2 +- build/scripts/hamachi.sh | 2 +- build/scripts/headphones.sh | 4 ++-- build/scripts/lighttpd.sh | 6 +++--- build/scripts/minidlna.sh | 2 +- build/scripts/mysql.sh | 2 +- build/scripts/php.sh | 4 ++-- build/scripts/prepare.sh | 8 ++++---- build/scripts/pulseaudio.sh | 2 +- build/scripts/redis.sh | 2 +- build/scripts/runit.sh | 2 +- build/scripts/sabnzbd.sh | 6 +++--- build/scripts/sickbeard.sh | 2 +- build/scripts/sonarr.sh | 4 ++-- build/scripts/sshd.sh | 4 ++-- build/scripts/syslog.sh | 2 +- build/scripts/transmission.sh | 2 +- build/scripts/upnpproxy.sh | 2 +- build/scripts/utilities.sh | 4 ++-- 31 files changed, 49 insertions(+), 53 deletions(-) diff --git a/build/config b/build/config index 4336a8b..ebdf1f6 100644 --- a/build/config +++ b/build/config @@ -1,20 +1,20 @@ export LC_ALL=C export DEBIAN_FRONTEND=noninteractive -apt_get_install='apt-get install -y --no-install-recommends' +apt_install='apt-get install -y --no-install-recommends' -apt_get_install_permanent() { +apt_install_permanent() { echo $@ >> /build/permanent - $apt_get_install "$@" + $apt_install "$@" } -apt_get_install_temporary() { +apt_install_temporary() { echo $@ >> /build/temporary - $apt_get_install "$@" + $apt_install "$@" } apt_remove() { - apt-get -y --purge autoremove + apt-get autoremove -y --purge "$@" } export_env() { @@ -25,7 +25,3 @@ export_env() { import_env() { export $1=`cat /etc/container_environment/$1` } - -add_host() { - echo "echo \"\$${1^^}_PORT_3306_TCP_ADDR $1\" >> /tmp/hosts" >> /opt/init.d/*_hosts -} \ No newline at end of file diff --git a/build/runit/mysql b/build/runit/mysql index 2f53a5d..3b05d5c 100644 --- a/build/runit/mysql +++ b/build/runit/mysql @@ -6,4 +6,4 @@ if [ ! -d $MYSQL_DATA ]; then cp /var/lib/mysql/ $MYSQL_DATA -R chown mysql:mysql $MYSQL_DATA -R fi -/usr/bin/mysqld_safe --skip-syslog \ No newline at end of file +/usr/bin/mysqld_safe --skip-syslog > /host/var/log/mysql/daemon.log diff --git a/build/runit/sonarr b/build/runit/sonarr index a81b269..c9b1750 100644 --- a/build/runit/sonarr +++ b/build/runit/sonarr @@ -1,3 +1,3 @@ #!/bin/bash set -e -mono /opt/NzbDrone/NzbDrone.exe --no-browser -data=$SONARR_DATA \ No newline at end of file +mono /opt/NzbDrone/NzbDrone.exe --no-browser -data=$SONARR_DATA > /dev/null diff --git a/build/scripts/automysqlbackup.sh b/build/scripts/automysqlbackup.sh index ba5b25c..cf757f5 100644 --- a/build/scripts/automysqlbackup.sh +++ b/build/scripts/automysqlbackup.sh @@ -11,7 +11,7 @@ export_env AUTOMYSQLBACKUP_CONFIG /etc/automysqlbackup/automysqlbackup.conf export_env AUTOMYSQLBACKUP_DATA /host/var/backup/db ## AutoMySQLBackup -apt_get_install_permanent mysql-client +apt_install_permanent mysql-client cd /opt wget "http://downloads.sourceforge.net/project/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup VER $AUTOMYSQLBACKUP_VERSION_MAJOR/automysqlbackup-$AUTOMYSQLBACKUP_VERSION.tar.gz" mkdir automysqlbackup diff --git a/build/scripts/backintime.sh b/build/scripts/backintime.sh index f5bd428..2d51f35 100644 --- a/build/scripts/backintime.sh +++ b/build/scripts/backintime.sh @@ -7,7 +7,7 @@ set -x ## BackInTime -apt_get_install_permanent backintime-common python-dbus +apt_install_permanent backintime-common python-dbus ## Configuration diff --git a/build/scripts/chrome.sh b/build/scripts/chrome.sh index 9f73841..5b8869f 100644 --- a/build/scripts/chrome.sh +++ b/build/scripts/chrome.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Chrome dependencies -apt_get_install_permanent gconf-service libasound2 libatk1.0-0 libcairo2 libcap2 libcups2 libcurl3 libfontconfig1 libgdk-pixbuf2.0-0 libgtk2.0-0 libnspr4 libnss3 libpango1.0-0 librtmp0 libxss1 libxtst6 xdg-utils +apt_install_permanent gconf-service libasound2 libatk1.0-0 libcairo2 libcap2 libcups2 libcurl3 libfontconfig1 libgdk-pixbuf2.0-0 libgtk2.0-0 libnspr4 libnss3 libpango1.0-0 librtmp0 libxss1 libxtst6 xdg-utils ## Chrome mkdir -p /usr/share/icons/hicolor diff --git a/build/scripts/cleanup.sh b/build/scripts/cleanup.sh index 65d41f6..c6a3c62 100644 --- a/build/scripts/cleanup.sh +++ b/build/scripts/cleanup.sh @@ -5,7 +5,7 @@ set -x ## Remove temporary packages for minimal builds if [ $MODE == "minimal" ]; then - cat /build/temporary | xargs apt_remove + apt_remove "$(cat /build/temporary)" fi ## Clean apt files diff --git a/build/scripts/collectd.sh b/build/scripts/collectd.sh index 05a81c1..7247446 100644 --- a/build/scripts/collectd.sh +++ b/build/scripts/collectd.sh @@ -4,4 +4,4 @@ source /build/config set -x ## collectd -apt_get_install_permanent libsensors4 collectd \ No newline at end of file +apt_install_permanent libsensors4 collectd \ No newline at end of file diff --git a/build/scripts/compile.sh b/build/scripts/compile.sh index 7143218..c6f9ae9 100644 --- a/build/scripts/compile.sh +++ b/build/scripts/compile.sh @@ -4,4 +4,4 @@ source /build/config set -x ## Often used tools -apt_get_install_temporary gcc make automake libtool +apt_install_temporary gcc make automake libtool diff --git a/build/scripts/cron.sh b/build/scripts/cron.sh index 3994da3..d41e1a4 100644 --- a/build/scripts/cron.sh +++ b/build/scripts/cron.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Install cron daemon -apt_get_install_permanent cron +apt_install_permanent cron ## Remove useless cron entries # Checks for lost+found and scans for mtab diff --git a/build/scripts/firefox.sh b/build/scripts/firefox.sh index 148395c..e4a3ed9 100644 --- a/build/scripts/firefox.sh +++ b/build/scripts/firefox.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Chrome dependencies -apt_get_install_permanent firefox +apt_install_permanent firefox ## Pulseaudio script echo "PULSE_SERVER=host firefox" > /opt/firefox diff --git a/build/scripts/ftp.sh b/build/scripts/ftp.sh index 61d2bb7..d549cc2 100644 --- a/build/scripts/ftp.sh +++ b/build/scripts/ftp.sh @@ -7,5 +7,5 @@ set -x export_env FTP_DATA /host/var/lib/ftp ## Pure-FTPd -apt-get update -apt_get_install_permanent pure-ftpd +apt update +apt_install_permanent pure-ftpd diff --git a/build/scripts/gmrender.sh b/build/scripts/gmrender.sh index ad37083..f857107 100644 --- a/build/scripts/gmrender.sh +++ b/build/scripts/gmrender.sh @@ -4,7 +4,7 @@ source /build/config set -x # GMediaRender dependencies -apt_get_install_permanent libupnp-dev libgstreamer0.10-dev \ +apt_install_permanent libupnp-dev libgstreamer0.10-dev \ gstreamer0.10-plugins-base gstreamer0.10-plugins-good \ gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly \ gstreamer0.10-ffmpeg \ diff --git a/build/scripts/hamachi.sh b/build/scripts/hamachi.sh index b818a4b..a041dce 100644 --- a/build/scripts/hamachi.sh +++ b/build/scripts/hamachi.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Hamachi dependency -apt_get_install_permanent lsb-core net-tools socat strace +apt_install_permanent lsb-core net-tools socat strace ## Hamachi cd /opt diff --git a/build/scripts/headphones.sh b/build/scripts/headphones.sh index 0177d39..de5d219 100644 --- a/build/scripts/headphones.sh +++ b/build/scripts/headphones.sh @@ -14,5 +14,5 @@ git clone https://github.com/rembo10/headphones.git ## Encoders echo "deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list -apt-get update -apt_get_install_permanent --force-yes ffmpeg libmp3lame0 libavcodec-extra-54 +apt update +apt_install_permanent --force-yes ffmpeg libmp3lame0 libavcodec-extra-54 diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh index 37f5dfb..d36aa5b 100644 --- a/build/scripts/lighttpd.sh +++ b/build/scripts/lighttpd.sh @@ -11,9 +11,9 @@ export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log ## Lighthttpd -apt_get_install_permanent lighttpd -apt-get build-dep -y lighttpd -apt_get_install_temporary automake +apt_install_permanent lighttpd +apt build-dep -y lighttpd +apt_install_temporary automake cd /opt wget http://download.lighttpd.net/lighttpd/releases-$LIGHTTPD_VERSION_MAJOR.x/lighttpd-$LIGHTTPD_VERSION.tar.gz tar xzf lighttpd-$LIGHTTPD_VERSION.tar.gz && \ diff --git a/build/scripts/minidlna.sh b/build/scripts/minidlna.sh index ebb8675..cdb057b 100644 --- a/build/scripts/minidlna.sh +++ b/build/scripts/minidlna.sh @@ -4,7 +4,7 @@ source /build/config set -x # MiniDLNA dependencies -apt_get_install_permanent gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev +apt_install_permanent gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev export MINIDLNA_VERSION=1.1.1 export MINIDLNA_CONFIG=/host/etc/minidlna.conf diff --git a/build/scripts/mysql.sh b/build/scripts/mysql.sh index eb771b5..d836810 100644 --- a/build/scripts/mysql.sh +++ b/build/scripts/mysql.sh @@ -6,7 +6,7 @@ set -x ## MySQL debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy' debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy' -apt_get_install_permanent mariadb-server +apt_install_permanent mariadb-server ## Environment export_env MYSQL_CONFIG /etc/mysql/my.cnf diff --git a/build/scripts/php.sh b/build/scripts/php.sh index 7ba27a7..aa458e1 100644 --- a/build/scripts/php.sh +++ b/build/scripts/php.sh @@ -9,9 +9,9 @@ export_env PHP_CONFIG /usr/local/lib/php.ini export_env PHP_TIMEZONE Europe/Amsterdam ## PHP -apt_get_install_temporary gcc make +apt_install_temporary gcc make cd /opt -apt_get_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev +apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O php-$PHP_VERSION.tar.gz && \ tar xzf php-$PHP_VERSION.tar.gz && \ cd php-$PHP_VERSION diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh index 2d80d3f..76d061c 100644 --- a/build/scripts/prepare.sh +++ b/build/scripts/prepare.sh @@ -18,7 +18,7 @@ export_env INITRD no ## Enable Ubuntu Universe and Multiverse. sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list -apt-get update +apt update ## Fix some issues with APT packages ## See https://github.com/dotcloud/docker/issues/1024 @@ -37,11 +37,11 @@ ln -sf /bin/true /usr/bin/ischroot ln -sf /bin/true /usr/bin/chfn ## Install HTTPS support for APT -apt_get_install_permanent apt-transport-https +apt_install_permanent apt-transport-https ## Upgrade all packages -apt-get dist-upgrade -y --no-install-recommends +apt dist-upgrade -y --no-install-recommends ## Fix locale -apt_get_install_permanent language-pack-en +apt_install_permanent language-pack-en locale-gen en_US \ No newline at end of file diff --git a/build/scripts/pulseaudio.sh b/build/scripts/pulseaudio.sh index 462074d..6d1c6d0 100644 --- a/build/scripts/pulseaudio.sh +++ b/build/scripts/pulseaudio.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Pulseaudio -apt_get_install_permanent pulseaudio +apt_install_permanent pulseaudio ## Setup environment sed -i "1iexport PULSE_SERVER=host" /root/.profile \ No newline at end of file diff --git a/build/scripts/redis.sh b/build/scripts/redis.sh index 27025d0..fcd87c5 100644 --- a/build/scripts/redis.sh +++ b/build/scripts/redis.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Redis -apt_get_install_permanent redis-server +apt_install_permanent redis-server export REDIS_CONFIG=/etc/redis/redis.conf export REDIS_LOG=/host/var/log/redis/redis.log diff --git a/build/scripts/runit.sh b/build/scripts/runit.sh index 7104247..19bed64 100644 --- a/build/scripts/runit.sh +++ b/build/scripts/runit.sh @@ -4,4 +4,4 @@ source /build/config set -x ## Install runit -apt_get_install_permanent runit +apt_install_permanent runit diff --git a/build/scripts/sabnzbd.sh b/build/scripts/sabnzbd.sh index b6210bc..f03a292 100644 --- a/build/scripts/sabnzbd.sh +++ b/build/scripts/sabnzbd.sh @@ -11,11 +11,11 @@ export_env SABNZBD_DATA /host/var/lib/sabnzbd ## SABnzbd echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F -apt-get update -apt_get_install_permanent sabnzbdplus +apt update +apt_install_permanent sabnzbdplus ## Utilities -apt_get_install_permanent unzip par2 python-openssl python-yenc +apt_install_permanent unzip par2 python-openssl python-yenc ## Rar cd /opt diff --git a/build/scripts/sickbeard.sh b/build/scripts/sickbeard.sh index 8a45bec..c0cd042 100644 --- a/build/scripts/sickbeard.sh +++ b/build/scripts/sickbeard.sh @@ -8,6 +8,6 @@ export_env SICKBEARD_CONFIG /host/etc/sickbeard/config.ini export_env SICKBEARD_DATA /host/var/lib/sickbeard ## SickBeard -apt_get_install_permanent python-cheetah +apt_install_permanent python-cheetah cd /opt git clone https://github.com/midgetspy/Sick-Beard.git \ No newline at end of file diff --git a/build/scripts/sonarr.sh b/build/scripts/sonarr.sh index f76e7a0..a33bc70 100644 --- a/build/scripts/sonarr.sh +++ b/build/scripts/sonarr.sh @@ -9,6 +9,6 @@ export_env SONARR_DATA /host/var/lib/sonarr ## 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-get update -apt_get_install_permanent nzbdrone mediainfo +apt update +apt_install_permanent nzbdrone mediainfo chmod +x /opt/NzbDrone/NzbDrone.exe \ No newline at end of file diff --git a/build/scripts/sshd.sh b/build/scripts/sshd.sh index a986470..a46b5b6 100644 --- a/build/scripts/sshd.sh +++ b/build/scripts/sshd.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Install the SSH server -apt_get_install_permanent openssh-server +apt_install_permanent openssh-server mkdir /var/run/sshd ## Install root key @@ -19,7 +19,7 @@ ssh-keygen -t rsa -N "" -f id_rsa cat /opt/id_rsa.pub >> "$AUTHORIZED_KEYS" ## X11 forwarding -apt_get_install_permanent xauth +apt_install_permanent xauth ## Setup environment sed -i "1iexport HOME=/root" /root/.profile diff --git a/build/scripts/syslog.sh b/build/scripts/syslog.sh index 7ebca8d..8cc36de 100644 --- a/build/scripts/syslog.sh +++ b/build/scripts/syslog.sh @@ -4,6 +4,6 @@ source /build/config set -x ## Install a syslog daemon -apt_get_install_permanent syslog-ng-core +apt_install_permanent syslog-ng-core mkdir -p /var/lib/syslog-ng sed -i "s/^\(#SYSLOGNG_OPTS=\).*$/\1\"--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat\"/" /etc/default/syslog-ng diff --git a/build/scripts/transmission.sh b/build/scripts/transmission.sh index 8bb10c7..17ef1e8 100644 --- a/build/scripts/transmission.sh +++ b/build/scripts/transmission.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Transmission -apt_get_install_permanent transmission-daemon jq +apt_install_permanent transmission-daemon jq ## Environment export_env TRANSMISSION_CONFIG /host/etc/transmission diff --git a/build/scripts/upnpproxy.sh b/build/scripts/upnpproxy.sh index b5546cd..a248ea1 100644 --- a/build/scripts/upnpproxy.sh +++ b/build/scripts/upnpproxy.sh @@ -4,7 +4,7 @@ source /build/config set -x ## UPnP Proxy dependency -apt_get_install_permanent uuid-dev +apt_install_permanent uuid-dev ## UPnP Proxy cd opt diff --git a/build/scripts/utilities.sh b/build/scripts/utilities.sh index 6a14cf4..81134fe 100644 --- a/build/scripts/utilities.sh +++ b/build/scripts/utilities.sh @@ -4,8 +4,8 @@ source /build/config set -x ## Often used tools -apt_get_install_permanent wget curl python-pip git -apt_get_install_temporary inetutils-ping telnet +apt_install_permanent wget curl python-pip git +apt_install_temporary inetutils-ping telnet ## Often used python modules pip install argparse