From f130381cfefcc5fef5f39518f9b23b7929ce383e Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 3 Jun 2016 14:04:33 +0800 Subject: [PATCH 1/3] install xdebug to generate coverage report for unit testing. Signed-off-by: Bo-Yi Wu --- php-fpm/Dockerfile-55 | 6 +++++- php-fpm/Dockerfile-56 | 6 +++++- php-fpm/Dockerfile-70 | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile-55 b/php-fpm/Dockerfile-55 index 93d82c52..e139c7cf 100644 --- a/php-fpm/Dockerfile-55 +++ b/php-fpm/Dockerfile-55 @@ -15,10 +15,14 @@ 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 diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 5da34488..27d00189 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -15,10 +15,14 @@ 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 diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 61f21d07..063ea620 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -23,6 +23,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 From 1673a80daf38cb211fdae5a0c4945da5da94fa91 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 3 Jun 2016 14:21:52 +0800 Subject: [PATCH 2/3] clean apt source file after install. Signed-off-by: Bo-Yi Wu --- php-fpm/Dockerfile-55 | 4 +++- php-fpm/Dockerfile-56 | 4 +++- php-fpm/Dockerfile-70 | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile-55 b/php-fpm/Dockerfile-55 index e139c7cf..9d8af111 100644 --- a/php-fpm/Dockerfile-55 +++ b/php-fpm/Dockerfile-55 @@ -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 \ diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 27d00189..cea383ac 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -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 \ diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 063ea620..01dfb2c9 100644 --- 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 \ From bec1a3255030f603f662eccfff602afe497ccd79 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Fri, 3 Jun 2016 15:01:56 +0300 Subject: [PATCH 3/3] format the laravel.ini file --- php-fpm/laravel.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php-fpm/laravel.ini b/php-fpm/laravel.ini index 3580140c..ada3a5de 100644 --- a/php-fpm/laravel.ini +++ b/php-fpm/laravel.ini @@ -1,3 +1,3 @@ -date.timezone = UTC -display_errors = Off -log_errors = On \ No newline at end of file +date.timezone=UTC +display_errors=Off +log_errors=On \ No newline at end of file