From 7824bfc2f3035013812b9690da23b9ddb65f046b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20Escalante=20=C3=81lvarez?= Date: Fri, 14 Feb 2025 13:04:02 +0100 Subject: [PATCH] Update XDebug configuration for Docker and add .vscode to .gitignore --- .docker/magento/Dockerfile.php74 | 2 +- .docker/magento/Dockerfile.php8 | 2 +- .gitignore | 1 + docker-compose.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.docker/magento/Dockerfile.php74 b/.docker/magento/Dockerfile.php74 index e21dccb..4b4520a 100644 --- a/.docker/magento/Dockerfile.php74 +++ b/.docker/magento/Dockerfile.php74 @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ xdebug \ && echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ - && echo "xdebug.client_host=${M2_HOST}" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ + && echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && echo "xdebug.log_level=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && sed -i 's/^/;/' "/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini" \ && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.docker/magento/Dockerfile.php8 b/.docker/magento/Dockerfile.php8 index 9ef88d1..48396f6 100644 --- a/.docker/magento/Dockerfile.php8 +++ b/.docker/magento/Dockerfile.php8 @@ -37,7 +37,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ xdebug \ && echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ - && echo "xdebug.client_host=${M2_HOST}" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ + && echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && echo "xdebug.log_level=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && sed -i 's/^/;/' "/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini" \ && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.gitignore b/.gitignore index 29e8b14..88c5dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ docker-compose.override.yml default.vcl id_rsa .magento-src +.vscode # Playwright node_modules/ diff --git a/docker-compose.yml b/docker-compose.yml index a58fc24..74d9d81 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - .:/Sequra/Core:ro - ./.docker/magento/HelperModule/Sequra:/var/www/html/app/code/Sequra extra_hosts: + - "host.docker.internal:host-gateway" # For XDebug to work properly on Linux - "${M2_HTTP_HOST}:host-gateway" <<: *env_file