Merge pull request #91 from LaraDock/xdebug

Xdebug
format the laravel.ini file
2016-06-03 15:06:57 +03:00 · 2016-06-03 15:01:56 +03:00 · 2016-06-03 14:39:53 +03:00 · 2016-06-03 14:21:52 +08:00 · 2016-06-03 14:04:33 +08:00
4 changed files with 26 additions and 8 deletions
--- a/php-fpm/Dockerfile-55
+++ b/php-fpm/Dockerfile-55
@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
    libpq-dev \
    libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*

 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
    pdo_mysql \
    pdo_pgsql

-#Install memcached
+# Install memcached
 RUN pecl install memcached \
    && docker-php-ext-enable memcached

+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
    libpq-dev \
    libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*

 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
    pdo_mysql \
    pdo_pgsql

-#Install memcached
+# Install memcached
 RUN pecl install memcached \
    && docker-php-ext-enable memcached

+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -8,7 +8,9 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
    libpq-dev \
    libmemcached-dev \
-    curl
+    curl \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*

 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
@ -23,6 +25,10 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
    && docker-php-ext-install memcached \
    && rm /tmp/memcached.tar.gz

+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
--- a/php-fpm/laravel.ini
+++ b/php-fpm/laravel.ini
@ -1,3 +1,3 @@
-date.timezone = UTC
-display_errors = Off
-log_errors = On
+date.timezone=UTC
+display_errors=Off
+log_errors=On
Author	SHA1	Message	Date
Mahmoud Zalt	1148a3d051	Merge pull request #91 from LaraDock/xdebug Xdebug	2016-06-03 15:06:57 +03:00
Mahmoud Zalt	bec1a32550	format the laravel.ini file	2016-06-03 15:01:56 +03:00
Mahmoud Zalt	72cde8a8ea	Merge branch 'patch-3' of https://github.com/appleboy/laradock into appleboy-patch-3 * 'patch-3' of https://github.com/appleboy/laradock: clean apt source file after install. install xdebug to generate coverage report for unit testing.	2016-06-03 14:39:53 +03:00
Bo-Yi Wu	1673a80daf	clean apt source file after install. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2016-06-03 14:21:52 +08:00
Bo-Yi Wu	f130381cfe	install xdebug to generate coverage report for unit testing. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2016-06-03 14:04:33 +08:00