From 2df00ecdadc1d3d97c9b5ac1a56692e687467a06 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud.z@msn.com>
Date: Wed, 13 Jul 2016 16:00:47 +0300
Subject: [PATCH] remove installing Prestissimo by default, to prevent the
 warning

---
 README.md          | 12 ++++++------
 docker-compose.yml | 42 +++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 3dde06f..a6ac206 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
-		- [Optional Features](#Optional-Features)
+		- [Install-Prestissimo](#Install-Prestissimo)
 		- [Debugging](#debugging)
 - [Help & Questions](#Help)
 
@@ -260,6 +260,7 @@ If you need a special support. Contact me, more details in the [Help & Questions
 <a name="Documentation"></a>
 ## Documentation
 
+**Note:** this documentation doesn't cover the Docker Beta *(Native Docker on MAC and Windows)*. However, the commands are very similar. We are planning to cover the Docker Beta soon.
 
 
 <a name="Docker"></a>
@@ -824,12 +825,10 @@ server_name laravel.dev;
 
 
 <br>
-<a name="Optional-Features"></a>
-### Optional Features
-Optional features can be enabled by changing the `.env` file in the Laradock directory.
+<a name="Install-Prestissimo"></a>
+### Install Prestissimo
 
-#### Prestissimo
-[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. You can enable Prestissimo by setting `INSTALL_PRESTISSIMO=true` in the `.env` file.
+[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. You can enable Prestissimo by setting `INSTALL_PRESTISSIMO=true` in the `docker-compose.yml` file.
 
 <br>
 <a name="debugging"></a>
@@ -878,6 +877,7 @@ Additionally, you can contact Mahmoud Zalt (the creator of this project) via a d
 
 **Main Contributors:**
 
+- [Jack Fletcher](https://github.com/Kauhat)
 - [Bo-Yi Wu](https://github.com/appleboy)
 - [Amin Mkh](https://github.com/AminMkh)
 - [Matthew Tonkin Dunn](https://github.com/mattythebatty)
diff --git a/docker-compose.yml b/docker-compose.yml
index f736404..7b2483f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,26 +2,6 @@ version: '2'
 
 services:
 
-### Laravel Application Code Container ######################
-
-    volumes_source:
-        build: ./volumes/application
-        volumes:
-            - ../:/var/www/laravel
-
-### Databases Data Container ################################
-
-    volumes_data:
-        build: ./volumes/data
-        volumes:
-            - ./data/mysql:/var/lib/mysql
-            - ./data/postgres:/var/lib/postgres
-            - ./data/mariadb:/var/lib/mariadb
-            - ./data/memcached:/var/lib/memcached
-            - ./data/redis:/data
-            - ./data/neo4j:/var/lib/neo4j/data
-            - ./data/mongo:/data/db
-
 ### Nginx Server Container ##################################
 
     nginx:
@@ -156,9 +136,29 @@ services:
         build:
             context: ./workspace
             args:
-                - INSTALL_PRESTISSIMO=${INSTALL_PRESTISSIMO}
+                - INSTALL_PRESTISSIMO=false
         volumes_from:
             - volumes_source
         tty: true
 
+### Laravel Application Code Container ######################
+
+    volumes_source:
+        build: ./volumes/application
+        volumes:
+            - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+    volumes_data:
+        build: ./volumes/data
+        volumes:
+            - ./data/mysql:/var/lib/mysql
+            - ./data/postgres:/var/lib/postgres
+            - ./data/mariadb:/var/lib/mariadb
+            - ./data/memcached:/var/lib/memcached
+            - ./data/redis:/data
+            - ./data/neo4j:/var/lib/neo4j/data
+            - ./data/mongo:/data/db
+
 ### Add more Containers below ###############################