link global gulp to be used locally

Appleboy patch 1 (fixing volumes mounting)

README.md

@@ -16,32 +16,40 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 
 - [Intro](#Intro)
 	- [Features](#features)
+	- [Supported Containers](#Supported-Containers)
 	- [What is Docker](#what-is-docker)
 	- [What is Laravel](#what-is-laravel)
 	- [Why Docker not Vagrant](#why-docker-not-vagrant)
 	- [LaraDock VS Homestead](#laradock-vs-homestead)
-- [Supported Containers](#Supported-Containers)
+- [Demo Video](#Demo)
 - [Requirements](#Requirements)
 - [Installation](#Installation)
 - [Usage](#Usage)
 - [Documentation](#Documentation)
-	- [List current running Containers](#List-current-running-Containers)
+	- [Docker](#Docker)
-	- [Close all running Containers](#Close-all-running-Containers)
+		- [List current running Containers](#List-current-running-Containers)
-	- [Delete all existing Containers](#Delete-all-existing-Containers)
+		- [Close all running Containers](#Close-all-running-Containers)
-	- [Build/Re-build Containers](#Build-Re-build-Containers)
+		- [Delete all existing Containers](#Delete-all-existing-Containers)
-	- [Use Redis](#Use-Redis)
+		- [Enter a Container (SSH into a running Container)](#Enter-Container)
-	- [Change the PHP Version](#Change-the-PHP-Version)
+		- [Edit default container configuration](#Edit-Container)
-	- [Add/Remove a Docker Container](#AddRemove-a-Docker-Container)
+		- [Edit a Docker Image](#Edit-a-Docker-Image)
-	- [Add more Software's (Docker Images)](#Add-Docker-Images)
+		- [Build/Re-build Containers](#Build-Re-build-Containers)
-	- [Edit default container configuration](#Edit-Container)
+		- [Add more Software's (Docker Images)](#Add-Docker-Images)
-	- [Use custom Domain](Use-custom-Domain)
+		- [View the Log files](#View-the-Log-files)
-	- [View the Log files](#View-the-Log-files)
+	- [Laravel](#Laravel):
-	- [Enter a Container (SSH into a running Container)](#Enter-Container)
+		- [Install Laravel from a Docker Container](#Install-Laravel)
-	- [Edit a Docker Image](#Edit-a-Docker-Image)
+		- [Run Artisan Commands](#Run-Artisan-Commands)
-	- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
+		- [Use Redis](#Use-Redis)
-	- [Find your Docker IP Address](#Find-Docker-IP-Address)
+	- [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)
+	- [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)
+		- [Debugging](#debugging)
+- [Help & Questions](#Help)
 
 
 
@@ -52,22 +60,51 @@ 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`, `MySQL` and `Redis`.
+
+```shell
+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 - Redis ...
-- Run your own combination of software's: PHP - NGINX - MySQL - ...
+- Run your own combination of software's: Memcached - MariaDB ...
-- Every software runs on a separate container: PHP - NGINX - ...
+- Every software runs on a separate container: PHP-FPM - NGINX ...
 - 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. And very easy to update.
+- Pre-configured Nginx for Laravel.
-- Using of a Data container, to keep the Data safe and accessible at anytime.
+- 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.
-- Best practices everywhere.
+
+
+<a name="Supported-Containers"></a>
+### Supported Containers
+
+- PHP-FPM (7.0 - 5.6 - 5.5)
+- NGINX
+- MySQL
+- PostgreSQL
+- MariaDB
+- Neo4j
+- Redis
+- Memcached
+- Beanstalkd
+- Beanstalkd Console
+- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano and cURL)
+- Data *(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 :)
+
+
+
 
 
 <a name="what-is-docker"></a>
@@ -105,22 +142,6 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y
 Running a virtual Container is much faster than running a full virtual Machine. 
 <br>Thus **LaraDock is much faster than Homestead**.
 
-<a name="Supported-Containers"></a>
-## Supported Containers
-
-- PHP (7.0 - 5.6 - 5.5)
-- NGINX
-- MySQL
-- PostgreSQL
-- MariaDB
-- Redis
-- Memcached
-- Beanstalkd
-- Beanstalkd Console
-- Data Volume
-
-Cannot find your container! we would love to have it as well. Consider contributing your container and adding it to this list.
-
 
 
 <a name="Requirements"></a>
@@ -130,100 +151,134 @@ Cannot find your container! we would love to have it as well. Consider contribut
 |-----------------------------------------------------------------------------------------|---------------------------------------------------------|
 |                 [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)          |
-| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux/#install) |     [Docker Toolbox](https://www.docker.com/toolbox)    |
+| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) |     [Docker Toolbox](https://www.docker.com/toolbox)    |
 |                [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
 
-1 - Clone the `LaraDock` repository, in any of your `Laravel` projects:
+
+1 - Clone the `LaraDock` repository.
+
+**A)** If you already have a Laravel project, clone this repository on your `Laravel` root direcotry:
 
 ```bash
-git clone https://github.com/LaraDock/laradock.git docker
+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`.
 
-You can use `git submodule add` instead of `git clone` if you are already using Git for your Laravel project *(Recommended)*:
+**B)** If you don't have a Laravel project, and you want to install Laravel from Docker, clone this repo anywhere on your machine:
 
 ```bash
-git submodule add https://github.com/LaraDock/laradock.git docker
+git clone https://github.com/LaraDock/laradock.git
 ```
 
->These commands should create a `docker` folder, on the root directory of your Laravel project.
-
-
 
 
 <a name="Usage"></a>
 ## Usage
 
-0 - For **Windows & MAC** users only: make sure you have a running Docker Virtual Host on your machine. 
+
+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. 
 (**Linux** users don't need a Virtual Host, so skip this step).
-<br>
+
 [How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
 
 
 <br>
-1 - Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
+2 - Run the Containers, (you can select the containers that you wish to run)
+<br>
+*Make sure you are in the `laradock` folder before running the `docker-compose` command.*
+
+**Example:** Running NGINX and MySQL:
+
+```bash
+docker-compose up -d  nginx mysql
+```
+
+*Note: the PHP-FPM, Workspace, Application and Data Containers will automatically run.*
+
+
+Supported Containers: `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
+
+
+
+<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>
-2 - Run the Containers, (you can select the software's (containers) that you wish to run)
-<br>
-*Make sure you are in the `docker` folder before running the `docker-compose` command.*
 
-> Running PHP, NGINX and MySQL:
-
-```bash
-docker-compose up -d   php nginx mysql redis
-```
-
-Note: you can choose your own combination of software's (containers), another example:
-
-> Running PHP, NGINX, Postgres and Redis:
-
-```bash
-docker-compose up -d   php nginx beanstalkd postgres
-```
-
-Supported Containers: `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `Memcached`, `beanstalkd`, `beanstalkd-console`, `data`, `php`.
-
-<br>
-3 - 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
 
+
+
+<a name="Docker"></a>
+### [Docker]
+
+
+
 <a name="List-current-running-Containers"></a>
-#### List current running Containers
+### List current running Containers
 ```bash
 docker ps
 ```
+You can also use the this command if you want to see only this project containers:
+
+```bash
+docker-compose ps
+```
+
+
+
+
 
 <br>
 <a name="Close-all-running-Containers"></a>
-#### Close all running Containers
+### Close all running Containers
 ```bash
 docker-compose stop
 ```
@@ -236,11 +291,14 @@ docker-compose stop {container-name}
 
 
 
+
+
+
 <br>
 <a name="Delete-all-existing-Containers"></a>
-#### Delete all existing Containers
+### Delete all existing Containers
 ```bash
-docker-compose rm -f
+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):* 
@@ -248,9 +306,86 @@ docker-compose rm -f
 
 
 
+
+
+
+<br>
+<a name="Enter-Container"></a>
+### Enter a Container (SSH into a running Container)
+
+1 - first list the current running containers with `docker ps`
+
+2 - enter any container using:
+
+```bash
+docker exec -it {container-name} bash
+```
+3 - to exit a container, type `exit`.
+
+
+
+
+
+
+
+<br>
+<a name="Edit-Container"></a>
+### Edit default container configuration
+Open the `docker-compose.yml` and change anything you want.
+
+Examples: 
+
+Change MySQL Database Name:
+
+```yml
+  environment:
+    MYSQL_DATABASE: laradock
+```
+
+Change Redis defaut port to 1111:
+
+```yml
+  ports:
+    - "1111:6379"
+```
+
+
+
+
+
+
+
+
+<br>
+<a name="Edit-a-Docker-Image"></a>
+### Edit a Docker Image
+
+1 - Find the `dockerfile` of the image you want to edit, 
+<br>
+example for `mysql` it will be `mysql/Dockerfile`.
+
+2 - Edit the file the way you want.
+
+3 - Re-build the container:
+
+```bash
+docker-compose build mysql
+```
+
+*If you find any bug or you have and suggestion that can improve the performance of any image, please consider contributing. Thanks in advance.*
+
+
+
+
+
+
+
+
+
+
 <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:
 
@@ -264,9 +399,133 @@ docker-compose build {container-name}
 ```
 
 
+
+
+
+
+<br>
+<a name="Add-Docker-Images"></a>
+### 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/).
+
+
+
+
+
+
+
+
+
+<br>
+<a name="View-the-Log-files"></a>
+### 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:
+
+```bash
+docker logs {container-name}
+```
+
+
+
+
+
+<br>
+<a name="Laravel"></a>
+### [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
+
+You can run artisan commands and many other Terminal commands from the Workspace container.
+
+1 - Make sure you have the workspace container running.
+
+```bash
+docker-compose up -d workspace // ..and all your other containers
+```
+
+2 - Find the Workspace container name:
+
+```bash
+docker-compose ps
+```
+
+3 - Enter the Workspace container:
+
+```bash
+docker exec -it {workspace-container-name} bash
+```
+
+4 - Run anything you want :)
+
+```bash
+php artisan
+```
+```bash
+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.
 
@@ -310,154 +569,117 @@ composer require predis/predis:^1.0
 
 
 
-<br>
-<a name="Change-the-PHP-Version"></a>
-#### Change the PHP Version
-By default **PHP 7.0** is running.
-<br>
-To change the default PHP version:
 
-1 - Open the `dockerfile` of the `php` folder.
 
-2 - Change the PHP version number in the first line,
+
+
+
+
+
+<br>
+<a name="PHP"></a>
+### [PHP]
+
+
+
+
+
+
+<a name="Install-PHP-Extensions"></a>
+### 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.
+
+The PHP-FPM extensions should be installed in `php-fpm/Dockerfile-XX`. *(replace XX with your default PHP version number)*.
+<br>
+The PHP-CLI extensions should be installed in `workspace/Dockerfile`.
+
+
+
+
+
+
+
+
+
+<br>
+<a name="Change-the-PHP-FPM-Version"></a>
+### 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.
+
+1 - Open the `docker-compose.yml`.
+
+2 - Search for `Dockerfile-70` in the PHP container section.
+
+3 - Change the version number. 
+<br>
+Example to select version 5.6 instead of 7.0 you have to replace `Dockerfile-70` with `Dockerfile-56`.
+
+Sample: 
 
 ```txt
-FROM php:7.0-fpm
+php-fpm:
+    build:
+        context: ./php-fpm
+        dockerfile: Dockerfile-70
 ```
 
 Supported Versions:
 
-- For (PHP 7.0.*) use `php:7.0-fpm`
+- For (PHP 7.0.*) use `Dockerfile-70`
-- For (PHP 5.6.*) use `php:5.6-fpm`
+- For (PHP 5.6.*) use `Dockerfile-56`
-- For (PHP 5.5.*) use `php:5.5-fpm`
+- For (PHP 5.5.*) use `Dockerfile-55`
 
-For more details visit the [official PHP docker images](https://hub.docker.com/_/php/).
 
-3 - Finally rebuild the container
+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/).
-<br>
-<a name="Add-Docker-Images"></a>
-#### 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/).
 
 
 
-<br>
-<a name="Edit-Container"></a>
-#### Edit default container configuration
-Open the `docker-compose.yml` and change anything you want.
-
-Examples: 
-
-Change MySQL Database Name:
-
-```yml
-  environment:
-    MYSQL_DATABASE: laradock
-```
-
-Change Redis defaut port to 1111:
-
-```yml
-  ports:
-    - "1111:6379"
-```
 
 
 
-<br>
-<a name="Use-custom-Domain"></a>
-#### 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`.
-
-1 - Open your `/etc/hosts` file and map your `Docker IP` to the `laravel.dev` domain, by adding the following:
-
-```bash
-xxx.xxx.xxx.xxx    laravel.dev
-```
-
-2 - Open your Laravel's `.env` file and replace the `127.0.0.1` default values with your `{Docker-IP}`.
-<br>
-Example:
-
-```env
-DB_HOST=xxx.xxx.xxx.xxx
-```
-
-3 - Open your browser and visit `{http://laravel.dev}`
-
-
-
-Optionally you can define the server name in the nginx config file, like this:
-
-```
-server_name laravel.dev;
-```
-
 
 
 
 <br>
-<a name="View-the-Log-files"></a>
+<a name="Change-the-PHP-CLI-Version"></a>
-#### View the Log files 
+### Change the PHP-CLI Version
-The Log files are stored in the `docker/logs` directory.
+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.
+
+The PHP-CLI is installed in the Workspace container. To change the PHP-CLI version you need to edit the `workspace/Dockerfile`.
+
+Right now you have to manually edit the `Dockerfile` or create a new one like it's done for the PHP-FPM. (consider contributing).
+
+
+
+
+
+
+
 
 
 
 
 <br>
-<a name="Enter-Container"></a>
+<a name="Misc"></a>
-#### Enter a Container (SSH into a running Container)
+### [Misc]
-
-1 - first list the current running containers with `docker ps`
-
-2 - enter any container using:
-
-```bash
-docker exec -it {container-name-or-id} bash
-```
-3 - to exit a container, type `exit`.
-
-
-<br>
-<a name="AddRemove-a-Docker-Container"></a>
-#### Add/Remove a Docker Container
-To prevent a container (software) from running, open the `docker-compose.yml` file, and comment out the container section or remove it entirely.
 
 
 
 
-<br>
-<a name="Edit-a-Docker-Image"></a>
-#### Edit a Docker Image
 
-1 - Find the `dockerfile` of the image you want to edit, 
-<br>
-example for `php` it will be `docker/php/dockerfile`.
-
-2 - Edit the file the way you want.
-
-3 - Re-build the container:
-
-```bash
-docker-compose build
-```
-
-*If you find any bug or you have and suggestion that can improve the performance of any image, please consider contributing. Thanks in advance.*
-
-
-
-
-<br>
 <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)*:
 
@@ -481,50 +703,120 @@ 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:** 
 
+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)
+
+Assuming your custom domain is `laravel.dev` and your current `Docker-IP` is `xxx.xxx.xxx.xxx`.
+
+1 - Open your `/etc/hosts` file and map your `Docker IP` to the `laravel.dev` domain, by adding the following:
+
+```bash
+xxx.xxx.xxx.xxx    laravel.dev
+```
+
+2 - Open your Laravel's `.env` file and replace the `127.0.0.1` default values with your `{Docker-IP}`.
+<br>
+Example:
+
+```env
+DB_HOST=xxx.xxx.xxx.xxx
+```
+
+3 - Open your browser and visit `{http://laravel.dev}`
+
+
+
+Optionally you can define the server name in the nginx config file, like this:
+
+```conf
+server_name laravel.dev;
+```
+
+
+<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 this 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` instead of `http://localhost` in your browser.
+
+
+
+
+
+
 
 
 
 <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?
+If you need any help with Docker and Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz), He would love to help.
-If you have any question, send me a direct message on LaraChat, my username is `mahmoud_zalt`.
+
+For general questions you can open [Issues](https://github.com/laradock/laradock/issues) here on Github (We will label them as questions).
+
+Additionally, you can contact Mahmoud Zalt (the creator of this project) via a direct message on LaraChat, (his username is `mahmoud_zalt`). Or send him an email (`mahmoud@zalt.me`).
 
 
 ## Credits
 
-[![Mahmoud Zalt](https://img.shields.io/badge/Author-Mahmoud%20Zalt-orange.svg)](http://www.zalt.me)
+- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
-
+- [Awesome list of contributors](https://github.com/LaraDock/laradock/graphs/contributors)
-
 
 ## License
 
-[MIT License (MIT)](https://github.com/laradock/laradock/blob/master/LICENSE)
+[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)
-[]([]())

application/Dockerfile

@@ -0,0 +1,7 @@
+FROM debian:jessie
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+WORKDIR /var/www/laravel
+
+CMD ["true"]

docker-compose.yml

@@ -2,39 +2,51 @@ version: '2'
 
 services:
 
+### PHP-FPM Container #######################################
+
+    php-fpm:
+        build:
+            context: ./php-fpm
+            dockerfile: Dockerfile-70
+        volumes_from:
+            - application
+        expose:
+            - "9000"
+        links:
+            - workspace
+
+### Laravel Application Code Container ######################
+
+    application:
+        build: ./application
+        volumes:
+            - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+    data:
+        build: ./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/neo4j:/var/lib/neo4j/data
+            - /var/lib/redis:/data
+
 ### Nginx Server Container ##################################
 
     nginx:
         build: ./nginx
         volumes_from:
-            - php
+            - application
         volumes:
             - ./logs/nginx/:/var/log/nginx
         ports:
             - "80:80"
+            - "443:443"
         links:
-            - php
+            - php-fpm
-
-### PHP Container ###########################################
-
-    php:
-        build: ./php
-        volumes:
-            - ../:/var/www/laravel
-            - ./logs/php/:/usr/local/var/log
-        expose:
-            - "9000"
-
-### DATA Container ##########################################
-
-    data:
-        build: ./data
-        volumes:
-            - /var/lib/mysql
-            - /var/lib/postgres
-            - /var/lib/mariadb
-            - /var/lib/redis
-            - /var/lib/memcached
 
 ### MySQL Container #########################################
 
@@ -49,8 +61,6 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
-            - php
 
 ### PostgreSQL Container ####################################
 
@@ -64,12 +74,10 @@ services:
             POSTGRES_DB: homestead
             POSTGRES_USER: homestead
             POSTGRES_PASSWORD: secret
-        links:
-            - php
 
 ### MariaDB Container #######################################
 
-    mariadb:  
+    mariadb:
         build: ./mariadb
         volumes_from:
             - data
@@ -80,8 +88,18 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
+
-            - php
+### Neo4j Container #########################################
+
+    neo4j:
+        build: ./neo4j
+        ports:
+            - "7474:7474"
+            - "1337:1337"
+        environment:
+            - NEO4J_AUTH=homestead:secret
+        volumes_from:
+            - data
 
 ### Redis Container #########################################
 
@@ -92,6 +110,17 @@ services:
         ports:
             - "6379:6379"
 
+### Memcached Container #####################################
+
+    memcached:
+        build: ./memcached
+        volumes_from:
+            - data
+        ports:
+            - "11211:11211"
+        links:
+            - php-fpm
+
 ### Beanstalkd Container ####################################
 
     beanstalkd:
@@ -99,8 +128,10 @@ services:
         ports:
             - "11300:11300"
         privileged: true
+        links:
+            - php-fpm
 
-### Beanstalkd-Console Container ############################
+### Beanstalkd Console Container ############################
 
     beanstalkd-console:
         build: ./beanstalkd-console
@@ -109,13 +140,12 @@ services:
         links:
             - beanstalkd
 
-### Memcached Container #########################################
+### Workspace Utilities Container ###########################
 
-    memcached:
+    workspace:
-        build: ./memcached
+        build: ./workspace
         volumes_from:
-            - data
+            - application
-        ports:
+        tty: true
-            - "11211:11211"
 
 ### Add more Containers below ###############################

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

@@ -5,7 +5,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD nginx.conf /etc/nginx/
 ADD laravel.conf /etc/nginx/sites-available/
 
-RUN echo "upstream php-upstream { server php:9000; }" > /etc/nginx/conf.d/upstream.conf
+RUN echo "upstream php-upstream { server php-fpm:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 RUN usermod -u 1000 www-data
 

nginx/nginx.conf

@@ -17,8 +17,8 @@ http {
   types_hash_max_size 2048;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log off;
+  access_log on;
-  error_log off;
+  error_log on;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;

php-fpm/Dockerfile-55

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,28 @@
+FROM php:5.6-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-70

@@ -1,15 +1,14 @@
-# You can change the PHP version from here. After changing the PHP version, check the Memcached section below because it replies on PHP 7.
+FROM php:7.0-fpm
-FROM php:7.0-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 \
+RUN apt-get update && apt-get install -y \
-	libpq-dev -y \
+    libpq-dev \
-    curl \
+    libmemcached-dev \
-    libmemcached-dev
+    curl
 
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \

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

@@ -0,0 +1,75 @@
+FROM phusion/baseimage:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+RUN DEBIAN_FRONTEND=noninteractive
+RUN locale-gen en_US.UTF-8
+
+ENV LANGUAGE=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+ENV LC_CTYPE=UTF-8
+ENV LANG=en_US.UTF-8
+ENV TERM xterm
+
+# Install "software-properties-common" (for the "add-apt-repository")
+RUN apt-get update && apt-get install -y \
+    software-properties-common
+
+# Add the "PHP 7" ppa
+RUN add-apt-repository -y \
+    ppa:ondrej/php
+
+# Install PHP-CLI 7, some PHP extentions and some useful Tools with APT
+RUN apt-get update && apt-get install -y --force-yes \
+        php7.0-cli \
+        php7.0-common \
+        php7.0-curl \
+        php7.0-json \
+        php7.0-xml \
+        php7.0-mbstring \
+        php7.0-mcrypt \
+        php7.0-mysql \
+        php7.0-pgsql \
+        php7.0-sqlite \
+        php7.0-sqlite3 \
+        php7.0-zip \
+        php7.0-memcached \
+        sqlite3 \
+        libsqlite3-dev \
+        git \
+        curl \
+        vim \
+        nano \
+        nodejs \
+        nodejs-dev \
+        npm
+
+# Clean up, to free some space
+RUN apt-get clean
+
+# Install gulp and bower with NPM
+RUN npm install -g \
+    gulp \
+    bower
+
+# Link the global gulp to be used locally
+RUN npm link gulp
+
+# Add a symbolic link for Node
+RUN ln -s /usr/bin/nodejs /usr/bin/node
+
+# Add an alias for PHPUnit
+RUN echo "alias phpunit='./vendor/bin/phpunit'" >> ~/.bashrc
+
+# Install Composer
+RUN curl -s http://getcomposer.org/installer | php \
+    && mv composer.phar /usr/local/bin/ \
+    && echo "alias composer='/usr/local/bin/composer.phar'" >> ~/.bashrc
+
+# Source the bash
+RUN . ~/.bashrc
+
+# Clean up
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /var/www/laravel