From 43b6dfb786b8d318b2c0d476f1c2f7d81993bab2 Mon Sep 17 00:00:00 2001
From: Barry O'Donovan <barry@opensolutions.ie>
Date: Mon, 29 Jan 2018 20:29:49 +0000
Subject: [PATCH] Complete Docker Xdebug config

---
 storage/tmp/.gitignore                 |  2 ++
 tools/docker/containers/www/Dockerfile | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 storage/tmp/.gitignore

diff --git a/storage/tmp/.gitignore b/storage/tmp/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/storage/tmp/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tools/docker/containers/www/Dockerfile b/tools/docker/containers/www/Dockerfile
index c267b8081..c31196662 100644
--- a/tools/docker/containers/www/Dockerfile
+++ b/tools/docker/containers/www/Dockerfile
@@ -14,16 +14,19 @@ RUN docker-php-source extract && \
     docker-php-ext-install -j$(nproc) mcrypt snmp intl bcmath gd gettext zip pdo_mysql && \
     pecl install ds rrd xdebug && \
     printf "\n" | pecl install yaml && \
-    echo "extension=ds.so\nextension=rrd.so\nextension=yaml.so\n" >/usr/local/etc/php/conf.d/local-ixpmanager.ini && \
+    docker-php-source delete
+
+RUN curl -so /usr/local/bin/composer.phar https://getcomposer.org/download/1.6.2/composer.phar && \
+    chmod a+x /usr/local/bin/composer.phar
+
+RUN echo "extension=ds.so\nextension=rrd.so\nextension=yaml.so\n" >/usr/local/etc/php/conf.d/local-ixpmanager.ini && \
     echo "[xdebug]\nzend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)\n" >/usr/local/etc/php/conf.d/local-ixpmanager-xdebug.ini && \
     echo "xdebug.remote_enable=1\nxdebug.remote_port=9001\nxdebug.remote_autostart=0\nxdebug.idekey=PHPSTORM\n" >>/usr/local/etc/php/conf.d/local-ixpmanager-xdebug.ini && \
-    docker-php-source delete && \
-    curl -so /usr/local/bin/composer.phar https://getcomposer.org/download/1.6.2/composer.phar && \
-    chmod a+x /usr/local/bin/composer.phar
+    echo "xdebug.profiler_enable=0\nxdebug.profiler_enable_trigger=1\nxdebug.profiler_output_dir=/srv/ixpmanager/storage/tmp\n" >>/usr/local/etc/php/conf.d/local-ixpmanager-xdebug.ini && \
+    echo "xdebug.auto_trace=0\nxdebug.trace_enable_trigger=1\nxdebug.trace_output_dir=/srv/ixpmanager/storage/tmp\n" >>/usr/local/etc/php/conf.d/local-ixpmanager-xdebug.ini
 
 RUN /usr/sbin/a2enmod rewrite
 
 COPY apache-site.conf              /etc/apache2/sites-available/000-default.conf
 
 WORKDIR /srv/ixpmanager
-