Build webserver stack using latest versions, from debian:jessie

build/Makefile

@@ -1,5 +1,5 @@
 TMP = /build/tmp
-FROM = ubuntu:trusty
+FROM = debian:jessie
 MODE = normal
 ARGS = --rm=false --no-cache=false
 include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
@@ -34,7 +34,7 @@ all: build bin service clean
 
 build: prepare base
 	$(call script,cleanup)
-	@echo 'RUN chmod +x /opt/init.d/* || :' >> ${FILE}
+	@echo 'RUN chmod +x -R /opt/init.d' >> ${FILE}
 	@echo 'CMD ["/opt/init"]' >> ${FILE}
 	@docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build
 	@rm ${FILE}
@@ -44,9 +44,9 @@ prepare:
 	@echo FROM $(FROM) > ${FILE}
 	@echo ENV MODE $(MODE) >> ${FILE}
 	$(call add,config,/build/config)
-	$(call add,init,/opt/init)
+	$(call add,init,/opt/init)    
+	@echo 'RUN chmod +x /opt/init' >> ${FILE}
 	$(call script,prepare)
-
 clean:
 	@rm -f ${FILE}
 	@rm -rf build

build/make/lighttpd.mk

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

build/make/php.mk

@@ -1,2 +1,2 @@
-php:
+php: compile
 	$(call script,$@)

build/scripts/lighttpd.sh

@@ -5,14 +5,11 @@ set -x
 
 ## Environment
 export_env LIGHTTPD_VERSION_MAJOR 1.4
-export_env LIGHTTPD_VERSION_MINOR 35
+export_env LIGHTTPD_VERSION_MINOR 39
 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
 
-## SSL
-apt_install_permanent libssl-dev
-
 ## Lighthttpd
 apt_install_permanent lighttpd
 apt-get build-dep -y lighttpd

build/scripts/php.sh

@@ -4,16 +4,17 @@ source /build/config
 set -x
 
 ## Environment
-export_env PHP_VERSION 5.6.4
+export_env PHP_VERSION 5.6.20
 export_env PHP_CONFIG /usr/local/lib/php.ini
-export_env PHP_TIMEZONE Europe/Amsterdam
+export_env PHP_TIMEZONE Europe/London
+
+## Dependencies
+apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev libssl-dev pkg-config
 
 ## PHP
-apt_install_temporary gcc make
 cd /opt
-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 && \
+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
 ./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
 make
@@ -29,4 +30,4 @@ fi
 ## Configuration
 cp /opt/php-$PHP_VERSION/php.ini-production $PHP_CONFIG
 sed -i "s,^;\(date\.timezone\s*=\s*\)$,\1 $PHP_TIMEZONE," $PHP_CONFIG
-ln -s /usr/local/bin/php-cgi /usr/bin/php-cgi
+ln -s /usr/local/bin/php-cgi /usr/bin/php-cgi

build/scripts/phpmyadmin.sh

@@ -4,14 +4,15 @@ source /build/config
 set -x
 
 ## phpMyAdmin
-export_env PMA_VERSION 4.5.3.1
-export_env PMA_CONFIG /var/www/config.inc.php
+export_env PMA_VERSION 4.6.0
+export_env PMA_ROOT /var/www/html
+export_env PMA_CONFIG $PMA_ROOT/config.inc.php
 cd /opt
 wget https://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 -r /var/www
-ln -s /opt/phpMyAdmin-$PMA_VERSION /var/www
+rm -r $PMA_ROOT/../*
+ln -s /opt/phpMyAdmin-$PMA_VERSION $PMA_ROOT
 
 ## Remove installation files
 if [ $MODE == "minimal" ]; then

build/scripts/prepare.sh

@@ -15,9 +15,8 @@ echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup
 ## http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189
 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
+## Enable sources in APT
+echo 'deb-src http://httpredir.debian.org/debian/ jessie main' >> /etc/apt/sources.list
 apt update
 
 ## Fix some issues with APT packages
@@ -41,7 +40,3 @@ apt_install_permanent apt-transport-https
 
 ## Upgrade all packages
 apt dist-upgrade -y --no-install-recommends
-
-## Fix locale
-apt_install_permanent language-pack-en
-locale-gen en_US