Merge pull request #144 from appleboy/patch-7

#140 update php 5.5 and 5.6

.env

@@ -0,0 +1 @@
+INSTALL_PRESTISSIMO=false

.gitignore

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

README.md

@@ -7,6 +7,7 @@ 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)
 
@@ -16,32 +17,42 @@ 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)
+	- [Docker](#Docker)
 		- [List current running Containers](#List-current-running-Containers)
 		- [Close all running Containers](#Close-all-running-Containers)
 		- [Delete all existing Containers](#Delete-all-existing-Containers)
-	- [Build/Re-build Containers](#Build-Re-build-Containers)
-	- [Change the PHP Version](#Change-the-PHP-Version)
-	- [Add/Remove a Docker Container](#AddRemove-a-Docker-Container)
-	- [Add more Software's (Docker Images)](#Add-Docker-Images)
-	- [Edit default container configuration](#Edit-Container)
-	- [Use custom Domain](Use-custom-Domain)
-	- [View the Log files](#View-the-Log-files)
-	- [Use Redis](#Use-Redis)
 		- [Enter a Container (SSH into a running Container)](#Enter-Container)
+		- [Edit default container configuration](#Edit-Container)
 		- [Edit a Docker Image](#Edit-a-Docker-Image)
+		- [Build/Re-build Containers](#Build-Re-build-Containers)
+		- [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)
+	- [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)
-
+		- [Install Prestissimo](#Install-Prestissimo)
+		- [Debugging](#debugging)
+- [Help & Questions](#Help)
 
 
 
@@ -55,7 +66,7 @@ It contains pre-packaged Docker Images that provides you a wonderful development
 **Usage Overview:** Run `NGINX`, `MySQL` and `Redis`.
 
 ```shell
-docker-compose up -d  nginx mysql redis 
+docker-compose up  nginx mysql redis
 ```
 
 <a name="features"></a>
@@ -64,7 +75,7 @@ docker-compose up -d  nginx mysql redis
 - Easy switch between PHP versions: 7.0 - 5.6 - 5.5 ...
 - Choose your favorite database engine: MySQL - Postgres - Redis ...
 - 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.
@@ -76,20 +87,25 @@ docker-compose up -d  nginx mysql redis
 
 
 <a name="Supported-Containers"></a>
-## Supported Containers
+### Supported Containers
 
-- PHP (7.0 - 5.6 - 5.5)
+- PHP-FPM (7.0 - 5.6 - 5.5)
 - NGINX
 - MySQL
 - PostgreSQL
 - MariaDB
+- Neo4j
+- MongoDB
 - Redis
 - Memcached
 - Beanstalkd
 - Beanstalkd Console
-- Data Volume
+- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano, cURL and much more)
+- Data *(Databases Data Container)*
+- Application *(Application Code Container)*
 
->Cannot find your container! we would love to have it as well. Consider contributing your container and adding it to this list.
+
+>If you can't find your container, build it yourself and add it to this list. Contributions are welcomed :)
 
 
 
@@ -113,7 +129,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).
 
@@ -125,10 +141,9 @@ 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**.
 
 
 
@@ -136,103 +151,137 @@ Running a virtual Container is much faster than running a full virtual Machine.
 ## Requirements
 
 | Linux                                                                          | Windows & MAC                                                                                 |
-|-----------------------------------------------------------------------------------------|---------------------------------------------------------|
+|--------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
 | [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) OR [Native Docker](https://beta.docker.com/) |
 | [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. 
+
-(**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>
-1 - 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`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
+
+
+**Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.
+
+
+
+
+
+<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, MySQL and Redis:
-
-```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 Memcached:
-
-```bash
-docker-compose up -d  php nginx postgres memcached
-```
-
-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
 
+**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]
+
+
+
 <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
 ```
@@ -245,11 +294,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):*
@@ -257,75 +309,31 @@ docker-compose rm -f
 
 
 
-<br>
-<a name="Build-Re-build-Containers"></a>
-#### Build/Re-build Containers
 
-If you do any change to any `dockerfile` make sure you run this command, for the changes to take effect:
+
+
+<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-compose build
+docker exec -it {container-name} bash
-```
-Optionally you can specify which container to rebuild (instead of rebuilding all the containers):
-
-```bash
-docker-compose build {container-name}
 ```
+3 - to exit a container, type `exit`.
 
 
 
 
-<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 `docker-compose.yml`.
-
-2 - Search for `Dockerfile-php-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-php-70` with `Dockerfile-php-56`.
-
-Sample: 
-
-```txt
-php:
-    build:
-        context: ./php
-        dockerfile: Dockerfile-php-70
-```
-
-Supported Versions:
-
-- For (PHP 7.0.*) use `Dockerfile-php-70`
-- For (PHP 5.6.*) use `Dockerfile-php-56`
-- For (PHP 5.5.*) use `Dockerfile-php-55`
-
-
-4 - Finally rebuild the container
-
-```bash
-docker-compose build php
-```
-
-For more details 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
+### Edit default container configuration
 Open the `docker-compose.yml` and change anything you want.
 
 Examples:
@@ -346,53 +354,177 @@ Change Redis defaut port to 1111:
 
 
 
+
+
+
+
+
 <br>
-<a name="Use-custom-Domain"></a>
+<a name="Edit-a-Docker-Image"></a>
-#### Use custom Domain (instead of the Docker IP)
+### Edit a Docker Image
 
-Assuming your custom domain is `laravel.dev` and your current `Docker-IP` is `xxx.xxx.xxx.xxx`.
+1 - Find the `dockerfile` of the image you want to edit,
+<br>
+example for `mysql` it will be `mysql/Dockerfile`.
 
-1 - Open your `/etc/hosts` file and map your `Docker IP` to the `laravel.dev` domain, by adding the following:
+2 - Edit the file the way you want.
+
+3 - Re-build the container:
 
 ```bash
-xxx.xxx.xxx.xxx    laravel.dev
+docker-compose build mysql
 ```
 
-2 - Open your Laravel's `.env` file and replace the `127.0.0.1` default values with your `{Docker-IP}`.
+*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>
-Example:
+<a name="Build-Re-build-Containers"></a>
+### Build/Re-build Containers
 
-```env
+If you do any change to any `dockerfile` make sure you run this command, for the changes to take effect:
-DB_HOST=xxx.xxx.xxx.xxx
+
+```bash
+docker-compose build
+```
+Optionally you can specify which container to rebuild (instead of rebuilding all the containers):
+
+```bash
+docker-compose build {container-name}
 ```
 
-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="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 
+### View the Log files
-The Log files are stored in the `docker/logs` directory.
+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="Use-Redis"></a>
+<a name="Laravel"></a>
-#### Use Redis
+### [Laravel]
 
-1 - First make sure you run the Redis Container with the `docker-compose` command.
+
+
+
+<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
+```
+
+<br>
+<a name="Use-Redis"></a>
+### Use Redis
+
+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.
 
@@ -420,7 +552,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
@@ -437,51 +569,167 @@ composer require predis/predis:^1.0
 
 
 <br>
-<a name="Enter-Container"></a>
+<a name="Use-Mongo"></a>
-#### Enter a Container (SSH into a running Container)
+### Use Mongo
 
-1 - first list the current running containers with `docker ps`
+1 - First make sure you run the MongoDB Container (`mongo`) with the `docker-compose up` command.
-
-2 - enter any container using:
 
 ```bash
-docker exec -it {container-name-or-id} bash
+docker-compose up -d mongo
 ```
-3 - to exit a container, type `exit`.
 
 
-<br>
+2 - Add the MongoDB configurations to the `config/database.php` config file:
-<a name="AddRemove-a-Docker-Container"></a>
+
-#### Add/Remove a Docker Container
+```php
-To prevent a container (software) from running, open the `docker-compose.yml` file, and comment out the container section or remove it entirely.
+'connections' => [
+
+    'mongodb' => [
+        'driver'   => 'mongodb',
+        'host'     => env('DB_HOST', 'localhost'),
+        'port'     => env('DB_PORT', 27017),
+        'database' => env('DB_DATABASE', 'database'),
+        'username' => '',
+        'password' => '',
+        'options'  => [
+            'database' => '',
+        ]
+    ],
+
+	// ...
+
+],
+```
+
+3 - 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`.
 
 
-
+4 - Finally make sure you have the `jenssegers/mongodb` package installed via Composer and its Service Provider is added.
-
-<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
+composer require jenssegers/mongodb
 ```
+More details about this [here](https://github.com/jenssegers/laravel-mongodb#installation).
+
+5 - 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`.
+
 
-*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="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
+php-fpm:
+    build:
+        context: ./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/).
+
+
+
+
+
+
+
+
+
+<br>
+<a name="Change-the-PHP-CLI-Version"></a>
+### 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.
+
+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="Misc"></a>
+### [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)*:
 
@@ -505,50 +753,138 @@ 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="Install-Prestissimo"></a>
+### Install 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 `docker-compose.yml` file.
+
+<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?
+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)
+**Creator:**
 
+- [Mahmoud Zalt](https://github.com/Mahmoudz)  (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
+
+**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)
+- [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)
-[]([]())

docker-compose.yml

@@ -7,43 +7,34 @@ services:
     nginx:
         build: ./nginx
         volumes_from:
-            - php
+            - volumes_source
         volumes:
             - ./logs/nginx/:/var/log/nginx
         ports:
             - "80:80"
+            - "443:443"
         links:
-            - php
+            - php-fpm
 
-### PHP Container ###########################################
+### PHP-FPM Container #######################################
 
-    php:
+    php-fpm:
         build:
-            context: ./php
+            context: ./php-fpm
-            dockerfile: Dockerfile-php-70
+            dockerfile: Dockerfile-70
-        volumes:
+        volumes_from:
-            - ../:/var/www/laravel
+            - volumes_source
-            - ./logs/php/:/usr/local/var/log
         expose:
             - "9000"
-
+        links:
-### DATA Container ##########################################
+            - workspace
-
-    data:
-        build: ./data
-        volumes:
-            - /var/lib/mysql
-            - /var/lib/postgres
-            - /var/lib/mariadb
-            - /var/lib/redis
-            - /var/lib/memcached
 
 ### MySQL Container #########################################
 
     mysql:
         build: ./mysql
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -51,30 +42,26 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
-            - php
 
 ### 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
 
 ### MariaDB Container #######################################
 
     mariadb:
         build: ./mariadb
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -82,30 +69,47 @@ 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:
+            - 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
 
 ### Memcached Container #####################################
 
     memcached:
         build: ./memcached
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "11211:11211"
         links:
-            - php
+            - php-fpm
 
 ### Beanstalkd Container ####################################
 
@@ -115,9 +119,9 @@ services:
             - "11300:11300"
         privileged: true
         links:
-            - php
+            - php-fpm
 
-### Beanstalkd-Console Container ############################
+### Beanstalkd Console Container ############################
 
     beanstalkd-console:
         build: ./beanstalkd-console
@@ -126,4 +130,35 @@ services:
         links:
             - beanstalkd
 
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - 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:
+            - /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 ###############################

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

@@ -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

@@ -15,10 +15,11 @@ 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 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,52 @@
+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 \
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql \
+    gd
+
+# Install memcached
+RUN pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/Dockerfile-56

@@ -0,0 +1,52 @@
+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 \
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql \
+    gd
+
+# Install memcached
+RUN pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/Dockerfile-70

@@ -5,15 +5,35 @@ 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 \
+    libmemcached-dev \
     curl \
-    libmemcached-dev
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
 
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
     pdo_mysql \
-    pdo_pgsql
+    pdo_pgsql \
+    gd
 
 # 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" \
@@ -23,6 +43,10 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
     && docker-php-ext-install memcached \
     && rm /tmp/memcached.tar.gz
 
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
 RUN usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

php-fpm/laravel.ini

@@ -0,0 +1,14 @@
+date.timezone=UTC
+display_errors=Off
+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

php/Dockerfile-php-55

@@ -1,23 +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 \
-    libpq-dev -y \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php/Dockerfile-php-56

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

php/laravel.ini

@@ -1,3 +0,0 @@
-date.timezone = UTC
-display_errors = Off
-log_errors = On

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"]

volumes/application/Dockerfile

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

workspace/Dockerfile

@@ -0,0 +1,96 @@
+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 \
+        php7.0-gd \
+        php7.0-xdebug \
+        php-dev \
+        libcurl4-openssl-dev \
+        libedit-dev \
+        libssl-dev \
+        libxml2-dev \
+        xz-utils \
+        sqlite3 \
+        libsqlite3-dev \
+        git \
+        curl \
+        vim \
+        nano
+
+# Clean up, to free some space
+RUN apt-get clean
+
+# remove load xdebug extension (only load on phpunit command)
+RUN sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini
+
+# Add bin folder of composer to PATH.
+RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
+
+# Install Composer
+RUN curl -s http://getcomposer.org/installer | php \
+    && mv composer.phar /usr/local/bin/composer
+
+# Load xdebug Zend extension with phpunit command
+RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc
+
+# Install mongodb extension
+RUN pecl install mongodb
+RUN echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini
+
+# Install nvm (Node Version Manager)
+RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
+
+ENV NVM_DIR=/root/.nvm
+
+# Install stable node
+RUN . ~/.nvm/nvm.sh \
+    && nvm install stable \
+    && nvm use stable \
+    && nvm alias stable \
+    && npm install -g gulp bower
+
+# Source the bash
+RUN . ~/.bashrc
+
+# Clean up
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /var/www/laravel
+
+# Install optional software
+ARG INSTALL_PRESTISSIMO=false
+RUN if [ "$INSTALL_PRESTISSIMO" = true ] ; then \
+        composer global require "hirak/prestissimo:^0.3"; \
+    fi