diff --git a/.env b/.env index 621ed32..fea4d39 100644 --- a/.env +++ b/.env @@ -13,4 +13,4 @@ DB_LEGACY_NAME=materio_d7 DB_USERNAME=materio DB_PASSWORD=materio -XDEBUG_CONF=./ressources/xdebug.conf +XDEBUG_INI=./ressources/xdebug.ini diff --git a/.gitignore b/.gitignore index 9b52872..2135082 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ log/* *.sql bin/syncfiles.sh solr_cores/* -ressources/xdebug.conf +ressources/xdebug.ini diff --git a/docker-compose.yml b/docker-compose.yml index 09a0d9f..3616148 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,7 +86,7 @@ services: - "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html" - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html" - "${LOG_ROOT}/php:/var/log:rw" - - "${XDEBUG_CONF}:/usr/local/etc/php/conf.d/xdebug.ini" + - "${XDEBUG_INI}:/usr/local/etc/php/conf.d/xdebug.ini" working_dir: "/var/www/html/d8.materio.com/public_html" networks: - database diff --git a/ressources/xdebug.conf.example b/ressources/xdebug.conf.example deleted file mode 100644 index 8257549..0000000 --- a/ressources/xdebug.conf.example +++ /dev/null @@ -1,9 +0,0 @@ -[xdebug] -xdebug.remote_enable=1 -xdebug.remote_host=172.20.0.1 # Should use host.docker.internal but not working on linux -xdebug.remote_connect_back=0 # Not working on docker context -xdebug.remote_port=9001 # 9000 is already bound by php-fpm -xdebug.remote_handler=dbgp -xdebug.remote_mode=req -xdebug.remote_autostart=true -xdebug.remote_log=/var/log/xdebug-error.log # Log file is mounted on volume so you can follow it diff --git a/ressources/xdebug.ini.example b/ressources/xdebug.ini.example new file mode 100644 index 0000000..51277b6 --- /dev/null +++ b/ressources/xdebug.ini.example @@ -0,0 +1,13 @@ +[xdebug] +xdebug.remote_enable=1 +;Should use host.docker.internal but not working on linux +xdebug.remote_host=172.20.0.1 +;Not working on docker context +xdebug.remote_connect_back=0 +;9000 is already bound by php-fpm +xdebug.remote_port=9001 +xdebug.remote_handler=dbgp +xdebug.remote_mode=req +xdebug.remote_autostart=true +;Log file is mounted on volume so you can follow it +xdebug.remote_log=/var/log/xdebug-error.log