From 9c7054abe253386ca6aee81ed0a823f0a3045139 Mon Sep 17 00:00:00 2001
From: Amin Mkh <mukh_amin@yahoo.com>
Date: Sun, 29 May 2016 14:19:43 +0300
Subject: [PATCH 1/2] added mongodb image + PHP7 driver

---
 docker-compose.yml    |  7 +++++++
 mongo/Dockerfile      | 12 ++++++++++++
 php-fpm/Dockerfile-70 |  4 ++++
 3 files changed, 23 insertions(+)
 create mode 100644 mongo/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index dd3ad77d..5557da05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,6 +139,13 @@ services:
             - "2080:2080"
         links:
             - beanstalkd
+            
+### Mongo Container ############################
+
+    mongo:
+        build: ./mongo
+        ports:
+            - "27017:27017"
 
 ### Workspace Utilities Container ###########################
 
diff --git a/mongo/Dockerfile b/mongo/Dockerfile
new file mode 100644
index 00000000..9662d6fc
--- /dev/null
+++ b/mongo/Dockerfile
@@ -0,0 +1,12 @@
+FROM mongo:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#COPY mongo.conf /usr/local/etc/mongo/mongo.conf
+
+VOLUME /var/lib/mongo
+
+CMD [ "mongod" ]
+
+EXPOSE 27017
+
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 61f21d07..00235d77 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -23,6 +23,10 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
     && docker-php-ext-install memcached \
     && rm /tmp/memcached.tar.gz
 
+# Install mongodb driver
+RUN pecl install mongodb
+RUN echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongo.ini
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

From 1090bb4db66303f9729c262edb290825b8220397 Mon Sep 17 00:00:00 2001
From: Amin Mkh <mukh_amin@yahoo.com>
Date: Mon, 30 May 2016 23:26:40 +0300
Subject: [PATCH 2/2] added mongodb driver for php5.5 5.6

---
 php-fpm/Dockerfile-55 | 3 +++
 php-fpm/Dockerfile-56 | 3 +++
 php-fpm/Dockerfile-70 | 1 -
 php-fpm/laravel.ini   | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/php-fpm/Dockerfile-55 b/php-fpm/Dockerfile-55
index 93d82c52..c71e2f84 100644
--- a/php-fpm/Dockerfile-55
+++ b/php-fpm/Dockerfile-55
@@ -19,6 +19,9 @@ RUN docker-php-ext-install \
 RUN pecl install memcached \
     && docker-php-ext-enable memcached
 
+# Install mongodb driver
+RUN pecl install mongodb
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index 5da34488..eb99c209 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -19,6 +19,9 @@ RUN docker-php-ext-install \
 RUN pecl install memcached \
     && docker-php-ext-enable memcached
 
+# Install mongodb driver
+RUN pecl install mongodb
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 00235d77..c4920fa3 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -25,7 +25,6 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
 
 # Install mongodb driver
 RUN pecl install mongodb
-RUN echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongo.ini
 
 RUN usermod -u 1000 www-data
 
diff --git a/php-fpm/laravel.ini b/php-fpm/laravel.ini
index 3580140c..b09f4664 100644
--- a/php-fpm/laravel.ini
+++ b/php-fpm/laravel.ini
@@ -1,3 +1,4 @@
 date.timezone = UTC
 display_errors = Off
-log_errors = On
\ No newline at end of file
+log_errors = On
+extension=mongodb.so
\ No newline at end of file