Move xdebug config in docker-compose

REBELinBLUE · Aug 28, 2018 · b69f95c · b69f95c
1 parent 5249f37
commit b69f95c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,8 @@
+version: "3.1"
+
+services:
+  php-fpm:
+    environment:
+      XDEBUG_CONFIG: remote_host=host.docker.internal
+    volumes:
+      - "./docker/php/xdebug.ini:/usr/local/etc/php/conf.d/98-xdebug.ini"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -96,8 +96,7 @@ services:
     working_dir: /application
     volumes:
       - .:/application
-      # To enable xdebug, copy this file to docker-compose.override.yml and uncomment the following line
+      - ./docker/php-fpm/php-ini-overrides.ini:/etc/php/7.1/fpm/conf.d/99-overrides.ini
-      #- ./docker/php-fpm/php-ini-overrides.ini:/etc/php/7.1/fpm/conf.d/99-overrides.ini
     links:
       - beanstalkd
       - mailhog

diff --git a/docker/php-fpm/php-ini-overrides.ini b/docker/php-fpm/php-ini-overrides.ini
@@ -1,6 +1,4 @@
-zend_extension=/usr/lib/php/20170718/xdebug.so
 xdebug.remote_enable = On
-xdebug.remote_host = 10.254.254.254
 xdebug.remote_autostart = On
 xdebug.remote_connect_back = Off
 ;xdebug.profiler_output_dir = "/var/www/html"

diff --git a/docker/php-fpm/xdebug.ini b/docker/php-fpm/xdebug.ini
@@ -0,0 +1 @@
+zend_extension=/usr/lib/php/20170718/xdebug.so