From 0305caa90911a2981624b638b9b010b9ed42a2a4 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Fri, 22 Jul 2016 13:28:20 +0200
Subject: [PATCH] upgrade php

---
 build/Makefile       | 4 ++--
 build/make/base.mk   | 3 ++-
 build/make/php.mk    | 3 ++-
 build/scripts/php.sh | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index a83936e..dc1f331 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/London
+TIMEZONE = Europe/Amsterdam
 JOBS = 2
 CLEANUP = true
 ARGS = --rm=false --no-cache=false
@@ -82,4 +82,4 @@ ssh:
 		fi && \
 		IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $$ID) && \
 		echo "SSHing into $$IP" && \
-		ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD}
\ No newline at end of file
+		ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD}
diff --git a/build/make/base.mk b/build/make/base.mk
index 144766a..aa4af66 100644
--- a/build/make/base.mk
+++ b/build/make/base.mk
@@ -3,4 +3,5 @@ base:
 	@echo 'RUN chmod +x /opt/init' >> ${FILE}
 	@echo 'CMD ["/opt/init"]' >> ${FILE}
 	$(call script,utilities)
-	$(call script,runit)
\ No newline at end of file
+	$(call script,runit)
+	$(call script,logrotate)
diff --git a/build/make/php.mk b/build/make/php.mk
index 82f5824..37b56d2 100644
--- a/build/make/php.mk
+++ b/build/make/php.mk
@@ -1,2 +1,3 @@
 php: compile
-	$(call script,$@)
\ No newline at end of file
+	$(call script,utilities)
+	$(call script,$@)
diff --git a/build/scripts/php.sh b/build/scripts/php.sh
index 19b353e..7fa2b81 100644
--- a/build/scripts/php.sh
+++ b/build/scripts/php.sh
@@ -1,7 +1,7 @@
 ## Environment
-export_env PHP_VERSION 5.6.21
+export_env PHP_VERSION 5.6.23
 export_env PHP_CONFIG /usr/local/lib/php.ini
-export_env PHP_TIMEZONE Europe/London
+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
@@ -11,7 +11,7 @@ cd /opt
 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
+./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
 make $JOBS
 make install
 
@@ -25,4 +25,4 @@ if [ $MODE == "minimal" ]; then
     cd /opt
     rm -r php-$PHP_VERSION
     rm php-$PHP_VERSION.tar.gz
-fi
\ No newline at end of file
+fi