From bb4a670af3c9d1aa1db0b5ec2159aab6827ba30a Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Thu, 7 Jul 2016 10:40:39 +0100
Subject: [PATCH] Squashing layers with new composer install @crunchywelch

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ca801b..7de2634 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,9 +38,8 @@ RUN apk add --no-cache bash \
     mkdir -p /etc/nginx && \
     mkdir -p /var/www/app && \
     mkdir -p /run/nginx && \
-    mkdir -p /var/log/supervisor 
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+    mkdir -p /var/log/supervisor &&\
+    php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
     php -r "if (hash_file('SHA384', 'composer-setup.php') === '${composer_hash}') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php --install-dir=/usr/bin --filename=composer && \
     php -r "unlink('composer-setup.php');"