From cf6a9ba2c9e8df7e55371454079f66bb2d0d028c Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Fri, 1 Mar 2019 11:02:13 +0800 Subject: [PATCH] php-fpm and workspace replace base image (#2025) * php-fpm and workspace replace base image * Aerospike PHP 5.6.40 Debian 9.6 is not supported, travis-ci build by pass. --- php-fpm/Dockerfile | 3 ++- travis-build.sh | 5 +++++ workspace/Dockerfile | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 0d4f7cd5..4cabe575 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -14,7 +14,8 @@ ARG LARADOCK_PHP_VERSION -FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION} +# FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION} +FROM letsdockerize/laradock-php-fpm:2.3-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " diff --git a/travis-build.sh b/travis-build.sh index d6aec972..22706832 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -15,6 +15,11 @@ if [ -n "${PHP_VERSION}" ]; then sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env sed -i -- 's/=false/=true/g' .env sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env + if [ "${PHP_VERSION}" == "5.6" ]; then + # Aerospike C Client SDK 4.0.7, Debian 9.6 is not supported + # https://github.com/aerospike/aerospike-client-php5/issues/145 + sed -i -- 's/PHP_FPM_INSTALL_AEROSPIKE=true/PHP_FPM_INSTALL_AEROSPIKE=false/g' .env + fi cat .env docker-compose build ${BUILD_SERVICE} docker images diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 9c16f17a..5cb86194 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -14,7 +14,8 @@ ARG LARADOCK_PHP_VERSION -FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION} +# FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION} +FROM letsdockerize/laradock-workspace:2.3-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt "