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

Merge pull request #1382 from desaroger/php-72-pr

Browse Source 
Add PHP 7.2 support and fix issues on 5.6-7.0-7.1 versions
This commit is contained in:
Yu-Lung Shao (Allen)
2018-02-26 10:43:16 +08:00
committed by GitHub
parent 13f55ef796 227bc37376
commit ca376935e1
14 changed files with 3180 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workspace/Dockerfile-56
View File

@ -270,7 +270,7 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension
pecl -q install swoole-2.0.11 && \
pecl -q install -f swoole-1.10.1 && \
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 \
;fi
@ -649,6 +649,12 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
&& rm chromedriver_linux64.zip \
;fi
#####################################
# Check PHP version:
#####################################
RUN php -v | head -n 1 | grep -q "PHP 5.6."
#
#--------------------------------------------------------------------------
# Final Touch