Merge pull request #229 from Kauhat/patch-1

Remove hard-coded extensions from laravel.ini
Update Dockerfile-56
2016-08-15 17:57:30 +03:00 · 2016-08-15 15:01:47 +01:00 · 2016-08-15 15:00:37 +01:00 · 2016-08-15 14:57:51 +01:00
3 changed files with 14 additions and 12 deletions
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -45,7 +45,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ARG INSTALL_XDEBUG=true
 ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
 RUN if [ ${INSTALL_XDEBUG} = true ]; then \
-    # Install the xdebug extention
+    # Install the xdebug extension
    pecl install xdebug && \
    docker-php-ext-enable xdebug \
 ;fi
@ -57,8 +57,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 ARG INSTALL_MONGO=true
 ENV INSTALL_MONGO ${INSTALL_MONGO}
 RUN if [ ${INSTALL_MONGO} = true ]; then \
-    # Install the mongodb extention
-    pecl install mongodb \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    docker-php-ext-enable mongodb \
 ;fi

 #####################################
@ -68,8 +69,9 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_ZIP_ARCHIVE=true
 ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
 RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
-    # Install the zip extention
-    pecl install zip \
+    # Install the zip extension
+    pecl install zip && \
+    docker-php-ext-enable zip \
 ;fi


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

 #####################################
@ -68,8 +69,9 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_ZIP_ARCHIVE=true
 ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
 RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
-    # Install the zip extention
-    pecl install zip \
+    # Install the zip extension
+    pecl install zip && \
+    docker-php-ext-enable zip \
 ;fi


--- a/php-fpm/laravel.ini
+++ b/php-fpm/laravel.ini
@ -1,8 +1,6 @@
 date.timezone=UTC
 display_errors=Off
 log_errors=On
-extension=mongodb.so
-extension=zip.so

 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
Author	SHA1	Message	Date
Mahmoud Zalt	28b4077a49	Merge pull request #229 from Kauhat/patch-1 Remove hard-coded extensions from laravel.ini	2016-08-15 17:57:30 +03:00
Jack Fletcher	651430c7a9	Update Dockerfile-56	2016-08-15 15:01:47 +01:00
Jack Fletcher	3be9dee1c7	Update Dockerfile-70	2016-08-15 15:00:37 +01:00
Jack Fletcher	8ef37a71fb	Remove hard-coded extensions from laravel.ini	2016-08-15 14:57:51 +01:00