From 419434020c544328dd9b01d70bbe0e0e152a335d Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud.z@msn.com>
Date: Mon, 25 Jul 2016 04:05:07 +0300
Subject: [PATCH] merge back apt-get update and install to keep them on the
 same layer

---
 php-fpm/Dockerfile-5  | 23 +++++++++++------------
 php-fpm/Dockerfile-70 | 23 +++++++++++------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/php-fpm/Dockerfile-5 b/php-fpm/Dockerfile-5
index fb013dbc..aa48b4f8 100644
--- a/php-fpm/Dockerfile-5
+++ b/php-fpm/Dockerfile-5
@@ -11,8 +11,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD ./laravel.ini /usr/local/etc/php/conf.d
 ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 
-RUN apt-get update
-
 #
 #--------------------------------------------------------------------------
 # Software's Installation
@@ -23,16 +21,17 @@ RUN apt-get update
 
 # Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
 #         "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
-RUN apt-get install -y --no-install-recommends \
-    curl \
-    libmemcached-dev \
-    libz-dev \
-    libpq-dev \
-    libjpeg-dev \
-    libpng12-dev \
-    libfreetype6-dev \
-    libssl-dev \
-    libmcrypt-dev
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        libmemcached-dev \
+        libz-dev \
+        libpq-dev \
+        libjpeg-dev \
+        libpng12-dev \
+        libfreetype6-dev \
+        libssl-dev \
+        libmcrypt-dev
 
 # Install the PHP mcrypt extention
 RUN docker-php-ext-install mcrypt
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index c35f6f15..2ff7b4ee 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -11,8 +11,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD ./laravel.ini /usr/local/etc/php/conf.d
 ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 
-RUN apt-get update
-
 #
 #--------------------------------------------------------------------------
 # Software's Installation
@@ -23,16 +21,17 @@ RUN apt-get update
 
 # Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
 #         "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
-RUN apt-get install -y --no-install-recommends \
-    curl \
-    libmemcached-dev \
-    libz-dev \
-    libpq-dev \
-    libjpeg-dev \
-    libpng12-dev \
-    libfreetype6-dev \
-    libssl-dev \
-    libmcrypt-dev
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        libmemcached-dev \
+        libz-dev \
+        libpq-dev \
+        libjpeg-dev \
+        libpng12-dev \
+        libfreetype6-dev \
+        libssl-dev \
+        libmcrypt-dev
 
 # Install the PHP mcrypt extention
 RUN docker-php-ext-install mcrypt