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.
This commit is contained in:
commit
72cde8a8ea
@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
|
|||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
libmemcached-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
|
# Install extensions using the helper script provided by the base image
|
||||||
RUN docker-php-ext-install \
|
RUN docker-php-ext-install \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql
|
pdo_pgsql
|
||||||
|
|
||||||
#Install memcached
|
# Install memcached
|
||||||
RUN pecl install memcached \
|
RUN pecl install memcached \
|
||||||
&& docker-php-ext-enable memcached
|
&& docker-php-ext-enable memcached
|
||||||
|
|
||||||
|
# Install xdebug
|
||||||
|
RUN pecl install xdebug \
|
||||||
|
&& docker-php-ext-enable xdebug
|
||||||
|
|
||||||
RUN usermod -u 1000 www-data
|
RUN usermod -u 1000 www-data
|
||||||
|
|
||||||
WORKDIR /var/www/laravel
|
WORKDIR /var/www/laravel
|
||||||
|
@ -8,17 +8,23 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
|
|||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
libmemcached-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
|
# Install extensions using the helper script provided by the base image
|
||||||
RUN docker-php-ext-install \
|
RUN docker-php-ext-install \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql
|
pdo_pgsql
|
||||||
|
|
||||||
#Install memcached
|
# Install memcached
|
||||||
RUN pecl install memcached \
|
RUN pecl install memcached \
|
||||||
&& docker-php-ext-enable memcached
|
&& docker-php-ext-enable memcached
|
||||||
|
|
||||||
|
# Install xdebug
|
||||||
|
RUN pecl install xdebug \
|
||||||
|
&& docker-php-ext-enable xdebug
|
||||||
|
|
||||||
RUN usermod -u 1000 www-data
|
RUN usermod -u 1000 www-data
|
||||||
|
|
||||||
WORKDIR /var/www/laravel
|
WORKDIR /var/www/laravel
|
||||||
|
@ -8,7 +8,9 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
|
|||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
libmemcached-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
|
# Install extensions using the helper script provided by the base image
|
||||||
RUN docker-php-ext-install \
|
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 \
|
&& docker-php-ext-install memcached \
|
||||||
&& rm /tmp/memcached.tar.gz
|
&& rm /tmp/memcached.tar.gz
|
||||||
|
|
||||||
|
# Install xdebug
|
||||||
|
RUN pecl install xdebug \
|
||||||
|
&& docker-php-ext-enable xdebug
|
||||||
|
|
||||||
RUN usermod -u 1000 www-data
|
RUN usermod -u 1000 www-data
|
||||||
|
|
||||||
WORKDIR /var/www/laravel
|
WORKDIR /var/www/laravel
|
||||||
|
Loading…
Reference in New Issue
Block a user