ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1617 from bestlong/php70-swoole-build-failed

Browse Source 
Fix php7.0 swoole build failed.
This commit is contained in:
Shao Yu-Lung (Allen)
2018-06-18 22:24:14 +08:00
committed by GitHub
parent 33234fd3b5 a3cbfd71f5
commit 21d203da73
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
php-fpm/Dockerfile
View File

@@ -138,8 +138,12 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install swoole-2.0.11; \ pecl install swoole-2.0.11; \
else \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
pecl install swoole-2.2.0; \
else \ else \
pecl install swoole; \ pecl install swoole; \
fi \
fi && \ fi && \
docker-php-ext-enable swoole \ docker-php-ext-enable swoole \
;fi ;fi

6
workspace/Dockerfile
View File

@@ -330,7 +330,11 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl -q install swoole-2.0.11; \ pecl -q install swoole-2.0.11; \
else \ else \
pecl -q install swoole; \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
pecl install swoole-2.2.0; \
else \
pecl install swoole; \
fi \
fi && \ fi && \
echo "extension=swoole.so" >> /etc/php/${PHP_VERSION}/mods-available/swoole.ini && \ echo "extension=swoole.so" >> /etc/php/${PHP_VERSION}/mods-available/swoole.ini && \
ln -s /etc/php/${PHP_VERSION}/mods-available/swoole.ini /etc/php/${PHP_VERSION}/cli/conf.d/20-swoole.ini \ ln -s /etc/php/${PHP_VERSION}/mods-available/swoole.ini /etc/php/${PHP_VERSION}/cli/conf.d/20-swoole.ini \