Skip to content

Commit dd48592

Browse files
committed
update the xdebug.ini usage
1 parent d57a0c3 commit dd48592

3 files changed

Lines changed: 11 additions & 16 deletions

File tree

php-fpm/Dockerfile-56

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
3232
#
3333
# Optional Software's will only be installed if you set them to `true`
3434
# in the `docker-compose.yml` before the build.
35-
#
36-
# - INSTALL_XDEBUG= false
37-
# - INSTALL_MONGO= false
38-
# - INSTALL_ZIP_ARCHIVE= false
39-
# - INSTALL_MEMCACHED= false
35+
# Example:
36+
# - INSTALL_ZIP_ARCHIVE=true
4037
#
4138

4239
#####################################
@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
5047
pecl install xdebug && \
5148
docker-php-ext-enable xdebug \
5249
;fi
53-
# ADD for REMOTE debugging
54-
COPY ./xdebug_settings_only.ini /usr/local/etc/php/conf.d/xdebug_settings_only.ini
50+
51+
# Copy xdebug configration for remote debugging
52+
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
5553

5654
#####################################
5755
# MongoDB:
@@ -99,7 +97,6 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
9997
docker-php-ext-enable opcache \
10098
;fi
10199

102-
103100
#
104101
#--------------------------------------------------------------------------
105102
# Final Touch

php-fpm/Dockerfile-70

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
3232
#
3333
# Optional Software's will only be installed if you set them to `true`
3434
# in the `docker-compose.yml` before the build.
35-
#
36-
# - INSTALL_XDEBUG= false
37-
# - INSTALL_MONGO= false
38-
# - INSTALL_ZIP_ARCHIVE= false
39-
# - INSTALL_MEMCACHED= false
35+
# Example:
36+
# - INSTALL_ZIP_ARCHIVE=true
4037
#
4138

4239
#####################################
@@ -50,8 +47,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
5047
pecl install xdebug && \
5148
docker-php-ext-enable xdebug \
5249
;fi
53-
# ADD for REMOTE debugging
54-
COPY ./xdebug_settings_only.ini /usr/local/etc/php/conf.d/xdebug_settings_only.ini
50+
51+
# Copy xdebug configration for remote debugging
52+
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
5553

5654
#####################################
5755
# MongoDB:

workspace/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
5454
echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
5555
;fi
5656
# ADD for REMOTE debugging
57-
COPY ./xdebug_settings_only.ini /etc/php/7.0/cli/conf.d/xdebug_settings_only.ini
57+
COPY ./xdebug.ini /etc/php/7.0/cli/conf.d/xdebug.ini
5858

5959
#####################################
6060
# MongoDB:

0 commit comments

Comments
 (0)