Merge pull request #158 from shikorism/feature/xdebug-for-linux
Linux+Dockerな開発環境でxdebugが使えるようにコールバック先IPアドレスの設定を調整
This commit is contained in:
commit
8e161252a7
9
dist/bin/tissue-entrypoint.sh
vendored
9
dist/bin/tissue-entrypoint.sh
vendored
@ -3,6 +3,15 @@ set -e
|
|||||||
|
|
||||||
if [[ "$APP_DEBUG" == "true" ]]; then
|
if [[ "$APP_DEBUG" == "true" ]]; then
|
||||||
export PHP_INI_SCAN_DIR=":/usr/local/etc/php/php.d"
|
export PHP_INI_SCAN_DIR=":/usr/local/etc/php/php.d"
|
||||||
|
|
||||||
|
php -r "if (gethostbyname('host.docker.internal') === 'host.docker.internal') exit(1);" &> /dev/null && :
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
# Docker for Windows/Mac
|
||||||
|
export PHP_XDEBUG_REMOTE_HOST='host.docker.internal'
|
||||||
|
else
|
||||||
|
# Docker for Linux
|
||||||
|
export PHP_XDEBUG_REMOTE_HOST=$(cat /etc/hosts | awk 'END{print $1}' | sed -r -e 's/[0-9]+$/1/g')
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec docker-php-entrypoint "$@"
|
exec docker-php-entrypoint "$@"
|
||||||
|
2
dist/php.d/99-xdebug.ini
vendored
2
dist/php.d/99-xdebug.ini
vendored
@ -1,4 +1,4 @@
|
|||||||
; Dockerでのデバッグ用設定
|
; Dockerでのデバッグ用設定
|
||||||
zend_extension=xdebug.so
|
zend_extension=xdebug.so
|
||||||
xdebug.remote_enable=true
|
xdebug.remote_enable=true
|
||||||
xdebug.remote_host=host.docker.internal
|
xdebug.remote_host=${PHP_XDEBUG_REMOTE_HOST}
|
Loading…
Reference in New Issue
Block a user