From de6db93da8b08425a3e70726385a9144e4334524 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud.z@msn.com>
Date: Mon, 27 Jun 2016 13:58:48 +0300
Subject: [PATCH] Fix conflict merging zhikiri-hotfix/mongo-support

---
 php-fpm/Dockerfile-55 | 7 ++++---
 php-fpm/Dockerfile-56 | 7 ++++---
 php-fpm/Dockerfile-70 | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/php-fpm/Dockerfile-55 b/php-fpm/Dockerfile-55
index f37f4d7d..977f2538 100644
--- a/php-fpm/Dockerfile-55
+++ b/php-fpm/Dockerfile-55
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     libpng12-dev \
     libfreetype6-dev \
+    libssl-dev \
     libmcrypt-dev \
     --no-install-recommends \
     && rm -r /var/lib/apt/lists/*
@@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
 # install mcrypt library
 RUN docker-php-ext-install mcrypt
 
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
     --enable-gd-native-ttf \
@@ -37,9 +41,6 @@ RUN pecl install memcached \
 RUN pecl install xdebug \
     && docker-php-ext-enable xdebug
 
-# 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 a5041dd0..da7de7af 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     libpng12-dev \
     libfreetype6-dev \
+    libssl-dev \
     libmcrypt-dev \
     --no-install-recommends \
     && rm -r /var/lib/apt/lists/*
@@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
 # install mcrypt library
 RUN docker-php-ext-install mcrypt
 
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
     --enable-gd-native-ttf \
@@ -37,9 +41,6 @@ RUN pecl install memcached \
 RUN pecl install xdebug \
     && docker-php-ext-enable xdebug
 
-# 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 74113235..17c1e3f2 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     libpng12-dev \
     libfreetype6-dev \
+    libssl-dev \
     libmcrypt-dev \
     --no-install-recommends \
     && rm -r /var/lib/apt/lists/*
@@ -18,6 +19,9 @@ RUN apt-get update && apt-get install -y \
 # install mcrypt library
 RUN docker-php-ext-install mcrypt
 
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
     --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 \
     && docker-php-ext-enable xdebug
 
-# Install mongodb driver
-RUN pecl install mongodb
-
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel