Skip to content

L
laradock
Commit dd48592d authored by Mahmoud Zalt's avatar Mahmoud Zalt
Browse files
Options

update the xdebug.ini usage

parent d57a0c38
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 16 deletions
php-fpm/Dockerfile-56
View file @ dd48592d
...@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> ...@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
# #
# Optional Software's will only be installed if you set them to `true` # Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build. # in the `docker-compose.yml` before the build.
# # Example:
# - INSTALL_XDEBUG= false # - INSTALL_ZIP_ARCHIVE=true
# - INSTALL_MONGO= false
# - INSTALL_ZIP_ARCHIVE= false
# - INSTALL_MEMCACHED= false
# #
##################################### #####################################
...@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ ...@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
pecl install xdebug && \ pecl install xdebug && \
docker-php-ext-enable xdebug \ docker-php-ext-enable xdebug \
;fi ;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: # MongoDB:
...@@ -99,7 +97,6 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \ ...@@ -99,7 +97,6 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
docker-php-ext-enable opcache \ docker-php-ext-enable opcache \
;fi ;fi
# #
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# Final Touch # Final Touch
......
php-fpm/Dockerfile-70
View file @ dd48592d
...@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> ...@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
# #
# Optional Software's will only be installed if you set them to `true` # Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build. # in the `docker-compose.yml` before the build.
# # Example:
# - INSTALL_XDEBUG= false # - INSTALL_ZIP_ARCHIVE=true
# - INSTALL_MONGO= false
# - INSTALL_ZIP_ARCHIVE= false
# - INSTALL_MEMCACHED= false
# #
##################################### #####################################
...@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ ...@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
pecl install xdebug && \ pecl install xdebug && \
docker-php-ext-enable xdebug \ docker-php-ext-enable xdebug \
;fi ;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: # MongoDB:
......
workspace/Dockerfile
View file @ dd48592d
...@@ -54,7 +54,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ ...@@ -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 \ echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
;fi ;fi
# ADD for REMOTE debugging # 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: # MongoDB:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment