From 536c84d6592b516a0593c170c2b56c1e7ae1cc1d Mon Sep 17 00:00:00 2001 From: aksm Date: Fri, 5 Nov 2021 11:53:32 -0400 Subject: [PATCH 1/2] Updates for xdebug. --- docker-compose.dev.yml | 5 ++++- xdebug/xdebug.ini | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 xdebug/xdebug.ini diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 27b194cc..9a05a3bb 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -28,10 +28,13 @@ services: php-debug: container_name: esmero-php-debug restart: always - image: esmero/php-7.3-fpm:development + image: esmero/php-7.4-fpm:1.0.0-dev-multiarch + environment: + - XDEBUG_SESSION_START="archipelago" tty: true networks: - host-net - esmero-net volumes: - ${PWD}:/var/www/html:cached + - ${PWD}:/xdebug/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini diff --git a/xdebug/xdebug.ini b/xdebug/xdebug.ini new file mode 100644 index 00000000..f2f018fb --- /dev/null +++ b/xdebug/xdebug.ini @@ -0,0 +1,9 @@ +zend_extension=xdebug + +[xdebug] +xdebug.mode=develop,debug +; If your host system is Linux, host.docker.internal may not be available. +xdebug.client_host=host.docker.internal +; On linux comment xdebug.client_host=host.docker.internal and uncomment the following next line +;xdebug.discover_client_host=1 +xdebug.start_with_request=yes From 947ff97aa369ec1d9cfb61d05f6017fb284827d2 Mon Sep 17 00:00:00 2001 From: aksm Date: Fri, 5 Nov 2021 14:48:44 -0400 Subject: [PATCH 2/2] Remove extra colon in docker-compose.dev.yml for xdebug. --- docker-compose.dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9a05a3bb..2699e024 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -37,4 +37,4 @@ services: - esmero-net volumes: - ${PWD}:/var/www/html:cached - - ${PWD}:/xdebug/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini + - ${PWD}/xdebug/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini