Merge pull request #10 from lucassabreu/master

improv xdebug setup

Author: Móveis Simonetti

Dockerfile

@@ -3,13 +3,16 @@ FROM php:7.0-apache
 
 ENV http_proxy ${HTTP_PROXY}
 ENV https_proxy ${HTTP_PROXY}
-ENV XDEBUG_ENABLED=false
 ENV NR_ENABLED=false
 ENV NR_APP_NAME=""
 ENV NR_LICENSE_KEY=""
 ENV SESSION_HANDLER=false
 ENV SESSION_HANDLER_NAME=""
 ENV SESSION_HANDLER_PATH=""
+ENV XDEBUG_AUTOSTART=false
+ENV XDEBUG_CONNECT_BACK=true
+ENV XDEBUG_ENABLED=false
+ENV XDEBUG_IDEKEY="docker"
 
 RUN apt-get update && apt-get install -y wget vim supervisor zip libfreetype6-dev libjpeg62-turbo-dev \
        libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
@@ -66,4 +69,4 @@ WORKDIR "/var/www/html"
 
 EXPOSE 8080 9001
 
-CMD ["/tini", "--", "/usr/bin/apache-run"]
+CMD ["/tini", "--", "/usr/bin/apache-run"]

Makefile

@@ -0,0 +1,11 @@
+all: build
+
+IMAGE=lojassimonetti/php-apache-oci8-composer
+TAG=$(shell git branch | grep \* | cut -d ' ' -f2)
+
+build:
+	docker build . -t $(IMAGE):$(TAG)
+
+push: build
+	docker push $(IMAGE):$(TAG)
+

apache-run.sh

@@ -3,6 +3,17 @@
 if [[ $XDEBUG_ENABLED == true ]]; then
 	echo "zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
 	echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+	echo "xdebug.idekey=${XDEBUG_IDEKEY}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+	echo "xdebug.remote_enable=1" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+	echo "xdebug.remote_port=9000" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+
+	[[ ${XDEBUG_AUTOSTART} == true ]] && {
+	    echo "xdebug.remote_autostart=on" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+	} || echo "xdebug.remote_autostart=off" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+
+	[[ ${XDEBUG_CONNECT_BACK} == true ]] && {
+	    echo "xdebug.remote_connect_back=1" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+	} || echo "xdebug.remote_connect_back=0" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
 fi
 
 if [[ $NR_ENABLED == true ]]; then
@@ -24,4 +35,4 @@ sudo rm -rf var/cache/* var/logs/* \
     && sudo chown -R www-data:www-data /var/www/html/var/logs && chmod 777 /var/www/html/var/logs \
     && sudo chown -R www-data:www-data /var/www/html/var/sessions && chmod 777 /var/www/html/var/sessions \
 
-apache2-foreground
+exec apache2-foreground