From dd48592d8b2431621e27a9159160c593434359d9 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Fri, 19 Aug 2016 03:05:02 +0300 Subject: [PATCH] update the xdebug.ini usage --- php-fpm/Dockerfile-56 | 13 +++++-------- php-fpm/Dockerfile-70 | 12 +++++------- workspace/Dockerfile | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 62ac6f9f..60a67a28 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt # # Optional Software's will only be installed if you set them to `true` # in the `docker-compose.yml` before the build. -# -# - INSTALL_XDEBUG= false -# - INSTALL_MONGO= false -# - INSTALL_ZIP_ARCHIVE= false -# - INSTALL_MEMCACHED= false +# Example: +# - INSTALL_ZIP_ARCHIVE=true # ##################################### @@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ pecl install xdebug && \ docker-php-ext-enable xdebug \ ;fi -# ADD for REMOTE debugging -COPY ./xdebug_settings_only.ini /usr/local/etc/php/conf.d/xdebug_settings_only.ini + +# Copy xdebug configration for remote debugging +COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini ##################################### # MongoDB: @@ -99,7 +97,6 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \ docker-php-ext-enable opcache \ ;fi - # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 8c296ce3..fe412775 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt # # Optional Software's will only be installed if you set them to `true` # in the `docker-compose.yml` before the build. -# -# - INSTALL_XDEBUG= false -# - INSTALL_MONGO= false -# - INSTALL_ZIP_ARCHIVE= false -# - INSTALL_MEMCACHED= false +# Example: +# - INSTALL_ZIP_ARCHIVE=true # ##################################### @@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ pecl install xdebug && \ docker-php-ext-enable xdebug \ ;fi -# ADD for REMOTE debugging -COPY ./xdebug_settings_only.ini /usr/local/etc/php/conf.d/xdebug_settings_only.ini + +# Copy xdebug configration for remote debugging +COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini ##################################### # MongoDB: diff --git a/workspace/Dockerfile b/workspace/Dockerfile index e5338f64..e869bfab 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -54,7 +54,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \ ;fi # ADD for REMOTE debugging -COPY ./xdebug_settings_only.ini /etc/php/7.0/cli/conf.d/xdebug_settings_only.ini +COPY ./xdebug.ini /etc/php/7.0/cli/conf.d/xdebug.ini ##################################### # MongoDB: