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

Merge pull request #229 from Kauhat/patch-1 

Remove hard-coded extensions from laravel.ini
This commit is contained in:
Mahmoud Zalt 2016-08-15 17:57:30 +03:00 committed by GitHub
parent a30bf83269 651430c7a9
commit 28b4077a49
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
php-fpm/Dockerfile-56
View File

@ -45,7 +45,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
ARG INSTALL_XDEBUG=true ARG INSTALL_XDEBUG=true
ENV INSTALL_XDEBUG ${INSTALL_XDEBUG} ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extention # Install the xdebug extension
pecl install xdebug && \ pecl install xdebug && \
docker-php-ext-enable xdebug \ docker-php-ext-enable xdebug \
;fi ;fi
@ -57,8 +57,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
ARG INSTALL_MONGO=true ARG INSTALL_MONGO=true
ENV INSTALL_MONGO ${INSTALL_MONGO} ENV INSTALL_MONGO ${INSTALL_MONGO}
RUN if [ ${INSTALL_MONGO} = true ]; then \ RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extention # Install the mongodb extension
pecl install mongodb \ pecl install mongodb && \
docker-php-ext-enable mongodb \
;fi ;fi
##################################### #####################################
@ -68,8 +69,9 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
ARG INSTALL_ZIP_ARCHIVE=true ARG INSTALL_ZIP_ARCHIVE=true
ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE} ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
# Install the zip extention # Install the zip extension
pecl install zip \ pecl install zip && \
docker-php-ext-enable zip \
;fi ;fi

12
php-fpm/Dockerfile-70
View File

@ -45,7 +45,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
ARG INSTALL_XDEBUG=true ARG INSTALL_XDEBUG=true
ENV INSTALL_XDEBUG ${INSTALL_XDEBUG} ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extention # Install the xdebug extension
pecl install xdebug && \ pecl install xdebug && \
docker-php-ext-enable xdebug \ docker-php-ext-enable xdebug \
;fi ;fi
@ -57,8 +57,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
ARG INSTALL_MONGO=true ARG INSTALL_MONGO=true
ENV INSTALL_MONGO ${INSTALL_MONGO} ENV INSTALL_MONGO ${INSTALL_MONGO}
RUN if [ ${INSTALL_MONGO} = true ]; then \ RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extention # Install the mongodb extension
pecl install mongodb \ pecl install mongodb && \
docker-php-ext-enable mongodb \
;fi ;fi
##################################### #####################################
@ -68,8 +69,9 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
ARG INSTALL_ZIP_ARCHIVE=true ARG INSTALL_ZIP_ARCHIVE=true
ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE} ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
# Install the zip extention # Install the zip extension
pecl install zip \ pecl install zip && \
docker-php-ext-enable zip \
;fi ;fi

2
php-fpm/laravel.ini
View File

@ -1,8 +1,6 @@
date.timezone=UTC date.timezone=UTC
display_errors=Off display_errors=Off
log_errors=On log_errors=On
extension=mongodb.so
extension=zip.so
; Maximum amount of memory a script may consume (128MB) ; Maximum amount of memory a script may consume (128MB)
; http://php.net/memory-limit ; http://php.net/memory-limit