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

upgrade php

Browse Source
This commit is contained in:
Rik Veenboer
2016-07-22 13:28:20 +02:00
parent 61384c3553
commit 0305caa909
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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/London TIMEZONE = Europe/Amsterdam
JOBS = 2 JOBS = 2
CLEANUP = true CLEANUP = true
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=false
@@ -82,4 +82,4 @@ ssh:
fi && \ fi && \
IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $$ID) && \ IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $$ID) && \
echo "SSHing into $$IP" && \ echo "SSHing into $$IP" && \
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD} ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD}

3
build/make/base.mk
View File

@@ -3,4 +3,5 @@ base:
@echo 'RUN chmod +x /opt/init' >> ${FILE} @echo 'RUN chmod +x /opt/init' >> ${FILE}
@echo 'CMD ["/opt/init"]' >> ${FILE} @echo 'CMD ["/opt/init"]' >> ${FILE}
$(call script,utilities) $(call script,utilities)
$(call script,runit) $(call script,runit)
$(call script,logrotate)

3
build/make/php.mk
View File

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

8
build/scripts/php.sh
View File

@@ -1,7 +1,7 @@
## Environment ## 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_CONFIG /usr/local/lib/php.ini
export_env PHP_TIMEZONE Europe/London 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
@@ -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 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 tar xzf php-$PHP_VERSION.tar.gz
cd php-$PHP_VERSION 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 $JOBS
make install make install
@@ -25,4 +25,4 @@ if [ $MODE == "minimal" ]; then
cd /opt cd /opt
rm -r php-$PHP_VERSION rm -r php-$PHP_VERSION
rm php-$PHP_VERSION.tar.gz rm php-$PHP_VERSION.tar.gz
fi fi