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

Merge pull request #1565 from bestlong/fix-php5-xdebug 

fix #1535 xdebug installation fails when php version is 5.6
This commit is contained in:
Shao Yu-Lung (Allen) 2018-05-26 07:40:15 +08:00 committed by GitHub
parent 6e6284d00f 97adef735a
commit 8158b6f50e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
php-fpm/Dockerfile
View File

@ -85,9 +85,13 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
ARG INSTALL_XDEBUG=false ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extension # Install the xdebug extension
pecl install xdebug && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
docker-php-ext-enable xdebug \ pecl install xdebug-2.5.5; \
else \
pecl install xdebug; \
fi && \
docker-php-ext-enable xdebug \
;fi ;fi
# Copy xdebug configuration for remote debugging # Copy xdebug configuration for remote debugging