Skip to content

Commit cf6a9ba

Browse files
authored
php-fpm and workspace replace base image (laradock#2025)
* php-fpm and workspace replace base image * Aerospike PHP 5.6.40 Debian 9.6 is not supported, travis-ci build by pass.
1 parent 8f69235 commit cf6a9ba

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

php-fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
ARG LARADOCK_PHP_VERSION
1616

17-
FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION}
17+
# FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION}
18+
FROM letsdockerize/laradock-php-fpm:2.3-${LARADOCK_PHP_VERSION}
1819

1920
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
2021

travis-build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ if [ -n "${PHP_VERSION}" ]; then
1515
sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env
1616
sed -i -- 's/=false/=true/g' .env
1717
sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
18+
if [ "${PHP_VERSION}" == "5.6" ]; then
19+
# Aerospike C Client SDK 4.0.7, Debian 9.6 is not supported
20+
# https://github.com/aerospike/aerospike-client-php5/issues/145
21+
sed -i -- 's/PHP_FPM_INSTALL_AEROSPIKE=true/PHP_FPM_INSTALL_AEROSPIKE=false/g' .env
22+
fi
1823
cat .env
1924
docker-compose build ${BUILD_SERVICE}
2025
docker images

workspace/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
ARG LARADOCK_PHP_VERSION
1616

17-
FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION}
17+
# FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION}
18+
FROM letsdockerize/laradock-workspace:2.3-${LARADOCK_PHP_VERSION}
1819

1920
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
2021

0 commit comments

Comments
 (0)