Change xdebug approach.

Author: kporras07

Dockerfile

@@ -71,10 +71,6 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 
 RUN pecl install xdebug-2.7.0RC1
-RUN docker-php-ext-enable xdebug
-
-# Xdebug settings.
-COPY ./xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 # Imagemagick.
 RUN apk add --no-cache imagemagick-dev
@@ -92,6 +88,9 @@ ENV PATH=$PATH:$GOPATH/bin
 RUN go get github.com/mailhog/mhsendmail
 RUN cp /root/go/bin/mhsendmail /usr/bin/mhsendmail
 COPY ./php.ini /usr/local/etc/php/conf.d/docker-php.ini
+COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+COPY docker-php-entrypoint /usr/local/bin/
+COPY set-permissions /usr/local/bin/
 
 # Fix iconv lib
 RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv

docker-php-entrypoint

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+# Set permissions
+/usr/local/bin/set-permissions&
+
+# If enviorment variable is set for XDebug to be enabled then enable it
+if [ "$XDEBUG_ENABLE" = "enable" ] ; then
+  docker-php-ext-enable xdebug
+fi
+
+exec "$@"

set-permissions

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+APP_DOCKER_DIR=/var/www/html
+HOST_OSTYPE=${HOST_OSTYPE-linux}
+APP_DOCROOT=web
+PRIVATE_DIR=${PRIVATE_DIR-sites/default/files/private}
+
+# Make directory if it doesn't exist
+mkdir -p "$APP_DOCKER_DIR/$APP_DOCROOT/sites/default/files"
+
+chmod -R g+w "$APP_DOCKER_DIR/$APP_DOCROOT/sites/default/files"
+find "$APP_DOCKER_DIR/$APP_DOCROOT/sites/default/files" -type d -print0 | xargs -0 chmod g+s
+
+if [ -d "$APP_DOCKER_DIR/$APP_DOCROOT/$PRIVATE_DIR" ]; then
+  chmod -R g+w "$APP_DOCKER_DIR/$APP_DOCROOT/$PRIVATE_DIR"
+  find "$APP_DOCKER_DIR/$APP_DOCROOT/$PRIVATE_DIR" -type d -print0 | xargs -0 chmod g+s
+else
+  echo "No private directory found"
+fi

xdebug.ini

@@ -1,6 +1,10 @@
-zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20160303/xdebug.so
-xdebug.coverage_enable=0
 xdebug.remote_enable=1
-xdebug.remote_connect_back=1
-xdebug.remote_log=/tmp/xdebug.log
-xdebug.remote_autostart=true
+xdebug.remote_handler=dbgp
+xdebug.remote_port=9000
+xdebug.remote_connect_back=0
+xdebug.idekey=PHPSTORM
+xdebug.remote_host=host.docker.internal
+xdebug.remote_mode=req
+xdebug.remote_autostart=0
+xdebug.remote_log="/tmp/xdebug.log"
+xdebug.max_nesting_level=1000