Merge pull request #35 from aakb/feature/xdebug-remote-host

Automatically find xdebug remote host

Author: cableman

php5.6-fpm/docker-entrypoint.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 set -e  
 
-## Run templates with configuration.
-/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
-
 # Add docker host domain to hosts file
 if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
   echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
 fi
 
+# Set xdebug remote host to docker host ip.
+if [ ! -z "${PHP_XDEBUG}" ]; then
+  export PHP_XDEBUG_REMOTE_HOST=$(getent hosts host.docker.internal | cut -d" " -f1)
+fi
+
+## Run templates with configuration.
+/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
+
 ## Start the php FPM process.
 echo "Starting PHP 5.6 FPM"
 php-fpm5.6 -F --pid /var/run/php/php-fpm5.6.pid -y /etc/php/5.6/fpm/php-fpm.conf

php7.0-fpm/docker-entrypoint.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 set -e  
 
-## Run templates with configuration.
-/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
-
 # Add docker host domain to hosts file
 if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
   echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
 fi
 
+# Set xdebug remote host to docker host ip.
+if [ ! -z "${PHP_XDEBUG}" ]; then
+  export PHP_XDEBUG_REMOTE_HOST=$(getent hosts host.docker.internal | cut -d" " -f1)
+fi
+
+## Run templates with configuration.
+/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
+
 ## Start the php FPM process.
 echo "Starting PHP 7.0 FPM"
 php-fpm7.0 -F --pid /var/run/php/php-fpm7.0.pid -y /etc/php/7.0/fpm/php-fpm.conf

php7.2-fpm/docker-entrypoint.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 set -e  
 
-## Run templates with configuration.
-/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
-
 # Add docker host domain to hosts file
 if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
   echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
 fi
 
+# Set xdebug remote host to docker host ip.
+if [ ! -z "${PHP_XDEBUG}" ]; then
+  export PHP_XDEBUG_REMOTE_HOST=$(getent hosts host.docker.internal | cut -d" " -f1)
+fi
+
+## Run templates with configuration.
+/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
+
 ## Start the php FPM process.
 echo "Starting PHP 7.2 FPM"
 php-fpm7.2 -F --pid /var/run/php/php-fpm7.2.pid -y /etc/php/7.2/fpm/php-fpm.conf

php7.3-fpm/docker-entrypoint.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 set -e  
 
-## Run templates with configuration.
-/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
-
 # Add docker host domain to hosts file
 if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
   echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
 fi
 
+# Set xdebug remote host to docker host ip.
+if [ ! -z "${PHP_XDEBUG}" ]; then
+  export PHP_XDEBUG_REMOTE_HOST=$(getent hosts host.docker.internal | cut -d" " -f1)
+fi
+
+## Run templates with configuration.
+/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
+
 ## Start the php FPM process.
 echo "Starting PHP 7.3 FPM"
 php-fpm7.3 -F --pid /var/run/php/php-fpm7.3.pid -y /etc/php/7.3/fpm/php-fpm.conf

scripts/itkdev-docker-compose

@@ -394,7 +394,6 @@ EOF
   xdebug)
     PHP_XDEBUG=1 \
     PHP_XDEBUG_REMOTE_AUTOSTART=1 \
-    PHP_XDEBUG_REMOTE_HOST=$(ipconfig getifaddr en0) \
     PHP_XDEBUG_REMOTE_PORT=9000 \
     PHP_XDEBUG_REMOTE_CONNECT_BACK=0 \
     docker_compose up -d

templates/ddbcms/docker-compose.yml

@@ -27,7 +27,6 @@ services:
     environment:
       - PHP_XDEBUG=${PHP_XDEBUG:-0}
       - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
       - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
       - PHP_MAX_EXECUTION_TIME=300
       - PHP_MEMORY_LIMIT=512M

templates/drupal-7/docker-compose.yml

@@ -28,7 +28,6 @@ services:
     environment:
       - PHP_XDEBUG=${PHP_XDEBUG:-0}
       - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
       - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
       - PHP_MAX_EXECUTION_TIME=30
       - PHP_MEMORY_LIMIT=256M

templates/drupal-8/docker-compose.yml

@@ -28,7 +28,6 @@ services:
     environment:
       - PHP_XDEBUG=${PHP_XDEBUG:-0}
       - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
       - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
       - PHP_MAX_EXECUTION_TIME=30
       - PHP_MEMORY_LIMIT=256M

templates/ereolen/docker-compose.yml

@@ -28,7 +28,6 @@ services:
     environment:
       - PHP_XDEBUG=${PHP_XDEBUG:-0}
       - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
       - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
       - PHP_MAIL=1
       - PHP_MAX_EXECUTION_TIME=60

templates/symfony-3/docker-compose.yml

@@ -28,7 +28,6 @@ services:
     environment:
       - PHP_XDEBUG=${PHP_XDEBUG:-0}
       - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
       - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
       - PHP_MAX_EXECUTION_TIME=30
       - PHP_MEMORY_LIMIT=256M