Merge pull request #502 from laradock/support-bcmath-php-ext

Support bcmath php extension on php-fpm and workspace (base image 1.3)
Support bcmath php extention on php-fpm and workspace (base image 1.3)
2016-12-21 14:10:14 -05:00 · 2016-12-21 14:01:51 -05:00 · 2016-12-21 23:30:02 +08:00 · 2016-12-21 10:16:32 -03:00 · 2016-12-21 09:20:20 +08:00 · 2016-12-21 08:09:41 +08:00
5 changed files with 25 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -619,7 +619,7 @@ By default **PHP-FPM 7.0** is running.
 4 - Finally rebuild the container

 ```bash
-docker-compose build php
+docker-compose build php-fpm
 ```

 > For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -49,6 +49,7 @@ services:
                - INSTALL_SOAP=false
                - INSTALL_MONGO=false
                - INSTALL_ZIP_ARCHIVE=false
+                - INSTALL_BCMATH=true
                - INSTALL_MEMCACHED=false
                - INSTALL_OPCACHE=false
                - INSTALL_AEROSPIKE_EXTENSION=false
@ -306,7 +307,7 @@ services:
        build: ./elasticsearch
        volumes:
            - elasticsearch-data:/usr/share/elasticsearch/data
-            - elasticsearch-pkugins:/usr/share/elasticsearch/data
+            - elasticsearch-plugins:/usr/share/elasticsearch/data
        ports:
            - "9200:9200"
            - "9300:9300"
@ -338,7 +339,7 @@ volumes:
        driver: "local"
    elasticsearch-data:
        driver: "local"
-    elasticsearch-pkugins:
+    elasticsearch-plugins:
        driver: "local"
    sessions:    ## nothing is connected to this (- ./data/sessions:/sessions)
        driver: "local"
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -84,6 +84,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
    docker-php-ext-enable zip \
 ;fi

+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -85,6 +85,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
    docker-php-ext-enable zip \
 ;fi

+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #

-FROM laradock/workspace:1.2
+FROM laradock/workspace:1.3

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
Author	SHA1	Message	Date
Mahmoud Zalt	dd3e88fba9	Merge pull request #502 from laradock/support-bcmath-php-ext Support bcmath php extension on php-fpm and workspace (base image 1.3)	2016-12-21 14:10:14 -05:00
Mahmoud Zalt	860af556e2	Support bcmath php extention on php-fpm and workspace (base image 1.3) Probably closes #453	2016-12-21 14:01:51 -05:00
Bo-Yi Wu	586a21086f	Merge pull request #501 from whoan/patch-1 Typo	2016-12-21 23:30:02 +08:00
Juan Eugenio Abadie	d76f9e7722	Typo elasticsearch-pkugins -> elasticsearch-plugins	2016-12-21 10:16:32 -03:00
Bo-Yi Wu	79ce978527	Merge pull request #500 from shukebeta/master fix a important document typo	2016-12-21 09:20:20 +08:00
shukebeta	944639b248	fix a important typo docker-compose build php => docker-compose build php-fpm	2016-12-21 08:09:41 +08:00