Merge branch 'master' of https://github.com/LaraDock/laradock

* 'master' of https://github.com/LaraDock/laradock:

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*]
+charset = utf-8
+
+[{Dockerfile,docker-compose.yml}]
+indent_style = space
+indent_size = 4

.gitignore

@@ -1 +1,3 @@
-/logs
+/logs
+/data
+.env

README.md

@@ -2,13 +2,16 @@
 
 [![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
+[![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 LaraDock helps you run your **Laravel** App on **Docker** real quick.
 <br>
 It's like Laravel Homestead but for Docker instead of Vagrant.
 
+>With LaraDock, use Docker first and learn about it later.
 
-![](http://s18.postimg.org/fhykchl09/new_laradock_cover.png)
+
+![](https://s31.postimg.org/nbettdki3/lara_dock_poster_new.jpg)
 
 <br>
 ## Contents
@@ -21,6 +24,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 	- [What is Laravel](#what-is-laravel)
 	- [Why Docker not Vagrant](#why-docker-not-vagrant)
 	- [LaraDock VS Homestead](#laradock-vs-homestead)
+- [Demo Video](#Demo)
 - [Requirements](#Requirements)
 - [Installation](#Installation)
 - [Usage](#Usage)
@@ -36,17 +40,24 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Add more Software's (Docker Images)](#Add-Docker-Images)
 		- [View the Log files](#View-the-Log-files)
 	- [Laravel](#Laravel):
+		- [Install Laravel from a Docker Container](#Install-Laravel)
 		- [Run Artisan Commands](#Run-Artisan-Commands)
 		- [Use Redis](#Use-Redis)
+		- [Use Mongo](#Use-Mongo)
 	- [PHP](#PHP)
 		- [Install PHP Extensions](#Install-PHP-Extensions)
 		- [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
 		- [Change the PHP-CLI Version](#Change-the-PHP-CLI-Version)
+		- [Install xDebug](#Install-xDebug)
 	- [Misc](#Misc)
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
-
+		- [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
+		- [Install Prestissimo](#Install-Prestissimo)
+		- [Install Node + NVM](#Install-Node)
+		- [Debugging](#debugging)
+- [Help & Questions](#Help)
 
 
 
@@ -57,44 +68,47 @@ LaraDock strives to make the development experience easier.
 It contains pre-packaged Docker Images that provides you a wonderful development environment without requiring you to install PHP, NGINX, MySQL, REDIS, and any other software on your local machine.
 
 
-**Usage Overview:** Run `NGINX` and `MySQL`.
+**Usage Overview:** Run `NGINX`, `MySQL` and `Redis`.
 
 ```shell
-docker-compose up  nginx mysql 
+docker-compose up  nginx mysql redis
 ```
 
 <a name="features"></a>
 ### Features
 
-- Easy switch between PHP versions: 7.0 - 5.6 - 5.5 ...
+- Easy switch between PHP versions: 7.0, 5.6, 5.5...
-- Choose your favorite database engine: MySQL - Postgres - Redis ...
+- Choose your favorite database engine: MySQL, Postgres, MariaDB...
-- Run your own combination of software's: Memcached - MariaDB ...
+- Run your own combination of software's: Memcached, HHVM, Beanstalkd...
-- Every software runs on a separate container: PHP-FPM - NGINX ...
+- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
 - Easy to customize any container, with simple edit to the `dockerfile`.
 - All Images extends from an official base Image. (Trusted base Images).
 - Pre-configured Nginx for Laravel.
-- Data container, to keep Data safe and accessible.
 - Easy to apply configurations inside containers.
 - Clean and well structured Dockerfiles (`dockerfile`).
 - Latest version of the Docker Compose file (`docker-compose`).
 - Everything is visible and editable.
+- Fast Images Builds.
+- More to come every week..
 
 
 <a name="Supported-Containers"></a>
 ### Supported Containers
 
-- PHP-FPM (7.0 - 5.6 - 5.5)
+- PHP-FPM
 - NGINX
+- HHVM
 - MySQL
 - PostgreSQL
 - MariaDB
+- MongoDB
+- Neo4j
 - Redis
 - Memcached
+- Caddy
 - Beanstalkd
 - Beanstalkd Console
-- Workspace (includes: Composer, PHP7-CLI, Laravel Installer, Git, Vim, Nano and cURL)
+- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, SQLite,  Vim, Nano, cURL...)
-- Data Volume *(Databases Data Container)*
-- Application *(Application Code Container)*
 
 
 >If you can't find your container, build it yourself and add it to this list. Contributions are welcomed :)
@@ -106,7 +120,7 @@ docker-compose up  nginx mysql
 <a name="what-is-docker"></a>
 ### What is Docker?
 
-[Docker](https://www.docker.com)  is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.
+[Docker](https://www.docker.com) is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.
 
 <a name="what-is-laravel"></a>
 ### What is Laravel?
@@ -121,7 +135,7 @@ Seriously!!!
 
 Instead of providing a full Virtual Machines, like you get with Vagrant, Docker provides you **lightweight** Virtual Containers, that share the same kernel and allow to safely execute independent processes.
 
-In addition to the speed, Docker gives tens of features that cannot be achieved with Vagrant.
+In addition to the speed, Docker gives tons of features that cannot be achieved with Vagrant.
 
 Most importantly Docker can run on Development and on Production (same environment everywhere). While Vagrant is designed for Development only, (so you have to re-provision your server on Production every time).
 
@@ -133,150 +147,131 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y
 
 - Homestead is a tool that controls Vagrant for you (using Homestead special commands). And Vagrant manages your Virtual Machine.
 
-- LaraDock is a tool that controls Docker for you (using Docker Compose official commands). And Docker manages you Virtual Containers.
+- LaraDock is a tool that controls Docker for you (using Docker & Docker Compose official commands). And Docker manages your Virtual Containers.
 
-Running a virtual Container is much faster than running a full virtual Machine. 
+Running a virtual Container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.
-<br>Thus **LaraDock is much faster than Homestead**.
 
 
 
 <a name="Requirements"></a>
 ## Requirements
 
-| Linux                                                                                   | Windows & MAC                                           |
+| Linux                                                                          | Windows & MAC                                                                                 |
-|-----------------------------------------------------------------------------------------|---------------------------------------------------------|
+|--------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
-|                 [Laravel](https://laravel.com/docs/master/installation)                 | [Laravel](https://laravel.com/docs/master/installation) |
+| [Laravel](https://laravel.com/docs/master/installation)                        | [Laravel](https://laravel.com/docs/master/installation)                                       |
-|                           [Git](https://git-scm.com/downloads)                          |           [Git](https://git-scm.com/downloads)          |
+| [Git](https://git-scm.com/downloads)                                           | [Git](https://git-scm.com/downloads)                                                          |
-| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) |     [Docker Toolbox](https://www.docker.com/toolbox)    |
+| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) | [Docker Toolbox](https://www.docker.com/toolbox) OR [Native Docker](https://beta.docker.com/) |
-|                [Docker Compose](https://docs.docker.com/compose/install)                |                                                         |
+| [Docker Compose](https://docs.docker.com/compose/install)                      |                                                                                               |
 
+<a name="Demo"></a>
+## Demo Video
+
+What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwDA) :)
 
 <a name="Installation"></a>
 ## Installation
 
-#### A - In existing Laravel Projects:
 
-1 - Clone the `LaraDock` repository, inside your `Laravel` project root direcotry:
+1 - Clone the `LaraDock` repository:
+
+**A)** If you already have a Laravel project, clone this repository on your `Laravel` root direcotry:
 
 ```bash
 git submodule add https://github.com/LaraDock/laradock.git
 ```
+>If you are not already using Git for your Laravel project, you can use `git clone` instead of `git submodule`.
 
-2 - That's it, jump to the Usage section now.
+**B)** If you don't have a Laravel project, and you want to install Laravel from Docker, clone this repo anywhere on your machine:
-
-*If you are not already using Git for your Laravel project, you can use `git clone` instead of `git submodule`.*
-
-
-<br>
-#### B - From scratch (Install LaraDock and Laravel):
-
-*If you don't have any Laravel project yet, and you want to start your Laravel project with Docker.*
-
-1 - Clone the `LaraDock` repository anywhere on your machine:
 
 ```bash
 git clone https://github.com/LaraDock/laradock.git
 ```
 
-2 - Go to the Uage section below and do the steps 1 and 3 then come back here.
-
-3 - Enter the Workspace container. (assuming you have the Workspace container running):
-
-```bash
-docker exec -it {Workspace-Container-Name} bash
-```
-Replace `{Workspace-Container-Name}` with your Workspace container name. To get the name type `docker-compose ps` and copy it.
-
-4 - Install Laravel anyway you like. 
-
-Example using the Laravel Installer:
-
-```bash
-laravel new my-cool-app
-```
-For more about this check out this [link](https://laravel.com/docs/master#installing-laravel).
-
-5 - Edit `docker-compose.yml` to Map the new application path:
-
-By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder. 
-
-Since the new Laravel application is in the `my-cool-app` folder, we should replace `../:/var/www/laravel` with `../my-cool-app/:/var/www/laravel`, as follow:
-
-```yaml
-    application:
-        build: ./application
-        volumes:
-            - ../my-cool-app/:/var/www/laravel
-```
-6 - finally go to the Usage section below again and do steps 2 and 4.
-
-
 
 
 <a name="Usage"></a>
 ## Usage
 
-1 - For **Windows & MAC** users only: make sure you have a running Docker Virtual Host on your machine. 
+
-(**Linux** users don't need a Virtual Host, so skip this step).
+1 - For **Windows & MAC** users only: If you are not using the native Docker-Engine `Beta`, make sure you have a running Docker Virtual Host on your machine.
-<br>
 [How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
+(**Linux** users don't need a Virtual Host, so skip this step).
 
 
 <br>
-2 - Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
+2 - Run some Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
+
+
+
+**Example:** Running NGINX and MySQL:
+
+```bash
+docker-compose up -d  nginx mysql
+```
+
+You can select your own combination of container form this list:
+
+`nginx`, `hhvm` ,`mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `php-fpm`.
+
+
+**Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
+
+
+
+
+
+<br>
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
+
+```bash
+docker exec -it {Workspace-Container-Name} bash
+```
+Replace `{Workspace-Container-Name}` with your Workspace container name.
+<br>
+To find the containers names type `docker-compose ps`.
+
+
+
+<br>
+4 - Edit the Laravel configurations.
+
+If you don't have a Laravel project installed yet, see [How to Install Laravel in a Docker Container](#Install-Laravel).
+
+Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
 
 ```env
 DB_HOST=xxx.xxx.xxx.xxx
 ```
 [How to find my Docker IP Address?](#Find-Docker-IP-Address)
 
-<br>
-3 - Run the Containers, (you can select the software's (containers) that you wish to run)
-<br>
-*Make sure you are in the `laradock` folder before running the `docker-compose` command.*
 
-**Example:** Running NGINX, MySQL, Redis and the Workspace:
-
-```bash
-docker-compose up -d  nginx mysql redis workspace
-```
-*Note: the PHP-FPM, Application and Data Containers will automatically run.*
-
-
-Supported Containers: `workspace`, `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `memcached`, `beanstalkd`, `beanstalkd-console`, `data`, `php-fpm`, `application`.
-
-<br>
-4 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
 
 
 <br>
-**Debugging**: in case you faced an error here, run this command from the Laravel root directory:
+5 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
+
 
-```bash
-sudo chmod -R 777 storage && sudo chmod -R 777 bootstrap/cache
-```
 
 <br>
+**Debugging**: if you are facing any problem here check the [Debugging](#debugging) section.
 
-
+If you need a special support. Contact me, more details in the [Help & Questions](#Help) section.
-[Follow @Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt)
-
-
 
 
 <br>
 <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>
-### Docker
+### [Docker]
 
 
 
 <a name="List-current-running-Containers"></a>
-#### List current running Containers
+### List current running Containers
 ```bash
 docker ps
 ```
@@ -292,7 +287,7 @@ docker-compose ps
 
 <br>
 <a name="Close-all-running-Containers"></a>
-#### Close all running Containers
+### Close all running Containers
 ```bash
 docker-compose stop
 ```
@@ -310,12 +305,12 @@ docker-compose stop {container-name}
 
 <br>
 <a name="Delete-all-existing-Containers"></a>
-#### Delete all existing Containers
+### Delete all existing Containers
 ```bash
 docker-compose down
 ```
 
-*Note: Careful with this command as it will delete your Data Volume Container as well. (if you want to keep your Database data than you should stop each container by itself as follow):* 
+*Note: Careful with this command as it will delete your Data Volume Container as well. (if you want to keep your Database data than you should stop each container by itself as follow):*
 
 
 
@@ -325,7 +320,7 @@ docker-compose down
 
 <br>
 <a name="Enter-Container"></a>
-#### Enter a Container (SSH into a running Container)
+### Enter a Container (SSH into a running Container)
 
 1 - first list the current running containers with `docker ps`
 
@@ -344,10 +339,10 @@ docker exec -it {container-name} bash
 
 <br>
 <a name="Edit-Container"></a>
-#### Edit default container configuration
+### Edit default container configuration
 Open the `docker-compose.yml` and change anything you want.
 
-Examples: 
+Examples:
 
 Change MySQL Database Name:
 
@@ -372,9 +367,9 @@ Change Redis defaut port to 1111:
 
 <br>
 <a name="Edit-a-Docker-Image"></a>
-#### Edit a Docker Image
+### Edit a Docker Image
 
-1 - Find the `dockerfile` of the image you want to edit, 
+1 - Find the `dockerfile` of the image you want to edit,
 <br>
 example for `mysql` it will be `mysql/Dockerfile`.
 
@@ -399,7 +394,7 @@ docker-compose build mysql
 
 <br>
 <a name="Build-Re-build-Containers"></a>
-#### Build/Re-build Containers
+### Build/Re-build Containers
 
 If you do any change to any `dockerfile` make sure you run this command, for the changes to take effect:
 
@@ -419,7 +414,7 @@ docker-compose build {container-name}
 
 <br>
 <a name="Add-Docker-Images"></a>
-#### Add more Software's (Docker Images)
+### Add more Software's (Docker Images)
 
 To add an image (software), just edit the `docker-compose.yml` and add your container details, to do so you need to be familiar with the [docker compose file syntax](https://docs.docker.com/compose/compose-file/).
 
@@ -433,7 +428,7 @@ To add an image (software), just edit the `docker-compose.yml` and add your cont
 
 <br>
 <a name="View-the-Log-files"></a>
-#### View the Log files 
+### View the Log files
 The Nginx Log file is stored in the `logs/nginx` directory.
 
 However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
@@ -448,13 +443,52 @@ docker logs {container-name}
 
 <br>
 <a name="Laravel"></a>
-### Laravel
+### [Laravel]
 
 
 
 
+<a name="Install-Laravel"></a>
+### Install Laravel from a Docker Container
+
+1 - First you need to enter the Workspace Container.
+
+2 - Install Laravel.
+
+Example using Composer
+
+```bash
+composer create-project laravel/laravel my-cool-app "5.2.*"
+```
+
+> We recommand using `composer create-project` instead of the Laravel installer, to install Laravel.
+
+For more about the Laravel installation click [here](https://laravel.com/docs/master#installing-laravel).
+
+
+3 - Edit `docker-compose.yml` to Map the new application path:
+
+By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
+
+Since the new Laravel application is in the `my-cool-app` folder, we need to replace `../:/var/www/laravel` with `../my-cool-app/:/var/www/laravel`, as follow:
+
+```yaml
+    application:
+        build: ./application
+        volumes:
+            - ../my-cool-app/:/var/www/laravel
+```
+4 - Go to that folder and start working..
+
+```bash
+cd my-cool-app
+```
+
+
+
+<br>
 <a name="Run-Artisan-Commands"></a>
-#### Run Artisan Commands
+### Run Artisan Commands
 
 You can run artisan commands and many other Terminal commands from the Workspace container.
 
@@ -487,22 +521,16 @@ Composer update
 ```bash
 phpunit
 ```
-```bash
-laravel new blog
-```
-
-
-
-
-
-
-
 
 <br>
 <a name="Use-Redis"></a>
-#### Use Redis
+### Use Redis
 
-1 - First make sure you run the Redis Container with the `docker-compose` command.
+1 - First make sure you run the Redis Container (`redis`) with the `docker-compose up` command.
+
+```bash
+docker-compose up -d redis
+```
 
 2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to your `Docker-IP` instead of the default `127.0.0.1` IP.
 
@@ -530,7 +558,7 @@ CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 ```
 
-4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer first.
+4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer:
 
 ```bash
 composer require predis/predis:^1.0
@@ -546,6 +574,92 @@ composer require predis/predis:^1.0
 
 
 
+<br>
+<a name="Use-Mongo"></a>
+### Use Mongo
+
+1 - First install `mongo` in the Workspace and the PHP-FPM Containers: 
+<br>
+a) open the `docker-compose.yml` file
+<br>
+b) search for the `INSTALL_MONGO` argument under the Workspace Container 
+<br>
+c) set it to `true`
+<br>
+d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container 
+<br>
+e) set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_MONGO=true
+    ...
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_MONGO=true
+    ...
+```
+
+2 - Re-build the containers `docker-compose build workspace php-fpm`
+
+
+
+3 - Run the MongoDB Container (`mongo`) with the `docker-compose up` command.
+
+```bash
+docker-compose up -d mongo
+```
+
+
+4 - Add the MongoDB configurations to the `config/database.php` config file:
+
+```php
+'connections' => [
+
+    'mongodb' => [
+        'driver'   => 'mongodb',
+        'host'     => env('DB_HOST', 'localhost'),
+        'port'     => env('DB_PORT', 27017),
+        'database' => env('DB_DATABASE', 'database'),
+        'username' => '',
+        'password' => '',
+        'options'  => [
+            'database' => '',
+        ]
+    ],
+
+	// ...
+
+],
+```
+
+5 - Open your Laravel's `.env` file and update the following variables:
+
+- set the `DB_HOST` to your `Docker-IP`.
+- set the `DB_PORT` to `27017`.
+- set the `DB_DATABASE` to `database`.
+
+
+6 - Finally make sure you have the `jenssegers/mongodb` package installed via Composer and its Service Provider is added.
+
+```bash
+composer require jenssegers/mongodb
+```
+More details about this [here](https://github.com/jenssegers/laravel-mongodb#installation).
+
+7 - Test it:
+
+- First let your Models extend from the Mongo Eloquent Model. Check the [documentation](https://github.com/jenssegers/laravel-mongodb#eloquent).
+- Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
+- Migrate the Database `php artisan migrate`.
+
 
 
 
@@ -553,7 +667,7 @@ composer require predis/predis:^1.0
 
 <br>
 <a name="PHP"></a>
-### PHP
+### [PHP]
 
 
 
@@ -561,7 +675,7 @@ composer require predis/predis:^1.0
 
 
 <a name="Install-PHP-Extensions"></a>
-#### Install PHP Extensions
+### Install PHP Extensions
 
 Before installing PHP extensions, you have to decide whether you need for the `FPM` or `CLI` because each lives on a different container, if you need it for both you have to edit both containers.
 
@@ -579,20 +693,18 @@ The PHP-CLI extensions should be installed in `workspace/Dockerfile`.
 
 <br>
 <a name="Change-the-PHP-FPM-Version"></a>
-#### Change the PHP-FPM Version
+### Change the (PHP-FPM) Version
 By default **PHP-FPM 7.0** is running.
 
 >The PHP-FPM is responsible of serving your application code, you don't have to change the PHP-CLI version if you are planing to run your application on different PHP-FPM version.
 
+#### A) Switch from PHP `7.0` to PHP `5.6`
+
 1 - Open the `docker-compose.yml`.
 
 2 - Search for `Dockerfile-70` in the PHP container section.
 
-3 - Change the version number. 
+3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-56`, like this:
-<br>
-Example to select version 5.6 instead of 7.0 you have to replace `Dockerfile-70` with `Dockerfile-56`.
-
-Sample: 
 
 ```txt
 php-fpm:
@@ -601,20 +713,33 @@ php-fpm:
         dockerfile: Dockerfile-70
 ```
 
-Supported Versions:
-
-- For (PHP 7.0.*) use `Dockerfile-70`
-- For (PHP 5.6.*) use `Dockerfile-56`
-- For (PHP 5.5.*) use `Dockerfile-55`
-
-
 4 - Finally rebuild the container
 
 ```bash
 docker-compose build php
 ```
 
-For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+> For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+
+
+#### B) Switch from PHP `7.0` or `5.6` to PHP `5.5`
+
+We do not natively support PHP 5.5 anymore, but you can get it in few steps:
+
+1 - Clone `https://github.com/LaraDock/php-fpm`.
+
+3 - Rename `Dockerfile-56` to `Dockerfile-55`.
+
+3 - Edit the file `FROM php:5.6-fpm` to `FROM php:5.5-fpm`.
+
+4 - Build an image from `Dockerfile-55`.
+
+5 - Open the `docker-compose.yml` file.
+
+6 - Point `php-fpm` to your `Dockerfile-55` file.
+
+
+
 
 
 
@@ -626,7 +751,7 @@ For more details about the PHP base image, visit the [official PHP docker images
 
 <br>
 <a name="Change-the-PHP-CLI-Version"></a>
-#### Change the PHP-CLI Version
+### Change the PHP-CLI Version
 By default **PHP-CLI 7.0** is running.
 
 >Note: it's not very essential to edit the PHP-CLI verion. The PHP-CLI is only used for the Artisan Commands & Composer. It doesn't serve your Application code, this is the PHP-FPM job.
@@ -638,23 +763,53 @@ Right now you have to manually edit the `Dockerfile` or create a new one like it
 
 
 
+<br>
+<a name="Install-xDebug"></a>
+### Install xDebug
 
+1 - First install `xDebug` in the Workspace and the PHP-FPM Containers: 
+<br>
+a) open the `docker-compose.yml` file
+<br>
+b) search for the `INSTALL_XDEBUG` argument under the Workspace Container 
+<br>
+c) set it to `true`
+<br>
+d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container 
+<br>
+e) set it to `true`
 
+It should be like this:
 
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_XDEBUG=true
+    ...
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_XDEBUG=true
+    ...
+```
 
+2 - Re-build the containers `docker-compose build workspace php-fpm`
 
 
 
 <br>
 <a name="Misc"></a>
-### Misc
+### [Misc]
 
 
 
 
 
 <a name="Run-Docker-Virtual-Host"></a>
-#### Run a Docker Virtual Host
+### Run a Docker Virtual Host
 
 These steps are only for **Windows & MAC** users *(Linux users don't need a virtual host)*:
 
@@ -684,30 +839,39 @@ eval $(docker-machine env)
 
 <br>
 <a name="Find-Docker-IP-Address"></a>
-#### Find your Docker IP Address 
+### Find your Docker IP Address
 
-**On Windows & MAC:** 
+**On Windows & MAC:**
+
+Run this command in your terminal:
 
 ```bash
 docker-machine ip default
 ```
+If your Host name is different then `default`, you have to specify it (`docker-machine ip my-host`).
+
 *(The default IP is 192.168.99.100)*
 
-**On Linux:** 
+<br>
-
-Your IP Address is `127.0.0.1`
 
 > **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
 
+<br>
+**On Linux:**
 
+Run this command in your terminal:
 
+```shell
+ifconfig docker0 | grep 'inet' | cut -d: -f2 | awk '{ print $1}' | head -n1
+```
 
+*(The default IP is 172.17.0.1)*
 
 
 
 <br>
 <a name="Use-custom-Domain"></a>
-#### Use custom Domain (instead of the Docker IP)
+### Use custom Domain (instead of the Docker IP)
 
 Assuming your custom domain is `laravel.dev` and your current `Docker-IP` is `xxx.xxx.xxx.xxx`.
 
@@ -737,37 +901,138 @@ server_name laravel.dev;
 
 
 
+<br>
+<a name="Enable-Global-Composer-Build-Install"></a>
+### Enable Global Composer Build Install
 
+Enabling Global Composer Install during the build for the container allows you to get your composer requirements installed and available in the container after the build is done.
 
+1 - open the `docker-compose.yml` file
 
+2 - search for the `COMPOSER_GLOBAL_INSTALL` argument under the Workspace Container and set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - COMPOSER_GLOBAL_INSTALL=true
+    ...
+```
+3 - now add your dependencies to `workspace/composer.json`
+
+4 - rebuild the Workspace Container `docker-compose build workspace`
 
 
 
 
+<br>
+<a name="Install-Prestissimo"></a>
+### Install Prestissimo
+
+[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. 
+
+1 - Enable Running Global Composer Install during the Build:
+
+Click on this [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install) and do steps 1 and 2 only then continue here.
+
+2 - Add prestissimo as requirement in Composer:
+
+a - now open the `workspace/composer.json` file
+
+b - add `"hirak/prestissimo": "^0.3"` as requirement
+
+c - rebuild the Workspace Container `docker-compose build workspace`
+
+
+
+
+<br>
+<a name="Install-Node"></a>
+### Install Node + NVM
+
+To install NVM and NodeJS in the Workspace container
+
+1 - Open the `docker-compose.yml` file
+
+2 - Search for the `INSTALL_NODE` argument under the Workspace Container and set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_NODE=true
+    ...
+```
+
+3 - Re-build the container `docker-compose build workspace`
+
+<br>
+<a name="debugging"></a>
+### Debugging
+
+*Here's a list of the common problems you might face, and the possible solutions.*
+
+#### I see a blank (white) page instead of the Laravel 'Welcome' page!
+
+Run the following command from the Laravel root directory:
+
+```bash
+sudo chmod -R 777 storage bootstrap/cache
+```
+
+#### I see "Welcome to nginx" instead of the Laravel App!
+
+Use `http://127.0.0.1` (or [your Docker IP](#Find-Docker-IP-Address)) instead of `http://localhost` in your browser.
+
+#### I see an error message containing `address already in use`
+
+Make sure the ports for the services that you are trying to run (80, 3306, etc.) are not being used already by other programs, such as a built in `apache`/`httpd` service or other development tools you have installed.
+
+
 <br>
 ## Contributing
 
-This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade for the current containers, or anything else.. Do not hesitate to contribute, you are more than welcome :)
+This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else.. Do not hesitate to contribute, you are more than welcome :)
-
-All Docker Images can be found at [https://github.com/LaraDock](https://github.com/LaraDock)
-
-## Support
-
-[Issues](https://github.com/laradock/laradock/issues) on Github.
 
 
+<a name="Help"></a>
+## Help & Questions
 
-### Questions?
+Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community. 
-If you have any question, send me a direct message on LaraChat, my username is `mahmoud_zalt`.
 
+You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/LaraDock/laradock).
+
+For special help with Docker and/or Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz).
 
 ## Credits
 
-[![Mahmoud Zalt](https://img.shields.io/badge/Author-Mahmoud%20Zalt-orange.svg)](http://www.zalt.me)
+**Creator:**
 
+- [Mahmoud Zalt](https://github.com/Mahmoudz)  (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
+
+**Main Contributors:**
+
+- [Eric Pfeiffer (computerfr33k)](https://github.com/computerfr33k)
+- [Orette](https://github.com/orette)
+- [Jack Fletcher (Kauhat)](https://github.com/Kauhat)
+- [Bo-Yi Wu (appleboy)](https://github.com/appleboy)
+- [Amin Mkh (AminMkh)](https://github.com/AminMkh)
+- [Matthew Tonkin Dunn (mattythebatty)](https://github.com/mattythebatty)
+- [Zhivitsa Kirill (zhikiri)](https://github.com/zhikiri)
+- [Benmag](https://github.com/benmag)
+
+**Awesome People:**
+
+- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+- [Supporters](https://github.com/LaraDock/laradock/issues?utf8=%E2%9C%93&q=)
 
 
 ## License
 
-[MIT License (MIT)](https://github.com/laradock/laradock/blob/master/LICENSE)
+[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)
-[]([]())

beanstalkd-console/Dockerfile

@@ -7,9 +7,11 @@ RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
 RUN mv /tmp/beanstalk_console-master /source
 
-RUN apt-get remove --purge -y curl && apt-get autoclean && apt-get clean
+RUN apt-get remove --purge -y curl &&
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    apt-get autoclean &&
+    apt-get clean &&
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 EXPOSE 2080
 
-CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'

caddy/Caddyfile

@@ -0,0 +1,17 @@
+# Docs: https://caddyserver.com/docs/caddyfile
+0.0.0.0:80
+root /var/www/laravel/public
+fastcgi / php-fpm:9000 php {
+    index index.php
+}
+rewrite {
+    r .*
+    ext /
+    to /index.php?{query}
+}
+browse
+log stdout
+errors stderr
+# Uncomment to enable TLS (HTTPS)
+# Change the first list to listen on port 443 when enabling TLS
+#tls self_signed

caddy/Dockerfile

@@ -0,0 +1,25 @@
+FROM alpine:3.4
+
+MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
+
+LABEL caddy_version="0.9.0" architecture="amd64"
+
+RUN apk update \
+    && apk upgrade \
+    && apk add tar curl
+
+RUN curl --silent --show-error --fail --location \
+      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
+      "https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \
+    | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
+ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
+ && chmod 0755 /usr/bin/caddy \
+ && /usr/bin/caddy -version
+
+EXPOSE 80 443 2015
+
+WORKDIR /var/www/laravel/public
+
+ENTRYPOINT ["caddy"]
+
+CMD ["-conf", "/etc/Caddyfile"]

docker-compose.yml

@@ -2,41 +2,45 @@ version: '2'
 
 services:
 
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_MONGO=false
+                - INSTALL_XDEBUG=false
+                - INSTALL_NODE=false
+                - COMPOSER_GLOBAL_INSTALL=false
+        volumes_from:
+            - volumes_source
+        tty: true
+
 ### PHP-FPM Container #######################################
 
     php-fpm:
         build:
             context: ./php-fpm
+            args:
+                - INSTALL_MONGO=false
+                - INSTALL_XDEBUG=false
             dockerfile: Dockerfile-70
         volumes_from:
-            - application
+            - volumes_source
         expose:
             - "9000"
-
+        links:
-### Laravel Application Code Container ######################
+            - workspace
-
-    application:
-        build: ./application
-        volumes:
-            - ../:/var/www/laravel
-
-### Databases Data Container ################################
-
-    data:
-        build: ./data
-        volumes:
-            - /var/lib/mysql
-            - /var/lib/postgres
-            - /var/lib/mariadb
-            - /var/lib/redis
-            - /var/lib/memcached
 
 ### Nginx Server Container ##################################
 
     nginx:
-        build: ./nginx
+        build:
+            context: ./nginx
+            args:
+                - PHP_UPSTREAM=php-fpm
         volumes_from:
-            - application
+            - volumes_source
         volumes:
             - ./logs/nginx/:/var/log/nginx
         ports:
@@ -45,12 +49,23 @@ services:
         links:
             - php-fpm
 
+### HHVM Container ##########################################
+
+    hhvm:
+        build: ./hhvm
+        volumes_from:
+            - volumes_source
+        expose:
+            - "9000"
+        links:
+            - workspace
+
 ### MySQL Container #########################################
 
     mysql:
         build: ./mysql
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -58,30 +73,26 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
-            - php-fpm
 
 ### PostgreSQL Container ####################################
 
     postgres:
         build: ./postgres
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "5432:5432"
         environment:
             POSTGRES_DB: homestead
             POSTGRES_USER: homestead
             POSTGRES_PASSWORD: secret
-        links:
-            - php-fpm
 
 ### MariaDB Container #######################################
 
-    mariadb:  
+    mariadb:
         build: ./mariadb
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -89,26 +100,43 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
+
-            - php-fpm
+### Neo4j Container #########################################
+
+    neo4j:
+        build: ./neo4j
+        ports:
+            - "7474:7474"
+            - "1337:1337"
+        environment:
+            - NEO4J_AUTH=homestead:secret
+        volumes_from:
+            - volumes_data
+
+### MongoDB Container #######################################
+
+    mongo:
+        build: ./mongo
+        ports:
+            - "27017:27017"
+        volumes_from:
+            - volumes_data
 
 ### Redis Container #########################################
 
     redis:
         build: ./redis
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "6379:6379"
-        links:
-            - php-fpm
 
 ### Memcached Container #####################################
 
     memcached:
         build: ./memcached
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "11211:11211"
         links:
@@ -133,12 +161,39 @@ services:
         links:
             - beanstalkd
 
-### Workspace Utilities Container ###########################
+### Caddy Server Container ##################################
 
-    workspace:
+    caddy:
-        build: ./workspace
+        build: ./caddy
         volumes_from:
-            - application
+            - volumes_source
-        tty: true
+        ports:
+            - "80:80"
+            - "443:443"
+            - "2015:2015"
+        volumes:
+            - ./caddy/Caddyfile:/etc/Caddyfile
+        links:
+            - php-fpm
+
+### Laravel Application Code Container ######################
+
+    volumes_source:
+        build: ./volumes/application
+        volumes:
+            - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+    volumes_data:
+        build: ./volumes/data
+        volumes:
+            - /var/lib/mysql:/var/lib/mysql
+            - /var/lib/postgres:/var/lib/postgres
+            - /var/lib/mariadb:/var/lib/mariadb
+            - /var/lib/memcached:/var/lib/memcached
+            - /var/lib/redis:/data
+            - /var/lib/neo4j:/var/lib/neo4j/data
+            - /var/lib/mongo:/data/db
 
 ### Add more Containers below ###############################

hhvm/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:14.04  
+
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
+
+RUN apt-get update -y \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
+    && apt-get update -y \
+    && apt-get install -y hhvm \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /var/www/laravel
+
+ADD server.ini /etc/hhvm/server.ini
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
+
+EXPOSE 9000

hhvm/server.ini

@@ -0,0 +1,20 @@
+; php options
+
+pid = /var/run/hhvm/pid
+
+; hhvm specific
+hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.php
+hhvm.server.error_document404 = index.php
+hhvm.server.upload.upload_max_file_size = 25M
+hhvm.log.level = Error
+hhvm.log.header = true
+hhvm.log.access[default][file] = /var/log/hhvm/access.log
+hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
+hhvm.server.source_root=/var/www/laravel/public
+hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
+
+; Uncomment to log to files instead of STDOUT
+;hhvm.log.use_log_file = true
+;hhvm.log.file = /var/log/hhvm/error.log

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 /data/db /data/configdb
+
+CMD ["mongod"]
+
+EXPOSE 27017
+

neo4j/Dockerfile

@@ -0,0 +1,7 @@
+FROM tpires/neo4j
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+VOLUME /var/lib/neo4j/data
+
+EXPOSE 7474 1337

nginx/Dockerfile

@@ -1,13 +1,18 @@
-FROM nginx:latest
+FROM nginx:alpine
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD nginx.conf /etc/nginx/
-ADD laravel.conf /etc/nginx/sites-available/
+ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
-RUN echo "upstream php-upstream { server php-fpm:9000; }" > /etc/nginx/conf.d/upstream.conf
+ARG PHP_UPSTREAM=php-fpm
 
-RUN usermod -u 1000 www-data
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache bash \
+    && adduser -D -H -u 1000 -s /bin/bash www-data \
+    && rm /etc/nginx/conf.d/default.conf \
+    && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 CMD ["nginx"]
 

nginx/nginx.conf

@@ -1,6 +1,7 @@
 user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
+daemon off;
 
 events {
   worker_connections  2048;
@@ -15,15 +16,13 @@ http {
   tcp_nodelay on;
   keepalive_timeout 15;
   types_hash_max_size 2048;
+  client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log off;
+  access_log /var/log/nginx/access.log;
-  error_log off;
+  error_log /var/log/nginx/error.log;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-available/*;
   open_file_cache max=100;
 }
-
-daemon off;

php-fpm/Dockerfile-55

@@ -1,28 +0,0 @@
-FROM php:5.5-fpm
-
-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 && apt-get install -y \
-    libpq-dev \
-    libmemcached-dev \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-#Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php-fpm/Dockerfile-56

@@ -1,23 +1,69 @@
-FROM php:5.6-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/php-fpm:5.6--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=true
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Install the xdebug extention
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug \
+;fi
+
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
 ADD ./laravel.ini /usr/local/etc/php/conf.d
 ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 
-RUN apt-get update && apt-get install -y \
+RUN rm -r /var/lib/apt/lists/*
-    libpq-dev \
-    libmemcached-dev \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-#Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
 
 RUN usermod -u 1000 www-data
 

php-fpm/Dockerfile-70

@@ -1,27 +1,69 @@
-FROM php:7.0-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/php-fpm:7.0--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=true
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Install the xdebug extention
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug \
+;fi
+
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
 ADD ./laravel.ini /usr/local/etc/php/conf.d
 ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 
-RUN apt-get update && apt-get install -y \
+RUN rm -r /var/lib/apt/lists/*
-    libpq-dev \
-    libmemcached-dev \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-# Install Memcached for php 7
-RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
-    && mkdir -p /usr/src/php/ext/memcached \
-    && tar -C /usr/src/php/ext/memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
-    && docker-php-ext-configure memcached \
-    && docker-php-ext-install memcached \
-    && rm /tmp/memcached.tar.gz
 
 RUN usermod -u 1000 www-data
 

php-fpm/laravel.ini

@@ -1,3 +1,14 @@
-date.timezone = UTC
+date.timezone=UTC
-display_errors = Off
+display_errors=Off
-log_errors = On
+log_errors=On
+extension=mongodb.so
+
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 128M
+; Maximum allowed size for uploaded files.
+; http://php.net/upload-max-filesize
+upload_max_filesize = 20M
+; Sets max size of post data allowed.
+; http://php.net/post-max-size
+post_max_size = 20M

redis/Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 #COPY redis.conf /usr/local/etc/redis/redis.conf
 
-CMD [ "redis-server" ]
+VOLUME /data
 
 EXPOSE 6379
+
+CMD ["redis-server"]

workspace/Dockerfile

@@ -1,64 +1,113 @@
-FROM phusion/baseimage:latest
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/workspace:1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-RUN DEBIAN_FRONTEND=noninteractive
+#
-RUN locale-gen en_US.UTF-8
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("php7.0-cli", "git", "vim", ....) are
+# installed on the base image 'laradock/workspace' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/workspace).
+#
 
-ENV LANGUAGE=en_US.UTF-8
+#
-ENV LC_ALL=en_US.UTF-8
+#--------------------------------------------------------------------------
-ENV LC_CTYPE=UTF-8
+# Optional Software's Installation
-ENV LANG=en_US.UTF-8
+#--------------------------------------------------------------------------
-ENV TERM xterm
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#   - COMPOSER_GLOBAL_INSTALL=  false
+#   - INSTALL_NODE=             false
+#
 
-# Install "software-properties-common" (for add-apt-repository) and add the "PHP 7" ppa
+#####################################
-RUN apt-get update \
+# xDebug:
-    && apt-get install -y software-properties-common \
+#####################################
-    && add-apt-repository -y ppa:ondrej/php
 
-# Install PHP-CLI 7 and some useful Tools
+# Check if xDebug needs to be installed
-RUN apt-get update \
+ARG INSTALL_XDEBUG=true
-    && apt-get install -y \
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
-        php7.0-cli \
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
-        php7.0-common \
+    # Load the xdebug extension only with phpunit commands
-        php7.0-curl \
+    apt-get install -y --force-yes php7.0-xdebug && \
-        php7.0-json \
+    sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini && \
-        php7.0-xml \
+    echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
-        php7.0-mbstring \
+;fi
-        php7.0-mcrypt \
-        php7.0-mysql \
-        php7.0-zip \
-        git \
-        curl \
-        vim \
-        nano \
-        nodejs \
-        nodejs-dev \
-        npm
 
-# Install Composer
+#####################################
-RUN curl -s http://getcomposer.org/installer | php \
+# MongoDB:
-    && mv composer.phar /usr/local/bin/ \
+#####################################
-    && echo "alias composer='/usr/local/bin/composer.phar'" >> ~/.bashrc
 
-# Install the Laravel Installer
+# Check if Mongo needs to be installed
-RUN composer.phar global require "laravel/installer" \
+ARG INSTALL_MONGO=true
-    && echo "export PATH='~/.composer/vendor/bin:$PATH'" >> ~/.bashrc
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini \
+;fi
 
-# Install gulp and bower
+#####################################
-RUN npm install -g gulp bower
+# Composer:
+#####################################
 
-# Add a symbolic link
+# Add the composer.json
-RUN ln -s /usr/bin/nodejs /usr/bin/node
+ADD ./composer.json /root/.composer/composer.json
 
-# Add an alias for PHPUnit
+# Check if global install need to be runned
-RUN echo "alias phpunit='./vendor/bin/phpunit'" >> ~/.bashrc
+ARG COMPOSER_GLOBAL_INSTALL=true
+ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
+RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
+    # run the install
+    composer global install \
+;fi
 
-# Source the bash
+#####################################
-RUN . ~/.bashrc
+# Node / NVM:
+#####################################
+
+# Check if NVM needs to be installed
+ARG INSTALL_NODE=true
+ENV INSTALL_NODE ${INSTALL_NODE}
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    # Install nvm (A Node Version Manager)
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash \
+;fi
+# Again check if NVM needs to be installed
+# I had to split this condifiton link this because when I get it inside the above if statment is refuses to work!
+ENV if [ ${INSTALL_NODE} = true ]; then \
+    # Set the ENV
+    NVM_DIR=/root/.nvm \
+    # Install NodeJS with NVM
+    RUN . ~/.nvm/nvm.sh && \
+        nvm install stable && \
+        nvm use stable && \
+        nvm alias stable && \
+        npm install -g gulp bower \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
 
 # Clean up
-RUN apt-get autoclean && apt-get clean \
+RUN apt-get clean && \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Set default work directory
 WORKDIR /var/www/laravel

workspace/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+
+    }
+}