update the readme (installation steps)

Fixing E: You don't have enough free space in /var/cache/apt/archives/

.gitignore

@@ -0,0 +1 @@
+/logs

README.md

@@ -1,285 +1,820 @@
 # LaraDock
 
-[![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://www.zalt.me)
+[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
 
-
-Like Laravel Homstead but for Docker instead of Vagrant.
+LaraDock helps you run your **Laravel** App on **Docker** real quick.
 <br>
-LaraDock helps you run your **Laravel** App on **Docker** in seconds.
+It's like Laravel Homestead but for Docker instead of Vagrant.
 
 
-![](http://s11.postimg.org/uqpl3efab/laradock.jpg)
+![](http://s18.postimg.org/fhykchl09/new_laradock_cover.png)
 
 <br>
 ## Contents
 
 
 - [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)
 - [Requirements](#Requirements)
+- [Installation](#Installation)
 - [Usage](#Usage)
 - [Documentation](#Documentation)
-- [Docker Images](#Images)
+	- [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)
+		- [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)
+	- [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)
+- [Help & Questions](#Help)
+
 
 
 <a name="Intro"></a>
-### Intro
+## Intro
 
 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 ...
+- 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-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.
+- 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.
+
+
+<a name="Supported-Containers"></a>
+### Supported Containers
+
+- PHP-FPM (7.0 - 5.6 - 5.5)
+- NGINX
+- MySQL
+- PostgreSQL
+- MariaDB
+- 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>
 ### 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.
 
+<a name="what-is-laravel"></a>
 ### What is Laravel?
 
 Seriously!!!
 
+
+<a name="why-docker-not-vagrant"></a>
 ### Why Docker not Vagrant!?
-[Vagrant](https://www.vagrantup.com) gives you Virtual Machines in minutes while Docker gives you Virtual Containers in seconds.
+
+[Vagrant](https://www.vagrantup.com) creates Virtual Machines in minutes while Docker creates Virtual Containers in seconds.
 
 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.
 
-### Questions?
-[![Join the chat at https://gitter.im/LaraDock/laradock](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
+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).
 
 
+<a name="laradock-vs-homestead"></a>
+### LaraDock VS Homestead
 
-<a name="Images"></a>
-## Supported Software (Docker Images)
+LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives you a complete virtual development environments. (Without the need to install and configure every single software on your own Operating System).
 
-- PHP 5.6 / NGINX
-- PHP 5.5 / NGINX
-- MySQL
-- Redis
-- Data Volume (for MySQL & Redis)
-- Beanstalked
+- 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.
+
+Running a virtual Container is much faster than running a full virtual Machine. 
+<br>Thus **LaraDock is much faster than Homestead**.
 
-The Images links on [Github](https://github.com/LaraDock)
-<br>
-The Images links on [Docker Hub](https://hub.docker.com/u/laradock/)
 
 
 <a name="Requirements"></a>
 ## Requirements
-- Laravel ([Download](https://laravel.com/docs/master/installation))
-- Docker Toolbox ([Download](https://www.docker.com/toolbox))
-- Git ([Download](https://git-scm.com/downloads))
-- Composer ([Download](https://getcomposer.org/download/))
+
+| 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) |     [Docker Toolbox](https://www.docker.com/toolbox)    |
+|                [Docker Compose](https://docs.docker.com/compose/install)                |                                                         |
+
+
+
+
+
+
+
+<a name="Installation"></a>
+## Installation
+
+
+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`.
+
+**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 clone https://github.com/LaraDock/laradock.git
+```
+
 
 
 <a name="Usage"></a>
 ## Usage
 
-1 - Install any version of Laravel, or use any of your existing Laravel projects.
 
-2 - Clone the LaraDock repository, inside a `docker` folder, on the root directory of your Laravel project.
+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).
+
+[How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
+
+
+<br>
+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
-git clone https://github.com/LaraDock/laradock.git docker
+docker-compose up -d  nginx mysql
 ```
 
-3 - Find your Docker IP address.
+*Note: the PHP-FPM, Workspace, Application and Data Containers will automatically run.*
 
-- If you are on Linux OS: your IP Address is `127.0.0.1` because the containers run directly on your localhost.
-- If you are on MAC or Windows and using the **docker-machine**: start your docker machine then type `docker-machine ip {vm-name-here}`. *(The default IP is 192.168.99.100)*
-- If you are on MAC or Windows and using **boot2docker**: type `boot2docker ip` when boot2docker is up.
 
-4 - Open your hosts file `/etc/hosts`.
+Supported Containers: `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
+
+
+
+<br>
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
 
 ```bash
-sudo nano /etc/hosts
+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`.
 
-5 - Map your `Docker IP` to the `laravel.dev` domain, by adding the following to the `hosts` file. 
 
-```bash
-xxx.xxx.xxx.xxx    laravel.dev
-```
 
-Don't forget to replace the `xxx.xxx.xxx.xxx` with your Docker IP Address.
+<br>
+4 - Edit the Laravel configurations.
 
-6 - From the new created `docker` folder in step 2, open the `docker-compose.yml` file to replace the `xxx.xxx.xxx.xxx` with your Docker IP Adress as well.
+If you don't have a Laravel project installed yet, see [How to Install Laravel in a Docker Container](#Install-Laravel).
 
-7 - Open your Laravel's `.env` file and set the `DB_HOST` and the `REDIS_HOST` to `laravel.dev` instead of the default `127.0.0.1`.
+Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
 
 ```env
-DB_HOST=laravel.dev
-REDIS_HOST=laravel.dev
+DB_HOST=xxx.xxx.xxx.xxx
+```
+[How to find my Docker IP Address?](#Find-Docker-IP-Address)
+
+
+
+
+<br>
+5 - 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:
+
+```bash
+sudo chmod -R 777 storage && sudo chmod -R 777 bootstrap/cache
 ```
 
-If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the `127.0.0.1` with `laravel.dev` for Redis like so:
+
+
+<br>
+<a name="Documentation"></a>
+## Documentation
+
+
+
+<a name="Docker"></a>
+### Docker
+
+
+
+<a name="List-current-running-Containers"></a>
+#### 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
+```bash
+docker-compose stop
+```
+
+To stop single container do:
+
+```bash
+docker-compose stop {container-name}
+```
+
+
+
+
+
+
+<br>
+<a name="Delete-all-existing-Containers"></a>
+#### 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):* 
+
+
+
+
+
+
+
+<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
+
+If you do any change to any `dockerfile` make sure you run this command, for the changes to take effect:
+
+```bash
+docker-compose build
+```
+Optionally you can specify which container to rebuild (instead of rebuilding all the containers):
+
+```bash
+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 anyway you like.
+
+Example using the Laravel Installer:
+
+```bash
+laravel new my-cool-app
+```
+
+Example using Composer
+
+```bash
+composer create-project laravel/laravel my-cool-app "5.1.*"
+```
+
+For more about this check out this [link](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
+```
+
+
+
+<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
+
+1 - First make sure you run the Redis Container with the `docker-compose` command.
+
+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.
+
+```env
+REDIS_HOST=xxx.xxx.xxx.xxx
+```
+
+If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the default `127.0.0.1` IP with your `Docker-IP` for Redis like this:
 
 ```php
 'redis' => [
     'cluster' => false,
     'default' => [
-        'host'     => 'laravel.dev',
+        'host'     => 'xxx.xxx.xxx.xxx',
         'port'     => 6379,
         'database' => 0,
     ],
 ],
 ```
 
-If you want to use Redis for Caching and/or for Sessions Management. Open the `.env` file and set `CACHE_DRIVER` and `SESSION_DRIVER` to `redis` instead of the default `file`.
+3 - To enable Redis Caching and/or for Sessions Management. Also from the `.env` file set `CACHE_DRIVER` and `SESSION_DRIVER` to `redis` instead of the default `file`.
 
 ```env
 CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 ```
 
-8 - Finally run the containers. **Make sure you are in the `docker` folder** before running this command.
+4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer first.
 
 ```bash
-docker-compose up -d
+composer require predis/predis:^1.0
 ```
 
-You can run `docker-compose up` (without **-d**) if you don't want to run the containers in the background.
+5 - You can manually test it from Laravel with this code:
+
+```php
+\Cache::store('redis')->put('LaraDock', 'Awesome', 10);
+```
+
+
+
+
 
-*"Note: Only the first time you run this command, it will take up to 5 minutes (depend on your connection speed) to download the images to your local machine.*
-
-> Debugging: in case you faced a problem with the docker mahcine here, run this command in your current terminal session `eval "$(docker-machine env {vm-name-here})"`.
 
 
-9 - Open your browser and visit `http://laravel.dev`
 
 
-> Debugging: in case you faced an error here, it might be that you forget to provide some permissions for Laravel, so try running the following command on the Laravel root directory:
-`sudo chmod -R 777 storage && sudo chmod -R 777 bootstrap/cache`.
 
 <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`.
+
+
+
+
+
+
 
 
-[Follow @Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt)
 
 <br>
-<a name="Documentation"></a>
-## Documentation
+<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
 
-#### See current running Containers
 ```bash
-docker ps
+docker-compose build php
 ```
 
+For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+
+
+
+
+
+
+
+
+
 <br>
-#### Close all running Containers
+<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
+
+These steps are only for **Windows & MAC** users *(Linux users don't need a virtual host)*:
+
+1 - Run the default Host:
+
 ```bash
-docker-compose stop
+docker-machine start default
 ```
 
+* If the host "default" does not exist, create one using the command below, else skip it:
+
+* ```bash
+  docker-machine create -d virtualbox default
+  ```
+
+2 - Run this command to configure your shell:
 
-<br>
-#### Delete all existing Containers
 ```bash
-docker-compose rm -f
-```
-
-*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):* 
-
-`docker stop {container-name}`
-
-
-
-<br>
-#### Change the PHP Version
-By default **PHP 5.6** is running.
-<br>
-To change the default PHP version, simply open your `docker-compose.yml` file and edit this line:
-
-```yaml
-image: laradock/php56nginx:0.1.0
-```
-Supported versions:
-
-- (PHP 5.5.*) laradock/php55nginx:latest
-- (PHP 5.6.*) laradock/php56nginx:latest
-
-
-**Note:**
-
-If you set `laradock/phpnginx` as your image, this will pull from `laradock/php56nginx`.
-
-
-<br>
-#### Upgrade the docker images
-
-By default `docker-compose.yml` is configured to use the latest stable version of the image (latest stable realease `tag`).
-
-
-To use the latest build you can edit the `docker-compose.yml` file and replace the version number at the end of every image name with `:latest`
-<br>
-Example: change `image: laradock/mysql:0.1.0` to `image: laradock/mysql:latest`
-
-
-<br>
-#### Remove 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>
-#### Add an Image (add a software to run with other Containers)
-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/yml/).
-
-
-
-<br>
-#### Edit a Container (change Ports or Volumes)
-To modify a container you can simply open the `docker-compose.yml` and change everything you want.
-
-Example: if you want to set the MySQL port to 3333, just replace the default port with yours:
-
-```yml
-  ports:
-    - "3333:3306"
+eval $(docker-machine env)
 ```
 
 
 
-<br>
-#### View the Log files 
-The Log files are stored in the `docker/logs` directory.
+
 
 
 
 <br>
-#### Edit an existing Image (change some configuration in the image)
-To edit an image, and take full control of it:
+<a name="Find-Docker-IP-Address"></a>
+#### Find your Docker IP Address 
+
+**On Windows & MAC:** 
+
+```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)*
+
+> **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
+
+<br>
+**On Linux:** 
+
+1 - Run `ifconfig` in the terminal.
+
+2 - In the result search for `docker0`, your IP address will be next to `inet addr`.
+
+Example: (In this example your IP address is `172.17.0.1`).
+
+```shell
+docker0   Link encap:Ethernet  HWaddr 02:42:41:2d:c4:24
+          inet addr:172.17.0.1  Bcast:0.0.0.0  Mask:255.255.0.0
+          UP BROADCAST MULTICAST  MTU:1500  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+```
+>If you have an easier way to do it, share it with us.
+
+
+
+
+
+
+<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;
+```
+
+
+
+
 
-1. Clone any Image from [https://github.com/LaraDock](https://github.com/LaraDock)
-2. Modify the `Dockfile`
-3. Run `docker build -t {your-image-name} .`
 
-All the images are open source and hosted on the [Docker Hub](https://hub.docker.com/u/laradock/).
 
-*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>
 ## 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 :)
-
-All Docker Images can be found at [https://github.com/LaraDock](https://github.com/LaraDock)
+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 :)
 
 ## Support
 
-[Issues](https://github.com/laradock/laradock/issues) on Github.
+To suggest a features or report a bug, open a new [Issue](https://github.com/laradock/laradock/issues).
 
 
 
+<a name="Help"></a>
+## Help & Questions
+
+If you need help with anything related to this project, shedule a live call with me on [Codementor](https://www.codementor.io/mahmoudz), I'd love to help.
+
+If you have a short question, send me a direct message on LaraChat, my username is `mahmoud_zalt`.
+
+
 ## Credits
 
 [![Mahmoud Zalt](https://img.shields.io/badge/Author-Mahmoud%20Zalt-orange.svg)](http://www.zalt.me)
 
+Twitter: [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt)
+<br>
+Website: [http://zalt.me](http://zalt.me)
+<br>
+Email: `mahmoud@zalt.me`
 
 
 ## 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"]

beanstalkd-console/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+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 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'

beanstalkd/Dockerfile

@@ -0,0 +1,16 @@
+FROM phusion/baseimage:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN apt-get update
+RUN apt-get install -y beanstalkd
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+VOLUME /var/lib/beanstalkd/data
+
+EXPOSE 11300
+
+CMD ["/usr/bin/beanstalkd"]

data/Dockerfile

@@ -0,0 +1,5 @@
+FROM debian:jessie
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["true"]

docker-compose.yml

@@ -1,61 +1,146 @@
-# PHP + NGINX Container #----------------------------------
-php-nginx:
-  image: laradock/php56nginx:0.1.0
-  container_name: php-nginx
+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/postgres
+            - /var/lib/mariadb
+            - /var/lib/redis
+            - /var/lib/memcached
+
+### Nginx Server Container ##################################
+
+    nginx:
+        build: ./nginx
+        volumes_from:
+            - application
+        volumes:
+            - ./logs/nginx/:/var/log/nginx
         ports:
             - "80:80"
-  volumes:
-    - ./settings/nginx:/etc/nginx/sites-available
-    - ../:/var/www
-    - ./logs/nginx:/var/log/nginx
+            - "443:443"
         links:
-    - mysql
-    - redis
-  privileged: true
-  extra_hosts:
-    - "laravel.dev:xxx.xxx.xxx.xxx"
+            - php-fpm
+
+### MySQL Container #########################################
 
-# MySQL Container #----------------------------------------
     mysql:
-  image: laradock/mysql:0.1.0
-  container_name: mysql
-  ports:
-    - "3306:3306"
+        build: ./mysql
         volumes_from:
             - data
+        ports:
+            - "3306:3306"
         environment:
             MYSQL_DATABASE: homestead
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
-  privileged: true
+            MYSQL_ROOT_PASSWORD: root
+        links:
+            - php-fpm
 
-# Redis Container #----------------------------------------
-redis:
-  image: laradock/redis:0.1.0
-  container_name: redis
-  ports:
-    - "6379:6379"
+### PostgreSQL Container ####################################
+
+    postgres:
+        build: ./postgres
         volumes_from:
             - data
-  volumes:
-    - ./logs/redis:/var/log/redis
-  restart: always
+        ports:
+            - "5432:5432"
+        environment:
+            POSTGRES_DB: homestead
+            POSTGRES_USER: homestead
+            POSTGRES_PASSWORD: secret
+        links:
+            - php-fpm
+
+### MariaDB Container #######################################
+
+    mariadb:  
+        build: ./mariadb
+        volumes_from:
+            - data
+        ports:
+            - "3306:3306"
+        environment:
+            MYSQL_DATABASE: homestead
+            MYSQL_USER: homestead
+            MYSQL_PASSWORD: secret
+            MYSQL_ROOT_PASSWORD: root
+        links:
+            - php-fpm
+
+### Redis Container #########################################
+
+    redis:
+        build: ./redis
+        volumes_from:
+            - data
+        ports:
+            - "6379:6379"
+        links:
+            - php-fpm
+
+### Memcached Container #####################################
+
+    memcached:
+        build: ./memcached
+        volumes_from:
+            - data
+        ports:
+            - "11211:11211"
+        links:
+            - php-fpm
+
+### Beanstalkd Container ####################################
+
+    beanstalkd:
+        build: ./beanstalkd
+        ports:
+            - "11300:11300"
         privileged: true
+        links:
+            - php-fpm
 
-# Data Volume Container #----------------------------------
-data:
-  image: laradock/data:0.1.0
-  container_name: data
-  volumes:
-    - /var/lib/mysql
-    - /var/lib/redis
+### Beanstalkd Console Container ############################
 
-# Beanstalkd Container #-----------------------------------
-# beanstalkd:
-#   image: laradock/beanstalkd:0.1.0
-#   container_name: beanstalkd
-#   ports:
-#     - "11300:11300"
-#   privileged: true
+    beanstalkd-console:
+        build: ./beanstalkd-console
+        ports:
+            - "2080:2080"
+        links:
+            - beanstalkd
 
-#----------------------------------------------------------
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build: ./workspace
+        volumes_from:
+            - application
+        tty: true
+
+### Add more Containers below ###############################

mariadb/Dockerfile

@@ -0,0 +1,7 @@
+FROM mariadb:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["mysqld"]
+
+EXPOSE 3306

memcached/Dockerfile

@@ -0,0 +1,7 @@
+FROM memcached:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["memcached"]
+
+EXPOSE 11211

mysql/Dockerfile

@@ -0,0 +1,7 @@
+FROM mysql:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["mysqld"]
+
+EXPOSE 3306

nginx/Dockerfile

@@ -0,0 +1,14 @@
+FROM nginx:latest
+
+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-fpm:9000; }" > /etc/nginx/conf.d/upstream.conf
+
+RUN usermod -u 1000 www-data
+
+CMD ["nginx"]
+
+EXPOSE 80 443

nginx/laravel.conf

@@ -2,18 +2,16 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server ipv6only=on;
 
-    root /var/www/public;
+    root /var/www/laravel/public;
     index index.php index.html index.htm;
 
-    server_name laravel.dev;
-
     location / {
          try_files $uri $uri/ /index.php$is_args$args;
     }
 
     location ~ \.php$ {
         try_files $uri /index.php =404;
-        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        fastcgi_pass php-upstream;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
@@ -23,3 +21,6 @@ server {
         deny all;
     }
 }
+
+
+

nginx/nginx.conf

@@ -0,0 +1,29 @@
+user www-data;
+worker_processes 4;
+pid /run/nginx.pid;
+
+events {
+  worker_connections  2048;
+  multi_accept on;
+  use epoll;
+}
+
+http {
+  server_tokens off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 15;
+  types_hash_max_size 2048;
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+  access_log off;
+  error_log off;
+  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

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

@@ -0,0 +1,32 @@
+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 -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 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
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/laravel.ini

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

php-fpm/laravel.pool.conf

@@ -0,0 +1,76 @@
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www-data
+group = www-data
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses on a
+;                            specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 0.0.0.0:9000
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 20
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+;---------------------
+
+; Make specific Docker environment variables available to PHP
+env[DB_1_ENV_MYSQL_DATABASE] = $DB_1_ENV_MYSQL_DATABASE
+env[DB_1_ENV_MYSQL_USER] = $DB_1_ENV_MYSQL_USER
+env[DB_1_ENV_MYSQL_PASSWORD] = $DB_1_ENV_MYSQL_PASSWORD
+
+catch_workers_output = yes

postgres/Dockerfile

@@ -0,0 +1,7 @@
+FROM postgres:latest
+
+MAINTAINER Ben M <git@bmagg.com>
+
+CMD ["postgres"]
+
+EXPOSE 5432

redis/Dockerfile

@@ -0,0 +1,9 @@
+FROM redis:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#COPY redis.conf /usr/local/etc/redis/redis.conf
+
+CMD [ "redis-server" ]
+
+EXPOSE 6379

workspace/Dockerfile

@@ -0,0 +1,74 @@
+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 \
+        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-sqlite \
+        php7.0-sqlite3 \
+        php7.0-zip \
+        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
+
+# 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
+
+# Install the Laravel Installer
+RUN composer.phar global require "laravel/installer" \
+    && echo "export PATH='~/.composer/vendor/bin:$PATH'" >> ~/.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