ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zhikiri-hotfix/mongo-support' 

* zhikiri-hotfix/mongo-support:
  Fix conflict merging zhikiri-hotfix/mongo-support
This commit is contained in:
Mahmoud Zalt 2016-06-27 13:59:24 +03:00
parent 1af9dc5ac2 de6db93da8
commit 72a8fc049d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
php-fpm/Dockerfile-55
View File

@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
curl \ curl \
libpng12-dev \ libpng12-dev \
libfreetype6-dev \ libfreetype6-dev \
libssl-dev \
libmcrypt-dev \ libmcrypt-dev \
--no-install-recommends \ --no-install-recommends \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
# install mcrypt library # install mcrypt library
RUN docker-php-ext-install mcrypt RUN docker-php-ext-install mcrypt
# Install mongodb driver
RUN pecl install mongodb
# configure gd library # configure gd library
RUN docker-php-ext-configure gd \ RUN docker-php-ext-configure gd \
--enable-gd-native-ttf \ --enable-gd-native-ttf \
@ -37,9 +41,6 @@ RUN pecl install memcached \
RUN pecl install xdebug \ RUN pecl install xdebug \
&& docker-php-ext-enable xdebug && docker-php-ext-enable xdebug
# Install mongodb driver
RUN pecl install mongodb
RUN usermod -u 1000 www-data RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel WORKDIR /var/www/laravel

7
php-fpm/Dockerfile-56
View File

@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
curl \ curl \
libpng12-dev \ libpng12-dev \
libfreetype6-dev \ libfreetype6-dev \
libssl-dev \
libmcrypt-dev \ libmcrypt-dev \
--no-install-recommends \ --no-install-recommends \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
# install mcrypt library # install mcrypt library
RUN docker-php-ext-install mcrypt RUN docker-php-ext-install mcrypt
# Install mongodb driver
RUN pecl install mongodb
# configure gd library # configure gd library
RUN docker-php-ext-configure gd \ RUN docker-php-ext-configure gd \
--enable-gd-native-ttf \ --enable-gd-native-ttf \
@ -37,9 +41,6 @@ RUN pecl install memcached \
RUN pecl install xdebug \ RUN pecl install xdebug \
&& docker-php-ext-enable xdebug && docker-php-ext-enable xdebug
# Install mongodb driver
RUN pecl install mongodb
RUN usermod -u 1000 www-data RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel WORKDIR /var/www/laravel

7
php-fpm/Dockerfile-70
View File

@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
curl \ curl \
libpng12-dev \ libpng12-dev \
libfreetype6-dev \ libfreetype6-dev \
libssl-dev \
libmcrypt-dev \ libmcrypt-dev \
--no-install-recommends \ --no-install-recommends \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
# install mcrypt library # install mcrypt library
RUN docker-php-ext-install mcrypt RUN docker-php-ext-install mcrypt
# Install mongodb driver
RUN pecl install mongodb
# configure gd library # configure gd library
RUN docker-php-ext-configure gd \ RUN docker-php-ext-configure gd \
--enable-gd-native-ttf \ --enable-gd-native-ttf \
@ -41,9 +45,6 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
RUN pecl install xdebug \ RUN pecl install xdebug \
&& docker-php-ext-enable xdebug && docker-php-ext-enable xdebug
# Install mongodb driver
RUN pecl install mongodb
RUN usermod -u 1000 www-data RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel WORKDIR /var/www/laravel