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

Merge pull request #1374 from bestlong/fix-php56-swoole-build-fail 

Fix PHP56, workspace build fail: pecl/swoole requires PHP (version >= 7.0.0)
This commit is contained in:
Yu-Lung Shao (Allen) 2018-02-11 13:29:08 +08:00 committed by GitHub
parent 0077de28a1 f53565f2a6
commit acbe7160d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php-fpm/Dockerfile-56
View File

@ -121,7 +121,7 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
ARG INSTALL_SWOOLE=false ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
pecl install swoole \ pecl install swoole-2.0.11 \
&& docker-php-ext-enable swoole \ && docker-php-ext-enable swoole \
;fi ;fi

2
workspace/Dockerfile-56
View File

@ -263,7 +263,7 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
ARG INSTALL_SWOOLE=false ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
pecl -q install swoole && \ pecl -q install swoole-2.0.11 && \
echo "extension=swoole.so" >> /etc/php/5.6/mods-available/swoole.ini && \ echo "extension=swoole.so" >> /etc/php/5.6/mods-available/swoole.ini && \
ln -s /etc/php/5.6/mods-available/swoole.ini /etc/php/5.6/cli/conf.d/20-swoole.ini \ ln -s /etc/php/5.6/mods-available/swoole.ini /etc/php/5.6/cli/conf.d/20-swoole.ini \
;fi ;fi