diff --git a/build/scripts/btsync.sh b/build/scripts/btsync.sh index cd6e26a..2863474 100644 --- a/build/scripts/btsync.sh +++ b/build/scripts/btsync.sh @@ -4,8 +4,9 @@ export_env BTSYNC_DATA /host/var/btsync ## BTsync cd /opt -wget -O btsync.tar.gz http://download-lb.utorrent.com/endpoint/btsync/os/linux-x64/track/stable -tar xzf btsync.tar.gz btsync +wget -O btsync.tar.gz https://download-cdn.resilio.com/stable/linux-x64/resilio-sync_x64.tar.gz +tar xzf btsync.tar.gz rslsync +mv rslsync btsync ## Remove installation files if [ $MODE == "minimal" ]; then diff --git a/build/scripts/calibre.sh b/build/scripts/calibre.sh index 3f5ad46..a07a05a 100644 --- a/build/scripts/calibre.sh +++ b/build/scripts/calibre.sh @@ -7,4 +7,4 @@ apt_install_permanent python-qt4 xz-utils xdg-utils imagemagick ## Calibre cd /opt -PYTHONIOENCODING="utf-8" wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()" \ No newline at end of file +wget --no-check-certificate-nv -O- http://download.calibre-ebook.com/linux-installer.py | python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()" \ No newline at end of file diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh index 6375fd0..dcb2b48 100644 --- a/build/scripts/lighttpd.sh +++ b/build/scripts/lighttpd.sh @@ -5,9 +5,12 @@ 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 +## Dependencies +apt_install_permanent default-libmysqlclient-dev libpcre3-dev + ## Lighthttpd apt_install_permanent lighttpd -apt-get build-dep -y lighttpd +# apt-get 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 diff --git a/build/scripts/php.sh b/build/scripts/php.sh index 8685b67..ad6089a 100644 --- a/build/scripts/php.sh +++ b/build/scripts/php.sh @@ -1,14 +1,14 @@ ## Environment -export_env PHP_VERSION 7.1.6 +export_env PHP_VERSION 7.2.0 export_env PHP_CONFIG /usr/local/lib/php.ini 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 +apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng-dev libmcrypt-dev libssl-dev pkg-config ## PHP cd /opt -wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O php-$PHP_VERSION.tar.gz +wget http://nl1.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 ./configure --enable-calendar --enable-bcmath --with-bz2 --enable-ctype --without-gdbm --with-iconv --enable-exif --enable-ftp --with-gettext --enable-mbstring --enable-sockets --with-zlib --enable-soap --enable-zip --with-mhash --with-curl --with-gd --with-mysql --with-jpeg-dir --with-openssl --with-mysqli --with-mcrypt --enable-pcntl diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh index 66ffb37..cce0656 100644 --- a/build/scripts/phpmyadmin.sh +++ b/build/scripts/phpmyadmin.sh @@ -1,11 +1,11 @@ ## Configuration -export_env PMA_VERSION 4.7.1 +export_env PMA_VERSION 4.7.6 export_env PMA_ROOT /var/www/html export_env PMA_CONFIG $PMA_ROOT/config.inc.php ## phpMyAdmin cd /opt -wget https://files.phpmyadmin.net/phpMyAdmin/$PMA_VERSION/phpMyAdmin-$PMA_VERSION-all-languages.tar.gz +wget http://files.phpmyadmin.net/phpMyAdmin/$PMA_VERSION/phpMyAdmin-$PMA_VERSION-all-languages.tar.gz tar xzf phpMyAdmin-$PMA_VERSION-all-languages.tar.gz phpMyAdmin-$PMA_VERSION-all-languages mv phpMyAdmin-$PMA_VERSION-*/ phpMyAdmin-$PMA_VERSION/ rm -rf $PMA_ROOT diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh index 862c4af..2a47798 100644 --- a/build/scripts/prepare.sh +++ b/build/scripts/prepare.sh @@ -35,8 +35,9 @@ ln -sf /bin/true /usr/bin/ischroot # https://github.com/docker/docker/issues/6345#issuecomment-49245365 ln -sf /bin/true /usr/bin/chfn -## Package management -apt_install_permanent apt-transport-https apt-utils +## Install HTTPS support for APT +apt update +apt_install_permanent apt-transport-https ## Upgrade all packages apt dist-upgrade -y --no-install-recommends diff --git a/build/scripts/sabnzbd.sh b/build/scripts/sabnzbd.sh index 780de04..06f6bfb 100644 --- a/build/scripts/sabnzbd.sh +++ b/build/scripts/sabnzbd.sh @@ -1,10 +1,14 @@ -## Environmen t +## Environment export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini export_env SABNZBD_DATA /host/var/lib/sabnzbd +## Dependencies +apt_install_permanent gnupg dirmngr + ## 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/nobetas/ubuntu precise main' >> /etc/apt/sources.list.d/sabnzbdplus.list +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F +apt update apt install -f apt_install_permanent sabnzbdplus diff --git a/build/scripts/sonarr.sh b/build/scripts/sonarr.sh index 3b98fa4..1300432 100644 --- a/build/scripts/sonarr.sh +++ b/build/scripts/sonarr.sh @@ -4,7 +4,10 @@ export_env SONARR_DATA /host/var/lib/sonarr ## Dependencies apt_install_permanent libmono-cil-dev sqlite3 mediainfo -## Key +## Dependencies +apt_install_permanent gnupg dirmngr + +## Sonarr apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC ## Sonarr