Merge pull request #834 from xbojch/libicu-dev-not-found

Run apt-get update before installing intl extension

.editorconfig

@@ -9,4 +9,4 @@ charset = utf-8
 
 [{Dockerfile,docker-compose.yml}]
 indent_style = space
-indent_size = 4
+indent_size = 2

.gitignore

@@ -2,3 +2,4 @@
 /logs
 /data
 .env
+/.project

.travis.yml

@@ -0,0 +1,25 @@
+language: bash
+sudo: required
+services:
+  - docker
+
+env:
+  matrix:
+    - PHP_VERSION=56
+    - PHP_VERSION=70
+    - PHP_VERSION=71
+    - HUGO_VERSION=0.19
+
+script: ./_scripts/travis-build.sh
+
+deploy:
+  provider: pages
+  skip_cleanup: true
+  local_dir: docs
+  github_token: $GITHUB_TOKEN
+  on:
+    branch: master
+    condition: -n "${HUGO_VERSION}"
+
+notifications:
+  email: false

DOCUMENTATION/config.toml

@@ -1,6 +1,6 @@
 baseurl = "http://laradock.io/"
 languageCode = "en-us"
-publishDir = "../../docs"
+publishDir = "../docs"
 title = "Laradock"
 theme = "hugo-material-docs"
 metadataformat = "yaml"
@@ -11,7 +11,7 @@ googleAnalytics = "UA-37514928-9"
 [params]
 	# General information
 	author = "Mahmoud Zalt"
-	description = "Laradock documentations."
+	description = "Full PHP development environment for Docker."
 	copyright = ""
 
 	# Repository
@@ -19,7 +19,7 @@ googleAnalytics = "UA-37514928-9"
 	repo_url = ""
 
 	version = ""
-	logo = ""
+	logo = "images/logo.png"
 	favicon = ""
 
 	permalink = "#"
@@ -62,8 +62,8 @@ googleAnalytics = "UA-37514928-9"
 	weight = 3
 
 [[menu.main]]
-	name   = "Related Projects"
-	url    = "related-projects/"
+	name   = "Guides"
+	url    = "guides/"
 	weight = 4
 
 [[menu.main]]
@@ -71,15 +71,20 @@ googleAnalytics = "UA-37514928-9"
 	url    = "help/"
 	weight = 5
 
+[[menu.main]]
+	name   = "Related Projects"
+	url    = "related-projects/"
+	weight = 6
+
 [[menu.main]]
 	name   = "Contributing"
 	url    = "contributing/"
-	weight = 6
+	weight = 7
 
 [[menu.main]]
 	name   = "License"
 	url    = "license/"
-	weight = 7
+	weight = 8
 
 # ------- MENU END -----------------------------------------
 

DOCUMENTATION/content/contributing/index.md

@@ -1,7 +1,7 @@
 ---
 title: Contributing
 type: index
-weight: 6
+weight: 7
 ---
 
 
@@ -38,17 +38,23 @@ You can request a new feature by submitting an [Issue](https://github.com/larado
 
 Laradock uses [Hugo](https://gohugo.io/) as website generator tool, with the [Material Docs theme](http://themes.gohugo.io/theme/material-docs/). You might need to check their docs quickly.
 
+Go the `DOCUMENTATION/content` and search for the markdown file you want to edit
 
-1. Install [Hugo](https://gohugo.io/) on your machine (easy thing).
-2. Open the `DOCUMENTATION/_settings/content` and search for the markdown file you want to edit (every folder represents a section in the menu).
-3. Delete the `/docs` folder from the root.
-4. When you finish editing, run the `hugo` command to generate the HTML docs (in the `/docs`).
+Note: Every folder represents a section in the sidebar "Menu". And every page and sidebar has a `weight` number to show it's position in the site.
+
+To update the sidebar or add a new section to it, you can edit this `DOCUMENTATION/config.toml` toml file.
+
+> The site will be auto-generated in the `docs/` folder by [Travis CI](https://travis-ci.org/laradock/laradock/).
+
+
+<br>
 
 ### To Host the website locally
-Go to `DOCUMENTATION/_settings` in your terminal and run `hugo serve` to host the website locally.
 
-### Edit the sidebar
-To add a new section to the sidebar or edit existing one, you need to edit this file `DOCUMENTATION/_settings/config.toml`.
+1. Install [Hugo](https://gohugo.io/) on your machine.
+2. Edit the `DOCUMENTATION/content`.
+3. Delete the `/docs` folder from the root.
+4. After you finish the editing, go to `DOCUMENTATION/` and run the `hugo` command to generate the HTML docs (inside a new `/docs` folder).
 
 
 

DOCUMENTATION/content/documentation/index.md

@@ -706,6 +706,23 @@ docker-compose up -d mariadb phpmyadmin
 
 
 
+<br>
+<a name="Use-Adminer"></a>
+## Use Adminer
+
+1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d adminer  
+```
+
+2 - Open your browser and visit the localhost on port **8080**:  `http://localhost:8080`
+
+
+
+
+
+
 <br>
 <a name="Use-pgAdmin"></a>
 ## Use PgAdmin
@@ -1332,15 +1349,36 @@ Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requ
 
 
 
+
+
 <br>
 <a name="Speed-MacOS"></a>
 ## Improve speed on MacOS
 
-Sharing code into Docker containers with osxfs have very poor performance compared to Linux. You can get around this issue by using NFS to share your files betwen your host and your container.
+Sharing code into Docker containers with osxfs have very poor performance compared to Linux. Likely there are some workarounds:
 
-> How to share files using NFS (d4m-nfs)
+### Workaround A: using dinghy
 
-[d4m-nfs](https://github.com/IFSight/d4m-nfs) automatically mount NFS volume instead of osxfs one.
+[Dinghy](https://github.com/codekitchen/dinghy) creates its own VM using docker-machine, it will not modify your existing docker-machine VMs.
+
+Quick Setup giude, (we recommend you check their docs)
+
+1) `brew tap codekitchen/dinghy`
+
+2) `brew install dinghy`
+
+3) `dinghy create --provider virtualbox` (must have virtualbox installed, but they support other providers if you prefer)
+
+4) after the above command is done it will display some env variables, copy them to the bash profile or zsh or.. (this will instruct docker to use the server running inside the VM)
+
+5) `docker-compose up ...`
+
+
+
+
+### Workaround B: using d4m-nfs
+
+[D4m-nfs](https://github.com/IFSight/d4m-nfs) automatically mount NFS volume instead of osxfs one.
 
 1) Update the Docker [File Sharing] preferences:
 
@@ -1358,14 +1396,12 @@ git clone https://github.com/IFSight/d4m-nfs ~/d4m-nfs
 
 ```txt
 /Users:/Users
-/Volumes:/Volumes
-/private:/private
 ```
 
 5) Create (or edit) the file `/etc/exports`, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the `d4m-nfs.sh` script before).
 
 
-6) Run the `d4m-nfs.sh` script:
+6) Run the `d4m-nfs.sh` script (might need Sudo):
 
 ```bash
 ~/d4m-nfs/d4m-nfs.sh
@@ -1374,10 +1410,26 @@ git clone https://github.com/IFSight/d4m-nfs ~/d4m-nfs
 That's it! Run your containers.. Example:
 
 ```bash
-docker-compose up -d nginx mysql
+docker-compose up ...
 ```
 
-**Note:** If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.
+*Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.*
+
+
+
+### Other good workarounds:
+
+- [docker-sync](https://github.com/EugenMayer/docker-sync)
+- Add more here..
+
+
+
+
+More details about this issue [here](https://github.com/docker/for-mac/issues/77).
+
+
+
+
 
 
 

DOCUMENTATION/content/getting-started/index.md

@@ -32,7 +32,6 @@ Choose the setup the best suits your needs.
 
 <a name="A1"></a>
 ### A.1) Already have a PHP project:
-> (Follow these steps if you already have a PHP project, and all you need is an environment to run it)
 
 1 - Clone laradock on your project root directory:
 
@@ -44,7 +43,7 @@ git submodule add https://github.com/Laradock/laradock.git
 
 - If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `.
 
-- Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. [Check this](#keep-tracking-Laradock)
+- Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. [Check this](/documentation/#keep-track-of-your-laradock-changes)
 
 
 Your folder structure should look like this:
@@ -56,11 +55,12 @@ Your folder structure should look like this:
 	+ laradock-b
 ```
 
-(It's important to rename the folders differently in each project)
+(It's important to rename the folders differently in each project.)
+
+> **Now jump to the [Usage](#Usage) section.**
 
 <a name="A2"></a>
 ### A.2) Don't have a PHP project yet:
-> (Follow these steps if you don't have a PHP project yet, and you need an environment to create the project)
 
 1 - Clone this repository anywhere on your machine:
 
@@ -83,9 +83,10 @@ Your folder structure should look like this:
 
 **In case of Apache:** :P 
 
-3 - Run your `docker-compose up` command and you're ready to go. 
+<br>
 
-*Note: if you already had your containers up, you might need to take them down first and rebuild them for the changes to take effect.*
+
+> **Now jump to the [Usage](#Usage) section.**
 
 
 <a name="B"></a>
@@ -121,9 +122,7 @@ You can rename the config files, project folders and domains as you like, just m
 127.0.0.1  project-2.dev
 ```
 
-5 - Visit `http://project-1.dev/` and `http://project-2.dev/`.
-
-
+> **Now jump to the [Usage](#Usage) section.**
 
 
 
@@ -131,14 +130,15 @@ You can rename the config files, project folders and domains as you like, just m
 
 
 
+<a name="Usage"></a>
 ## Usage
 
 **Read Before starting:**
 
 If you are using **Docker Toolbox** (VM), do one of the following:
 
-- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock)
-- Use Laradock v3.* (Visit the `Laradock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
+- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
+- Use Laradock v3.\*. Visit the [LaraDock-ToolBox](https://github.com/laradock/laradock/tree/LaraDock-ToolBox) branch. *(outdated)*
 
 <br>
 
@@ -146,10 +146,18 @@ If you are using **Docker Toolbox** (VM), do one of the following:
 
 <br>
 
-1 - Run Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
+1 - Enter the laradock folder and rename `env-example` to `.env`
+
+```shell
+cp env-example .env
+```
+
+You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
 
 
-**Example:** Running NGINX and MySQL:
+2 - Build the enviroment and run it using `docker-compose`
+
+In this example we'll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:
 
 ```bash
 docker-compose up -d nginx mysql
@@ -158,21 +166,19 @@ docker-compose up -d nginx mysql
 **Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`.
 
 
-You can select your own combination of Containers form the list below:
-
-`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
+You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images).
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 
 
 <br>
-2 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...)
 
 ```bash
 docker-compose exec workspace bash
 ```
 
-Alternatively, for Windows PowerShell users: execute the following command to enter any running container:
+*Alternatively, for Windows PowerShell users: execute the following command to enter any running container:*
 
 ```bash
 docker exec -it {workspace-container-id} bash
@@ -184,12 +190,12 @@ docker exec -it {workspace-container-id} bash
 docker-compose exec --user=laradock workspace bash
 ```
 
-*You can change the PUID (User id) and PGID (group id) variables from the `docker-compose.yml` or the `.env`)*
+*You can change the PUID (User id) and PGID (group id) variables from the `.env` file)*
 
 <br>
-3 - Edit your project configurations.
+4 - Update your project configurations to use the database host
 
-Open your `.env` file and set the `DB_HOST` to `mysql`:
+Open your PHP project's `.env` file or whichever configuration file you are reading from, and set the database host `DB_HOST` to `mysql`:
 
 ```env
 DB_HOST=mysql
@@ -198,4 +204,6 @@ DB_HOST=mysql
 *If you want to install Laravel as PHP project, see [How to Install Laravel in a Docker Container](#Install-Laravel).*
 
 <br>
-4 - Open your browser and visit your localhost address `http://localhost/`.
+5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.dev/` and `http://project-2.dev/`. But first don't 
+
+

DOCUMENTATION/content/guides/index.md

@@ -1,4 +1,248 @@
-# PHPStorm Debugging Guide
+---
+title: Guides
+type: index
+weight: 4
+---
+
+
+
+* [Production Setup on Digital Ocean](#Digital-Ocean)
+* [PHPStorm XDebug Setup](#PHPStorm-Debugging)
+
+
+
+<a name="Digital-Ocean"></a>
+# Production Setup on Digital Ocean
+
+## Install Docker
+
+- Visit [DigitalOcean](https://cloud.digitalocean.com/login) and login.
+- Click the `Create Droplet` button.
+- Open the `One-click apps` tab.
+- Select Docker with your preferred version.
+- Continue creating the droplet as you normally would.
+- If needed, check your e-mail for the droplet root password.
+
+## SSH to your Server
+
+Find the IP address of the droplet in the DigitalOcean interface. Use it to connect to the server.
+
+```
+ssh root@ipaddress
+```
+
+You may be prompted for a password. Type the one you found within your e-mailbox. It'll then ask you to change the password.
+
+You can now check if Docker is available:
+
+```
+$root@server:~# docker
+```
+
+## Set Up Your Laravel Project
+
+```
+$root@server:~# apt-get install git
+$root@server:~# git clone https://github.com/laravel/laravel
+$root@server:~# cd laravel
+$root@server:~/laravel/ git submodule add https://github.com/LaraDock/laradock.git
+$root@server:~/laravel/ cd laradock
+```
+
+## Install docker-compose command
+
+```
+$root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
+$root@server:~/chmod +x /usr/local/bin/docker-compose
+```
+
+## Create Your LaraDock Containers
+
+```
+$root@server:~/laravel/laradock# docker-compose up -d nginx mysql
+```
+
+Note that more containers are available, find them in the [docs](http://laradock.io/introduction/#supported-software-containers) or the `docker-compose.yml` file.
+
+## Go to Your Workspace
+
+```
+docker-compose exec workspace bash
+```
+
+## Install and configure Laravel
+
+Let's install Laravel's dependencies, add the `.env` file, generate the key and give proper permissions to the cache folder.
+
+```
+$ root@workspace:/var/www# composer install
+$ root@workspace:/var/www# cp .env.example .env
+$ root@workspace:/var/www# php artisan key:generate
+$ root@workspace:/var/www# exit
+$root@server:~/laravel/laradock# cd ..
+$root@server:~/laravel# sudo chmod -R 777 storage bootstrap/cache
+```
+
+You can then view your Laravel site by visiting the IP address of your server in your browser. For example:
+
+```
+http://192.168.1.1
+```
+
+It should show you the Laravel default welcome page.
+
+However, we want it to show up using your custom domain name, as well.
+
+## Using Your Own Domain Name
+
+Login to your DNS provider, such as Godaddy, Namecheap.
+
+Point the Custom Domain Name Server to:
+
+```
+ns1.digitalocean.com
+ns2.digitalocean.com
+ns3.digitalocean.com
+```
+
+Within DigitalOcean, you'll need to change some settings, too.
+
+Visit: https://cloud.digitalocean.com/networking/domains
+
+Add your domain name and choose the server IP you'd provision earlier.
+
+## Serving Site With NGINX (HTTP ONLY)
+
+Go back to command line.
+
+```
+$root@server:~/laravel/laradock# cd nginx
+$root@server:~/laravel/laradock/nginx# vim laravel.conf
+```
+
+Remove `default_server`
+
+```
+    listen 80 default_server;
+    listen [::]:80 default_server ipv6only=on;
+```
+
+And add `server_name` (your custom domain)
+
+```
+    listen 80;
+    listen [::]:80 ipv6only=on;
+    server_name yourdomain.com;
+```
+
+## Rebuild Your Nginx
+
+```
+$root@server:~/laravel/laradock/nginx# docker-compose down
+$root@server:~/laravel/laradock/nginx# docker-compose build nginx
+```
+
+## Re Run Your Containers MYSQL and NGINX
+
+```
+$root@server:~/laravel/laradock/nginx# docker-compose up -d nginx mysql
+```
+
+**View Your Site with HTTP ONLY (http://yourdomain.com)**
+
+## Run Site on SSL with Let's Encrypt Certificate
+
+**Note: You need to Use Caddy here Instead of Nginx**
+
+To go Caddy Folders and Edit CaddyFile
+
+```
+$root@server:~/laravel/laradock# cd caddy
+$root@server:~/laravel/laradock/caddy# vim Caddyfile
+```
+
+Remove 0.0.0.0:80
+
+```
+0.0.0.0:80
+root /var/www/public
+```
+
+and replace with your https://yourdomain.com
+
+```
+https://yourdomain.com
+root /var/www/public
+```
+
+uncomment tls
+
+```
+#tls self-signed
+```
+
+and replace self-signed with your email address
+
+```
+tls serverbreaker@gmai.com
+```
+
+This is needed Prior to Creating Let's Encypt
+
+## Run Your Caddy Container without the -d flag and Generate SSL with Let's Encrypt
+
+```
+$root@server:~/laravel/laradock/caddy# docker-compose up  caddy
+```
+
+You'll be prompt here to enter your email... you may enter it or not
+
+```
+Attaching to laradock_mysql_1, laradock_caddy_1
+caddy_1               | Activating privacy features...
+caddy_1               | Your sites will be served over HTTPS automatically using Let's Encrypt.
+caddy_1               | By continuing, you agree to the Let's Encrypt Subscriber Agreement at:
+caddy_1               |   https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf
+caddy_1               | Activating privacy features... done.
+caddy_1               | https://yourdomain.com
+caddy_1               | http://yourdomain.com
+```
+
+After it finishes, press `Ctrl` + `C` to exit.
+
+## Stop All Containers and ReRun Caddy and Other Containers on Background
+
+```
+$root@server:~/laravel/laradock/caddy# docker-compose down
+$root@server:~/laravel/laradock/caddy# docker-compose up -d mysql caddy
+```
+
+View your Site in the Browser Securely Using HTTPS (https://yourdomain.com)
+
+**Note that Certificate will be Automatically Renew By Caddy**
+
+>References:
+>
+- [https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04)
+- [https://www.digitalocean.com/products/one-click-apps/docker/](https://www.digitalocean.com/products/one-click-apps/docker/)
+- [https://docs.docker.com/engine/installation/linux/ubuntulinux/](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
+- [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
+- [https://caddyserver.com/docs/automatic-https](https://caddyserver.com/docs/automatic-https)
+- [https://caddyserver.com/docs/tls](https://caddyserver.com/docs/tls)
+- [https://caddyserver.com/docs/caddyfile](https://caddyserver.com/docs/caddyfile)
+
+
+
+
+
+<br>
+<br>
+<br>
+<br>
+<br>
+
+<a name="PHPStorm-Debugging"></a>
+# PHPStorm XDebug Setup
 
 - [Intro](#Intro)
 - [Installation](#Installation)
@@ -51,7 +295,7 @@ Your PHPStorm will need to be able to receive a connection from PHP xdebug eithe
 ### Edit laradock/docker-compose.yml
 Set the following variables:
 ```
-### Workspace Utilities Container ###########################
+### Workspace Utilities Container ###############
 
     workspace:
         build:
@@ -62,7 +306,7 @@ Set the following variables:
                 ...
 
 
-### PHP-FPM Container #######################################
+### PHP-FPM Container #####################
 
     php-fpm:
         build:
@@ -140,7 +384,7 @@ alias dcleanlaradock=dcleanlaradockfunction
 ```
 
 <a name="InstallLaraDockDialTone"></a>
-#### Let's get a dial-tone with Laravel
+## Let's get a dial-tone with Laravel
 
 ```
 # barebones at this point
@@ -163,7 +407,7 @@ laradock_workspace_1        /sbin/my_init                 Up       0.0.0.0:2222-
 ```
 
 <a name="enablePhpXdebug"></a>
-#### Enable xDebug on php-fpm
+## Enable xDebug on php-fpm
 In a host terminal sitting in the laradock folder, run: `./xdebugPhpFpm status`
 You should see something like the following:
 ```
@@ -181,7 +425,7 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will
 
 
 <a name="InstallPHPStormConfigs"></a>
-#### PHPStorm Settings
+## PHPStorm Settings
 - Here are some settings that are known to work:
     - `Settings/BuildDeploymentConnection`
         - ![Settings/BuildDeploymentConnection](photos/PHPStorm/Settings/BuildDeploymentConnection.png)
@@ -274,7 +518,7 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will
 
 
 <a name="SSHintoWorkspace"></a>
-#### Let's shell into workspace
+## Let's shell into workspace
 Assuming that you are in laradock folder, type:
 `ssh -i workspace/insecure_id_rsa -p2222 root@laravel`
 **Cha Ching!!!!**
@@ -285,7 +529,7 @@ Assuming that you are in laradock folder, type:
 
 <a name="InstallKiTTY"></a>
 
-##### KiTTY
+### KiTTY
 [Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
 
 - Here are some settings that are working for me:

DOCUMENTATION/content/introduction/index.md

@@ -4,18 +4,21 @@ type: index
 weight: 1
 ---
 
-Laradock strives to make the PHP development experience easier and faster.
-
-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 machines.
-
-Laradock is configured to run Laravel Apps by default, and it can be modified to run all kinds of PHP Apps (Symfony, CodeIgniter, WordPress, Drupal...).
 
 
 
+A full PHP development environment for Docker.
+
+Includes pre-packaged Docker Images, all pre-configured to provide a wonderful PHP development environment.
+
+Laradock is well known in the Laravel community, as the project started with single focus on running Laravel projects on Docker. Later and due to the large adoption from the PHP community, it started supporting other PHP projects like Symfony, CodeIgniter, WordPress, Drupal...
+
+
+![](https://s19.postimg.org/jblfytw9f/laradock-logo.jpg)
 
 ## Quick Overview
 
-Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `beanstalkd`:
+Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `Beanstalkd`:
 
 1 - Clone Laradock inside your PHP project:
 
@@ -35,7 +38,7 @@ cp env-example .env
 docker-compose up -d nginx mysql redis beanstalkd
 ```
 
-3 - Open your project's `.env` file and set the following:
+4 - Open your project's `.env` file and set the following:
 
 ```shell
 DB_HOST=mysql
@@ -43,7 +46,7 @@ REDIS_HOST=redis
 QUEUE_HOST=beanstalkd
 ```
 
-4 - Open your browser and visit localhost: `http://localhost`.
+5 - Open your browser and visit localhost: `http://localhost`.
 
 ```shell
 That's it! enjoy :)
@@ -52,6 +55,63 @@ That's it! enjoy :)
 
 
 
+<a name="features"></a>
+## Features
+
+- Easy switch between PHP versions: 7.1, 7.0, 5.6...
+- Choose your favorite database engine: MySQL, Postgres, MariaDB...
+- Run your own combination of software: Memcached, HHVM, Beanstalkd...
+- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
+- Easy to customize any container, with simple edit to the `Dockerfile`.
+- All Images extends from an official base Image. (Trusted base Images).
+- Pre-configured NGINX to host any code at your root directory.
+- Can use Laradock per project, or single Laradock for all projects.
+- Easy to install/remove software's in Containers using environment variables.
+- Clean and well structured Dockerfiles (`Dockerfile`).
+- Latest version of the Docker Compose file (`docker-compose`).
+- Everything is visible and editable.
+- Fast Images Builds.
+- More to come every week..
+
+
+
+
+<a name="Supported-Containers"></a>
+## Supported Software (Images)
+
+In adhering to the separation of concerns principle as promoted by Docker, Laradock runs each software on its own Container.
+You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
+
+- **Database Engines:**
+MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.
+- **Cache Engines:**
+Redis - Memcached - Aerospike
+- **PHP Servers:**
+NGINX - Apache2 - Caddy
+- **PHP Compilers:**
+PHP FPM - HHVM
+- **Message Queuing:**
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker
+- **Tools:**
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog...
+
+Laradock introduces the **Workspace** Image, as a development environment.
+It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose.
+
+**Workspace Image Tools**
+PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn - SOAP - Drush...
+
+You can choose, which tools to install in your workspace container and other containers, from the `.env` file.
+
+
+> If you modify `docker-compose.yml`, `.env` or any `dockerfile` file, you must re-build your containers, to see those effects in the running instance.
+
+
+
+If you can't find your Software in the list, build it yourself and sumit it. Contributions are welcomed :)
+
+
+
 
 
 
@@ -81,31 +141,12 @@ Most importantly Docker can run on Development and on Production (same environme
 
 
 
-<a name="laradock-vs-homestead"></a>
-## Laradock VS Homestead (For Laravel Developers)
-
-> Laradock It's like Laravel Homestead but for Docker instead of Vagrant.
-
-Laradock and [Homestead](https://laravel.com/docs/master/homestead) both give you complete virtual development environments. (Without the need to install and configure every single software on your own Operating System).
-
-- 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 & Docker Compose official commands). And Docker manages your Virtual Containers.
-
-Running a virtual container is much faster than running a full virtual Machine. Thus **Laradock is much faster than Homestead**.
-
-
-
-
-
-
-
-
 <a name="Demo"></a>
 ## Demo Video
 
 What's better than a **Demo Video**:
 
+- Laradock v5.* (soon or never)
 - Laradock [v4.*](https://www.youtube.com/watch?v=TQii1jDa96Y)
 - Laradock [v2.*](https://www.youtube.com/watch?v=-DamFMczwDA)
 - Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
@@ -117,87 +158,6 @@ What's better than a **Demo Video**:
 
 
 
-<a name="features"></a>
-## Features
-
-- Easy switch between PHP versions: 7.0, 5.6, 5.5...
-- Choose your favorite database engine: MySQL, Postgres, MariaDB...
-- Run your own combination of software: Memcached, HHVM, Beanstalkd...
-- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
-- Easy to customize any container, with simple edit to the `Dockerfile`.
-- All Images extends from an official base Image. (Trusted base Images).
-- Pre-configured NGINX for Laravel.
-- Easy to apply configurations inside containers.
-- Clean and well structured Dockerfiles (`Dockerfile`).
-- Latest version of the Docker Compose file (`docker-compose`).
-- Everything is visible and editable.
-- Fast Images Builds.
-- More to come every week..
-
-
-
-
-
-
-
-<a name="Supported-Containers"></a>
-## Supported Software (Containers)
-
-- **Database Engines:**
-	- MySQL
-	- MariaDB
-	- MongoDB
-	- Neo4j
-	- RethinkDB
-	- PostgreSQL
-	- Postgres Postgis
-- **Cache Engines:**
-	- Redis
-	- Memcached
-	- Aerospike
-- **PHP Servers:**
-	- NGINX
-	- Apache2
-	- Caddy
-- **PHP Compilers:**
-	- PHP-FPM
-	- HHVM
-- **Message Queuing Systems:**
-	- Beanstalkd
-	- Beanstalkd Console
-	- RabbitMQ
-	- RabbitMQ Console
-- **Tools:**
-	- PhpMyAdmin
-	- PgAdmin
-	- ElasticSearch
-	- Selenium
-	- Certbot
-	- Mailhog
-	- Minio
-	- Workspace
-		- PHP7-CLI
-		- Composer
-		- Git
-		- Linuxbrew
-		- Node
-		- Gulp
-		- SQLite
-		- xDebug
-		- Envoy
-		- Deployer
-		- Vim
-		- Yarn
-		- ... Many other supported tools are not documented. (Will be updated soon)
-
->If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :)
-
-
-
-
-
-
-
 <a name="Chat"></a>
 ## Chat with us
 

DOCUMENTATION/content/license/index.md

@@ -1,7 +1,7 @@
 ---
 title: License
 type: index
-weight: 7
+weight: 8
 ---
 
 [MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)

DOCUMENTATION/content/related-projects/index.md

@@ -1,7 +1,7 @@
 ---
 title: Related Projects
 type: index
-weight: 4
+weight: 6
 ---
 
 Laradock related projects:

DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html

@@ -1,11 +1,11 @@
 <nav aria-label="Navigation">
-  <!--<a href="{{ with .Site.Params.repo_url }}{{ . }}{{ else }}{{ .Site.BaseURL }}{{ end }}" class="project">-->
-    <!--<div class="banner">-->
-      <!--{{ with .Site.Params.logo }}-->
-        <!--<div class="logo">-->
-          <!--<img src="{{ $.Site.BaseURL }}{{ . }}">-->
-        <!--</div>-->
-      <!--{{ end }}-->
+  <a href="{{ with .Site.Params.repo_url }}{{ . }}{{ else }}{{ .Site.BaseURL }}{{ end }}" class="project">
+    <div class="banner">
+      {{ with .Site.Params.logo }}
+        <div class="logo">
+          <img src="{{ $.Site.BaseURL }}{{ . }}">
+        </div>
+      {{ end }}
       <!--<div class="name">-->
         <!--<strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>-->
         <!--{{ with .Scratch.Get "repo_id" }}-->
@@ -13,8 +13,8 @@
           <!--{{ . }}-->
         <!--{{ end }}-->
       <!--</div>-->
-    <!--</div>-->
-  <!--</a>-->
+    </div>
+  </a>
 
   <div class="scrollable">
     <div class="wrapper">

DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css

@@ -3,7 +3,7 @@
  * theme that is used as fallback in codeblocks 
  */
 .article pre code {
-	color: rgba(0, 0, 0, 0.8) !important;
+	color: rgba(0, 0, 0, 0.78) !important;
 }
 
 
@@ -103,3 +103,14 @@ font-style:italic;
 .hljs-strong {
 font-weight:700;
 }
+
+/*
+    OVERRIDING THE DEFAULT STYLES - By Mahmoud Zalt (mahmoud@zalt.me) for Laradock.io
+*/
+
+.project .logo img{
+    width: 140px;
+    height: 140px;
+    background: transparent;
+    border-radius: 0%;
+}

README-zh.md

@@ -4,14 +4,13 @@
 
 [![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
-<br>
-就像Laravel Homestead一样，但是Docker替换了Vagrant。
+LaraDock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。
+
+就像 Laravel Homestead 一样，但是 Docker 替换了 Vagrant。
+
 > 先在使用 LaraDock，然后再学习它们。
 
-<br>
 ## 目录
-
 - [Intro](#Intro)
 	- [Features](#features)
 	- [Supported Software's](#Supported-Containers)
@@ -54,40 +53,44 @@ LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
 - [Help & Questions](#Help)
 
 
-
 <a name="Intro"></a>
 ## 介绍
-LaraDock努力简化创建开发环境过程。
-它包含预包装Docker镜像，提供你一个美妙的开发环境而不需要安装PHP,NGINX,MySQL和其他任何软件在你本地机器上。
+
+LaraDock 努力简化创建开发环境过程。
+它包含预包装 Docker 镜像，提供你一个美妙的开发环境而不需要安装 PHP, NGINX, MySQL 和其他任何软件在你本地机器上。
 
 **使用概览：**
 
+让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`，然后运行 `Laravel`
 
-让我们了解使用它安装`NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`，然后运行`Laravel`
+1. 将 LaraDock 放到你的 Laravel 项目中：
 
-1. 将LaraDock放到你的Laravel项目中：
-<br>
-`git clone https://github.com/laradock/laradock.git`.
-2. 进入LaraDock目录，然后运行这些容器。
-<br>
-`docker-compose up -d nginx mysql redis`
-3. 打开你的`.env`文件，然后设置`mysql`的`DB_HOST` 和  `redis`的`REDIS_HOST`。
-4. 打开浏览器，访问localhost：
+```bash
+git clone https://github.com/laradock/laradock.git
+```
 
+2. 进入 LaraDock 目录，然后运行这些容器。
+
+```bash
+docker-compose up -d nginx mysql redis
+```
+
+3. 打开你的 `.env` 文件，然后设置 `mysql` 的 `DB_HOST` 和  `redis` 的`REDIS_HOST`。
+
+4. 打开浏览器，访问 localhost：
 
 <a name="features"></a>
 ### 特点
 
-- 在PHP版本：7.0，5.6.5.5...之中可以简单切换。
+- 在 PHP 版本：7.0，5.6.5.5...之中可以简单切换。
 - 可选择你最喜欢的数据库引擎，比如：MySQL, Postgres, MariaDB...
 - 可运行自己的软件组合，比如：Memcached, HHVM, Beanstalkd...
 - 所有软件运行在不同的容器之中，比如：PHP-FPM, NGINX, PHP-CLI...
-- 通过简单的编写`dockerfile`容易定制任何容器。
+- 通过简单的编写 `Dockerfile` 容易定制任何容器。
 - 所有镜像继承自一个官方基础镜像（Trusted base Images）
 - 可预配置Laravel的Nginx环境
-- 容易应用容器中的配置
-- 干净的结构化的Docker配置文件（`dockerfile`）
-- 最新的Docker Compose 版本（`docker-compose`）
+- 容易应用容器中的配置 配置文件（`Dockerfile`）
+- 最新的 Docker Compose 版本（`docker-compose`）
 - 所有的都是可视化和可编辑的
 - 快速的镜像构建
 - 每周都会有更新...
@@ -115,39 +118,37 @@ LaraDock努力简化创建开发环境过程。
 	- Beanstalkd (+ Beanstalkd Console)
 - **工具:**
 	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
+
 >如果你找不到你需要的软件，构建它然后把它添加到这个列表。你的贡献是受欢迎的。
 
 <a name="what-is-docker"></a>
-### Docker是什么?
+### Docker 是什么?
 
-[Docker](https://www.docker.com) 是一个开源项目,自动化部署应用程序软件的容器,在Linux, Mac OS and Windows提供一个额外的抽象层和自动化的[操作系统级的虚拟化](https://en.wikipedia.org/wiki/Operating-system-level_virtualization)
+[Docker](https://www.docker.com) 是一个开源项目,自动化部署应用程序软件的容器,在 Linux, Mac OS and Windows 提供一个额外的抽象层和自动化的[操作系统级的虚拟化](https://en.wikipedia.org/wiki/Operating-system-level_virtualization)
 
 <a name="what-is-laravel"></a>
-### Laravel是什么?
+### Laravel 是什么?
 
 额，这很认真的!!!
 
-
 <a name="why-docker-not-vagrant"></a>
-### 为什么使用Docker而不是Vagrant!?
+### 为什么使用 Docker 而不是 Vagrant!?
 
-[Vagrant](https://www.vagrantup.com)构建虚拟机需要几分钟然而Docker构建虚拟容器只需要几秒钟。
-而不是提供一个完整的虚拟机,就像你用Vagrant,Docker为您提供**轻量级**虚拟容器,共享相同的内核和允许安全执行独立的进程。
+[Vagrant](https://www.vagrantup.com) 构建虚拟机需要几分钟然而 Docker 构建虚拟容器只需要几秒钟。
+而不是提供一个完整的虚拟机,就像你用 Vagrant, Docker 为您提供**轻量级**虚拟容器,共享相同的内核和允许安全执行独立的进程。
 
-除了速度,Docker提供大量的Vagrant无法实现的功能。
+除了速度, Docker 提供大量的 Vagrant 无法实现的功能。
 
-最重要的是Docker可以运行在开发和生产(相同环境无处不在)。Vagrant是专为开发,(所以在生产环境你必须每一次重建您的服务器)。
+最重要的是 Docker 可以运行在开发和生产(相同环境无处不在)。Vagrant 是专为开发,(所以在生产环境你必须每一次重建您的服务器)。
 
 <a name="laradock-vs-homestead"></a>
 ### LaraDock Homestead 对比
 
 LaraDock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。
 
-Homestead 是一个工具,为你控制虚拟机(使用Homestead特殊命令)。Vagrant可以管理你的管理虚容器。
-
-运行一个虚拟容器比运行一整个虚拟机快多了**LaraDock 比 Homestead快多了**
-
+Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令)。Vagrant 可以管理你的管理虚容器。
 
+运行一个虚拟容器比运行一整个虚拟机快多了 **LaraDock 比 Homestead 快多了**
 
 <a name="Demo"></a>
 ## 演示视频
@@ -158,53 +159,41 @@ Homestead 是一个工具,为你控制虚拟机(使用Homestead特殊命令)。V
 - LaraDock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
 - LaraDock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
 
-
-
 <a name="Requirements"></a>
 ## 依赖
 
 - [Git](https://git-scm.com/downloads)       
 - [Docker](https://www.docker.com/products/docker/)
 
-
-
 <a name="Installation"></a>
 ## 安装
 
-
 1 - 克隆 `LaraDock` 仓库:
 
-**A)** 如果你已经有一个Laravel项目,克隆这个仓库在到`Laravel`根目录
+**A)** 如果你已经有一个 Laravel 项目,克隆这个仓库在到 `Laravel` 根目录
 
 ```bash
 git submodule add https://github.com/laradock/laradock.git
 ```
->如果你不是使用Git管理Laravel项目,您可以使用 `git clone` 而不是`git submodule`。
 
+>如果你不是使用 Git 管理 Laravel 项目,您可以使用 `git clone` 而不是 `git submodule`。
 
-**B)** 如果你没有一个Laravel项目,你想Docker安装Laravel,克隆这个源在您的机器任何地方上:
+**B)** 如果你没有一个 Laravel 项目,你想 Docker 安装 Laravel,克隆这个源在您的机器任何地方上:
 
 ```bash
 git clone https://github.com/laradock/laradock.git
 ```
 
-
-
 <a name="Usage"></a>
 ## 使用
 
-
 **请在开始之前阅读:**
-如果你正在使用**Docker Toolbox** (VM)，选择以下任何一个方法：
-- 更新到Docker [Native](https://www.docker.com/products/docker) Mac/Windows版本 (建议). 查看 [Upgrading LaraDock](#upgrading-laradock)
+如果你正在使用 **Docker Toolbox** (VM)，选择以下任何一个方法：
+- 更新到 Docker [Native](https://www.docker.com/products/docker) Mac/Windows 版本 (建议). 查看 [Upgrading LaraDock](#upgrading-laradock)
 - 使用 LaraDock v3.* (访问 `LaraDock-ToolBox` [分支](https://github.com/laradock/laradock/tree/LaraDock-ToolBox)).
-如果您使用的是**Docker Native**(Mac / Windows版本)甚至是Linux版本,通常可以继续阅读这个文档，LaraDock v4以上版本将仅支持**Docker Native**。
-
-<br>
-<br>
-1 - 运行容器: *(在运行`docker-compose`命令之前，确认你在 `laradock` 目录中*
-
+如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档，LaraDock v4 以上版本将仅支持 **Docker Native**。
 
+1 - 运行容器: *(在运行 `docker-compose` 命令之前，确认你在 `laradock` 目录中*
 
 **例子:** 运行 NGINX 和 MySQL:
 
@@ -213,77 +202,50 @@ docker-compose up -d  nginx mysql
 ```
 你可以从以下列表选择你自己的容器组合：
 
-
 `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
 
-
 **说明**: `workspace` 和 `php-fpm` 将运行在大部分实例中, 所以不需要在 `up` 命令中加上它们.
 
-
-
-<br>
 2 - 进入 Workspace 容器, 执行像 (Artisan, Composer, PHPUnit, Gulp, ...)等命令
 
 ```bash
 docker-compose exec workspace bash
 ```
-<br />
+
 增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件. (你可以从 `docker-compose.yml`修改 PUID (User id) 和 PGID (group id) 值 ).
 
-
-
-<br>
 3 - 编辑 Laravel 的配置.
 
-如果你还没有安装Laravel项目，请查看 [How to Install Laravel in a Docker Container](#Install-Laravel).
+如果你还没有安装 Laravel 项目，请查看 [How to Install Laravel in a Docker Container](#Install-Laravel).
 
-打开 Laravel的 `.env` 文件 然后 配置 你的`mysql`的`DB_HOST`:
+打开 Laravel 的 `.env` 文件 然后 配置 你的 `mysql` 的 `DB_HOST`:
 
 ```env
 DB_HOST=mysql
 ```
 
+4 - 打开浏览器访问 localhost (`http://localhost/`).
 
-
-
-
-<br>
-4 - 打开浏览器访问localhost (`http://localhost/`).
-
-
-
-<br>
 **调试**: 如果你碰到任何问题，请查看 [调试](#debugging) 章节
 如果你需要特别支持，请联系我，更多细节在[帮助 & 问题](#Help)章节
 
-
-<br>
 <a name="Documentation"></a>
 ## 文档
 
-
 <a name="Docker"></a>
 ### [Docker]
 
-
-
 <a name="List-current-running-Containers"></a>
 ### 列出正在运行的容器
 ```bash
 docker ps
 ```
+
 你也可以使用以下命令查看某项目的容器
-
-
 ```bash
 docker-compose ps
 ```
 
-
-
-
-
-<br>
 <a name="Close-all-running-Containers"></a>
 ### 关闭所有容器
 ```bash
@@ -296,25 +258,18 @@ docker-compose stop
 docker-compose stop {容器名称}
 ```
 
-<br>
 <a name="Delete-all-existing-Containers"></a>
 ### 删除所有容器
 ```bash
 docker-compose down
 ```
 
-
 小心这个命令,因为它也会删除你的数据容器。(如果你想保留你的数据你应该在上述命令后列出容器名称删除每个容器本身):*
 
-
-
-
-
-<br>
 <a name="Enter-Container"></a>
-### 进入容器 (通过SSH 进入一个运行中的容器)
+### 进入容器 (通过 SSH 进入一个运行中的容器)
 
-1 - 首先使用 `docker ps`命令查看正在运行的容器
+1 - 首先使用 `docker ps` 命令查看正在运行的容器
 
 2 - 进入某个容器使用:
 
@@ -331,12 +286,6 @@ docker-compose exec mysql bash
 3 - 退出容器, 键入 `exit`.
 
 
-
-
-
-
-
-<br>
 <a name="Edit-Container"></a>
 ### 编辑默认容器配置
 打开 `docker-compose.yml` 然后 按照你想的修改.
@@ -357,18 +306,10 @@ docker-compose exec mysql bash
     - "1111:6379"
 ```
 
-
-
-
-
-
-
-
-<br>
 <a name="Edit-a-Docker-Image"></a>
-### 编辑Docker镜像
+### 编辑 Docker 镜像
 
-1 - 找到你想修改的镜像的 `dockerfile` ,
+1 - 找到你想修改的镜像的 `Dockerfile` ,
 <br>
 例如： `mysql` 在 `mysql/Dockerfile`.
 
@@ -379,28 +320,19 @@ docker-compose exec mysql bash
 ```bash
 docker-compose build mysql
 ```
-更多信息在容器重建中 [点击这里](#Build-Re-build-Containers).
 
+更多信息在容器重建中[点击这里](#Build-Re-build-Containers).
 
-
-
-
-
-
-
-<br>
 <a name="Build-Re-build-Containers"></a>
 ### 建立/重建容器
 
-
-如果你做任何改变`dockerfile`确保你运行这个命令,可以让所有修改更改生效:
-
+如果你做任何改变 `Dockerfile` 确保你运行这个命令,可以让所有修改更改生效:
 
 ```bash
 docker-compose build
 ```
-选择你可以指定哪个容器重建(而不是重建所有的容器):
 
+选择你可以指定哪个容器重建(而不是重建所有的容器):
 
 ```bash
 docker-compose build {container-name}
@@ -408,25 +340,11 @@ docker-compose build {container-name}
 
 如果你想重建整个容器，你可能需要使用 `--no-cache` 选项  (`docker-compose build --no-cache {container-name}`).
 
-
-
-
-
-<br>
 <a name="Add-Docker-Images"></a>
 ### 增加更多软件 (Docker 镜像)
 
 为了增加镜像（软件）, 编辑 `docker-compose.yml` 添加容器细节， 你需要熟悉 [docker compose 文件语法](https://docs.docker.com/compose/compose-file/).
 
-
-
-
-
-
-
-
-
-<br>
 <a name="View-the-Log-files"></a>
 ### 查看日志文件
 Nginx的日志在 `logs/nginx` 目录
@@ -437,19 +355,12 @@ Nginx的日志在 `logs/nginx` 目录
 docker logs {container-name}
 ```
 
-
-
-
-
-<br>
 <a name="Laravel"></a>
 ### [Laravel]
 
-
-
-
 <a name="Install-Laravel"></a>
-### 从Docker镜像安装Laravel
+### 从 Docker 镜像安装 Laravel
+
 1 - 首先你需要进入 Workspace 容器.
 
 2 - 安装 Laravel.
@@ -460,16 +371,15 @@ docker logs {container-name}
 composer create-project laravel/laravel my-cool-app "5.2.*"
 ```
 
-> 我们建议使用 `composer create-project` 替换Laravel 安装器去安装Laravel.
+> 我们建议使用 `composer create-project` 替换 Laravel 安装器去安装 Laravel.
 
-关于更多Laravel安装内容请 [点击这儿](https://laravel.com/docs/master#installing-laravel).
+关于更多 Laravel 安装内容请 [点击这儿](https://laravel.com/docs/master#installing-laravel).
 
 
 3 - 编辑 `docker-compose.yml` 映射新的应用目录:
-系统默认LaraDock假定Laravel应用在LaraDock的父级目录中
-By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
+系统默认 LaraDock 假定 Laravel 应用在 laradock 的父级目录中
 
-更新Laravel应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
+更新 Laravel 应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
 
 ```yaml
     application:
@@ -477,32 +387,33 @@ By default LaraDock assumes the Laravel application is living in the parent dire
         volumes:
             - ../my-cool-app/:/var/www
 ```
+
 4 - 进入目录下继续工作..
 
 ```bash
 cd my-cool-app
 ```
 
-5 - 回到LaraDock安装步骤,看看如何编辑`env`的文件。
+5 - 回到 LaraDock 安装步骤,看看如何编辑 `.env` 的文件。
 
-<br>
 <a name="Run-Artisan-Commands"></a>
 ### 运行 Artisan 命令
-你可以从Workspace容器运行artisan命令和其他终端命令
 
-1 - 确认Workspace容器已经运行.
+你可以从 Workspace 容器运行 artisan 命令和其他终端命令
+
+1 - 确认 Workspace 容器已经运行.
 
 ```bash
 docker-compose up -d workspace // ..and all your other containers
 ```
 
-2 - 找到Workspace容器名称:
+2 - 找到 Workspace 容器名称:
 
 ```bash
 docker-compose ps
 ```
 
-3 - 进入Workspace容器:
+3 - 进入 Workspace 容器:
 
 ```bash
 docker-compose exec workspace bash
@@ -510,35 +421,33 @@ docker-compose exec workspace bash
 
 增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件.
 
-
 4 - 运行任何你想的 :)
 
 ```bash
 php artisan
 ```
 ```bash
-Composer update
+composer update
 ```
 ```bash
 phpunit
 ```
 
-<br>
 <a name="Use-Redis"></a>
 ### 使用 Redis
-1 - 首先务必用 `docker-compose up` 命令运行 (`redis`)容器.
-
+1 - 首先务必用 `docker-compose up` 命令运行 (`redis`) 容器.
 
 ```bash
 docker-compose up -d redis
 ```
 
-2 - 打开你的Laravel的 `.env` 文件 然后 配置`redis`的`REDIS_HOST`
+2 - 打开你的Laravel的 `.env` 文件 然后 配置 `redis` 的 `REDIS_HOST`
 
 ```env
 REDIS_HOST=redis
 ```
-如果在你的`.env` 文件没有找到`REDIS_HOST`变量。打开数据库配置文件`config/database.php`然后用`redis`替换默认IP`127.0.0.1`，例如：
+
+如果在你的 `.env` 文件没有找到 `REDIS_HOST` 变量。打开数据库配置文件 `config/database.php` 然后用 `redis` 替换默认 IP `127.0.0.1`，例如：
 
 
 ```php
@@ -552,44 +461,35 @@ REDIS_HOST=redis
 ],
 ```
 
-3 - 启用Redis缓存或者开启Session管理也在`.env`文件中用`redis`替换默认`file`设置`CACHE_DRIVER` 和 `SESSION_DRIVER` 
+3 - 启用 Redis 缓存或者开启 Session 管理也在 `.env` 文件中用 `redis` 替换默认 `file` 设置 `CACHE_DRIVER` 和 `SESSION_DRIVER` 
 
 ```env
 CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 ```
 
-4 - 最好务必通过Compose安装 `predis/predis` 包 `(~1.0)`:
+4 - 最好务必通过 Composer 安装 `predis/predis` 包 `(~1.0)`:
 
 ```bash
 composer require predis/predis:^1.0
 ```
 
-5 - 你可以用以下代码在Laravel中手动测试：
+5 - 你可以用以下代码在 Laravel 中手动测试：
 
 ```php
 \Cache::store('redis')->put('LaraDock', 'Awesome', 10);
 ```
 
-
-
-
-
-<br>
 <a name="Use-Mongo"></a>
 ### 使用 Mongo
 
-1 - 首先在Workspace和PHP-FPM容器中安装`mongo`:
-<br>
-a) 打开 `docker-compose.yml` 文件
-<br>
-b) 在Workspace容器中找到`INSTALL_MONGO`选项：
+1 - 首先在 Workspace 和 PHP-FPM 容器中安装 `mongo`:
 
-<br>
-c) 设置为 `true`
-<br>
-d) 在PHP-FPM容器中找到`INSTALL_MONGO` <br>
-e) 设置为 `true`
+    a) 打开 `docker-compose.yml` 文件
+    b) 在 Workspace 容器中找到 `INSTALL_MONGO` 选项：
+    c) 设置为 `true`
+    d) 在 PHP-FPM 容器中找到 `INSTALL_MONGO`
+    e) 设置为 `true`
 
 相关配置项如下:
 
@@ -608,18 +508,19 @@ e) 设置为 `true`
     ...
 ```
 
-2 - 重建`Workspace、PHP-FPM`容器 `docker-compose build workspace php-fpm`
+2 - 重建 `Workspace、PHP-FPM` 容器
 
+```bash
+docker-compose build workspace php-fpm
+```
 
-
-3 - 使用`docker-compose up` 命令运行MongoDB容器 (`mongo`)
+3 - 使用 `docker-compose up` 命令运行 MongoDB 容器 (`mongo`)
 
 ```bash
 docker-compose up -d mongo
 ```
 
-
-4 - 在`config/database.php` 文件添加MongoDB的配置项:
+4 - 在 `config/database.php` 文件添加 MongoDB 的配置项:
 
 ```php
 'connections' => [
@@ -641,65 +542,53 @@ docker-compose up -d mongo
 ],
 ```
 
-5 - 打开Laravel的 `.env` 文件 然后 更新以下字段:
+5 - 打开 Laravel 的 `.env` 文件然后更新以下字段:
 
-- 设置 `DB_HOST` 为 `mongo`的主机IP.
+- 设置 `DB_HOST` 为 `mongo` 的主机 IP.
 - 设置 `DB_PORT` 为 `27017`.
 - 设置 `DB_DATABASE` 为 `database`.
 
 
-6 - 最后务必通过Composer安装`jenssegers/mongodb`包，添加服务提供者（Laravel Service Provider）
+6 - 最后务必通过 Composer 安装 `jenssegers/mongodb` 包，添加服务提供者（Laravel Service Provider）
 
 
 ```bash
 composer require jenssegers/mongodb
 ```
+
 更多细节内容 [点击这儿](https://github.com/jenssegers/laravel-mongodb#installation).
 
 7 - 测试:
 
-- 首先让你的模型继承Mongo的Eloquent Model. 查看 [文档](https://github.com/jenssegers/laravel-mongodb#eloquent).
-- 进入Workspace容器.
+- 首先让你的模型继承 Mongo 的 Eloquent Model. 查看 [文档](https://github.com/jenssegers/laravel-mongodb#eloquent).
+- 进入 Workspace 容器.
 - 迁移数据库 `php artisan migrate`.
 
-
-
-
-
-
-<br>
 <a name="PHP"></a>
 ### [PHP]
 
-
-
-
-
-
 <a name="Install-PHP-Extensions"></a>
-### 安装PHP拓展
-安装PHP扩展之前,你必须决定你是否需要`FPM`或`CLI`,因为他们安装在不同的容器上,如果你需要两者,则必须编辑两个容器。
+### 安装 PHP 拓展
 
-PHP-FPM拓展务必安装在 `php-fpm/Dockerfile-XX`. *(用你PHP版本号替换 XX)*.
-<br>
-PHP-CLI拓展应该安装到`workspace/Dockerfile`.
+安装 PHP 扩展之前,你必须决定你是否需要 `FPM` 或 `CLI`,因为他们安装在不同的容器上,如果你需要两者,则必须编辑两个容器。
 
+PHP-FPM 拓展务必安装在 `php-fpm/Dockerfile-XX`. *(用你 PHP 版本号替换 XX)*.
+
+PHP-CLI 拓展应该安装到 `workspace/Dockerfile`.
 
-<br>
 <a name="Change-the-PHP-FPM-Version"></a>
-### 修改PHP-FPM版本
-默认运行**PHP-FPM 7.0**版本.
-
->PHP-FPM负责服务你的应用代码,如果你是计划运行您的应用程序在不同PHP-FPM版本上，则不需要更改PHP-CLI版本。
+### 修改 PHP-FPM 版本
+默认运行 **PHP-FPM 7.0** 版本.
 
+>PHP-FPM 负责服务你的应用代码,如果你是计划运行您的应用程序在不同 PHP-FPM 版本上，则不需要更改 PHP-CLI 版本。
 
 #### A) 切换版本 PHP `7.0` 到 PHP `5.6`
 
 1 - 打开 `docker-compose.yml`。
 
-2 - 在PHP容器的 `Dockerfile-70`文件。
+2 - 在PHP容器的 `Dockerfile-70` 文件。
 
-3 - 修改版本号, 用`Dockerfile-56`替换 `Dockerfile-70` , 例如:
+3 - 修改版本号, 用 `Dockerfile-56` 替换 `Dockerfile-70` , 例如:
 
 ```txt
 php-fpm:
@@ -718,57 +607,39 @@ docker-compose build php
 
 
 #### B) 切换版本 PHP `7.0` 或 `5.6` 到 PHP `5.5`
-我们已不在本地支持PHP5.5，但是你按照以下步骤获取：
+我们已不在本地支持 PHP5.5，但是你按照以下步骤获取：
 
 1 - 克隆 `https://github.com/laradock/php-fpm`.
 
-3 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
+2 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
 
 3 - 编辑文件 `FROM php:5.6-fpm` 为 `FROM php:5.5-fpm`.
 
-4 - 从 `Dockerfile-55`构建镜像.
+4 - 从 `Dockerfile-55` 构建镜像.
 
 5 - 打开 `docker-compose.yml` 文件.
 
 6 - 将 `php-fpm` 指向你的 `Dockerfile-55` 文件.
 
 
-
-
-
-
-
-
-
-
-
-
-<br>
 <a name="Change-the-PHP-CLI-Version"></a>
 ### 修改 PHP-CLI 版本
-默认运行**PHP-CLI 7.0**版本
+默认运行 **PHP-CLI 7.0** 版本
 
->说明: PHP-CLI只用于执行Artisan和Composer命令，不服务于你的应用代码，这是PHP-FPM的工作，所以编辑PHP-CLI的版本不是很重要。
-PHP-CLI安装在Workspace容器，改变PHP-CLI版本你需要编辑`workspace/Dockerfile`.
-现在你必须手动修改PHP-FPM的`Dockerfile`或者创建一个新的。 (可以考虑贡献功能).
+>说明: PHP-CLI 只用于执行 Artisan 和 Composer 命令，不服务于你的应用代码，这是 PHP-FPM 的工作，所以编辑 PHP-CLI 的版本不是很重要。
+PHP-CLI 安装在 Workspace 容器，改变 PHP-CLI 版本你需要编辑 `workspace/Dockerfile`.
+现在你必须手动修改 PHP-FPM 的 `Dockerfile` 或者创建一个新的。 (可以考虑贡献功能).
 
-
-
-
-<br>
 <a name="Install-xDebug"></a>
 ### 安装 xDebug
 
-1 - 首先在Workspace和PHP-FPM容器安装 `xDebug`:
-<br>
-a) 打开 `docker-compose.yml` 文件
-<br>
-b) 在Workspace容器中找到 `INSTALL_XDEBUG` 选项
-<br>
-c) 改为 `true`
-<br>
-d) 在PHP-FPM容器中找到 `INSTALL_XDEBUG ` 选项<br>
-e) 改为 `true`
+1 - 首先在 Workspace 和 PHP-FPM 容器安装 `xDebug`:
+
+    a) 打开 `docker-compose.yml` 文件
+    b) 在 Workspace 容器中找到 `INSTALL_XDEBUG` 选项
+    c) 改为 `true`
+    d) 在 PHP-FPM 容器中找到 `INSTALL_XDEBUG ` 选项
+    e) 改为 `true`
 
 例如:
 
@@ -789,44 +660,35 @@ e) 改为 `true`
 
 2 - 重建容器 `docker-compose build workspace php-fpm`
 
-
-
-<br>
 <a name="Misc"></a>
 ### [Misc]
 
-
-<br>
 <a name="Use-custom-Domain"></a>
-### 使用自定义域名 (替换Docker的IP)
+### 使用自定义域名 (替换 Docker 的 IP)
 
 假定你的自定义域名是 `laravel.dev`
 
-1 - 打开 `/etc/hosts` 文件 添加以下内容，映射你的localhost 地址 `127.0.0.1` 为 `laravel.dev` 域名
+1 - 打开 `/etc/hosts` 文件添加以下内容，映射你的 localhost 地址 `127.0.0.1` 为 `laravel.dev` 域名
 ```bash
 127.0.0.1    laravel.dev
 ```
 
 2 - 打开你的浏览器访问 `{http://laravel.dev}`
 
-你可以在nginx配置文件自定义服务器名称,如下:
-
+你可以在 nginx 配置文件自定义服务器名称,如下:
 
 ```conf
 server_name laravel.dev;
 ```
 
-
-
-<br>
 <a name="Enable-Global-Composer-Build-Install"></a>
-### 安装全局Composer命令
+### 安装全局 Composer 命令
 
-为启用全局Composer Install在容器构建中允许你安装composer的依赖，然后构建完成后就是可用的。
+为启用全局 Composer Install 在容器构建中允许你安装 composer 的依赖，然后构建完成后就是可用的。
 
 1 - 打开 `docker-compose.yml` 文件
 
-2 - 在Workspace容器找到 `COMPOSER_GLOBAL_INSTALL` 选项并设置为 `true`
+2 - 在 Workspace 容器找到 `COMPOSER_GLOBAL_INSTALL` 选项并设置为 `true`
 
 例如:
 
@@ -840,19 +702,16 @@ server_name laravel.dev;
 ```
 3 - 现在特价你的依赖关系到 `workspace/composer.json`
 
-4 - 重建Workspace容器 `docker-compose build workspace`
+4 - 重建 Workspace 容器 `docker-compose build workspace`
 
-
-
-
-<br>
 <a name="Install-Prestissimo"></a>
 ### 安装 Prestissimo
 
-[Prestissimo](https://github.com/hirak/prestissimo) 是一个平行安装功能的composer插件。
-1 - 在安装期间，使全局Composer Install 正在运行:
+[Prestissimo](https://github.com/hirak/prestissimo) 是一个平行安装功能的 composer 插件。
 
-点击这个 [启用全局Composer构建安装](#Enable-Global-Composer-Build-Install) 然后继续步骤1、2.
+1 - 在安装期间，使全局 Composer Install 正在运行:
+
+    点击这个 [启用全局 Composer 构建安装](#Enable-Global-Composer-Build-Install) 然后继续步骤1、2.
 
 2 - 添加 prestissimo 依赖到 Composer:
 
@@ -860,19 +719,17 @@ a - 现在打开 `workspace/composer.json` 文件
 
 b - 添加 `"hirak/prestissimo": "^0.3"` 依赖
 
-c - 重建Workspace容器 `docker-compose build workspace`
+c - 重建 Workspace 容器 `docker-compose build workspace`
 
 
-
-
-<br>
 <a name="Install-Node"></a>
 ### 安装 Node + NVM
 
-在Workspace 容器安装 NVM 和 NodeJS
+在 Workspace 容器安装 NVM 和 NodeJS
+
 1 - 打开 `docker-compose.yml` 文件
 
-2 - 在Workspace容器找到 `INSTALL_NODE` 选项设为 `true`
+2 - 在 Workspace 容器找到 `INSTALL_NODE` 选项设为 `true`
 
 例如:
 
@@ -887,17 +744,14 @@ c - 重建Workspace容器 `docker-compose build workspace`
 
 3 - 重建容器 `docker-compose build workspace`
 
-
-
-<br>
 <a name="debugging"></a>
 ### Debugging
 
 *这里是你可能面临的常见问题列表,以及可能的解决方案.*
 
-#### 看到空白页而不是Laravel的欢迎页面!
+#### 看到空白页而不是 Laravel 的欢迎页面!
 
-在Laravel根目录，运行下列命令:
+在 Laravel 根目录，运行下列命令:
 
 ```bash
 sudo chmod -R 777 storage bootstrap/cache
@@ -909,34 +763,28 @@ sudo chmod -R 777 storage bootstrap/cache
 
 #### 看到包含 `address already in use` 的错误
 
-确保你想运行的服务端口(80, 3306, etc.)不是已经被其他程序使用，例如`apache`/`httpd`服务或其他安装的开发工具
+确保你想运行的服务端口(80, 3306, etc.)不是已经被其他程序使用，例如 `apache`/`httpd` 服务或其他安装的开发工具
 
-
-<br>
 <a name="upgrading-laradock"></a>
 ### LaraDock 升级
 
 
-从Docker Toolbox (VirtualBox)移动到Docker Native (for Mac/Windows)，需要从 LaraDock v3.* 升级到 v4.*:
+从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows)，需要从 LaraDock v3.* 升级到 v4.*:
 
-1. 停止Docker虚拟机 `docker-machine stop {default}`
+1. 停止 Docker 虚拟机 `docker-machine stop {default}`
 2. 安装 Docker [Mac](https://docs.docker.com/docker-for-mac/) 或 [Windows](https://docs.docker.com/docker-for-windows/).
 3. 升级 LaraDock 到 `v4.*.*` (`git pull origin master`)
-4. 像之前一样使用LaraDock: `docker-compose up -d nginx mysql`.
+4. 像之前一样使用 LaraDock: `docker-compose up -d nginx mysql`.
 
 **说明:** 如果你面临任何上面的问题的最后一步:重建你所有的容器
-`docker-compose build --no-cache`
+```bash
+docker-compose build --no-cache
+```
 "警告：容器数据可能会丢失!"
 
 
-
-
-
-
-
-<br>
 ## 贡献
-这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个bug修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎，欢迎毫不不犹豫地贡献吧:)
+这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个 bug 修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎，欢迎毫不不犹豫地贡献吧:)
 
 #### 阅读我们的 [贡献说明](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md)
 
@@ -945,9 +793,9 @@ sudo chmod -R 777 storage bootstrap/cache
 
 从聊天室 [Gitter](https://gitter.im/LaraDock/laradock) 社区获取帮助和支持.
 
-你也可以打开Github上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/LaraDock/laradock).
+你也可以打开 Github 上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/LaraDock/laradock).
 
-Docker或Laravel的特别帮助，你可以在[Codementor.io](https://www.codementor.io/mahmoudz)上直接和项目创始人在线沟通
+Docker 或 Laravel 的特别帮助，你可以在 [Codementor.io](https://www.codementor.io/mahmoudz) 上直接和项目创始人在线沟通
 
 ## 关于作者
 

README.md

@@ -1,10 +1,12 @@
-# Laradock
+[![Build Status](https://travis-ci.org/laradock/laradock.svg?branch=master)](https://travis-ci.org/laradock/laradock)
+
+![](https://s19.postimg.org/jblfytw9f/laradock-logo.jpg)
 
 > Use Docker first and learn about it later.
 
-[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
+A Docker PHP development environment that facilitates running **PHP** Apps on **Docker**.
 
-Laradock is a Docker PHP development environment that facilitate running **PHP** Apps on **Docker**.
+[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
 ## Documentation
 
@@ -12,17 +14,15 @@ Laradock is a Docker PHP development environment that facilitate running **PHP**
 
 ## Credits
 
-**Super Admins:**
+**Maintainers:**
 
-- [Mahmoud Zalt](https://github.com/Mahmoudz) (mahmoudz)  [ [Twitter](https://twitter.com/Mahmoud_Zalt) | [Personal Site](http://zalt.me) | [LinkedIn](https://www.linkedin.com/in/mahmoudzalt) ]
-- [Bo-Yi Wu](https://github.com/appleboy) (appleboy) [ [Twitter](https://twitter.com/appleboy) ]
-- [Philippe Trépanier](https://github.com/philtrep) (philtrep)
-- [Mike Erickson](https://github.com/mikeerickson) (mikeerickson)
-- Join Us!
-
-**Amazing Contributors:**
-
-- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
+- [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
+- [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
+- [Philippe Trépanier](https://github.com/philtrep) @philtrep
+- [Mike Erickson](https://github.com/mikeerickson) @mikeerickson
+- [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
+- [Thor Erik](https://github.com/thorerik) @thorerik
+- [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
 
 ## License
 

_guides/digital_ocean.md

@@ -1,213 +0,0 @@
-#### Install Docker
-```
-Login Digital Ocean
-Add Droplet
-1 Click Install docker
-Choose Droplet
-reset ROOT password
-check email
-```
-
-#### SSH to your Server
-
-```
-ssh root@ipaddress
-```
-you will be prompt of that password.
-type the password you receive in your email
-
-then it will ask to you to change a new password
-just change it to the custom root password you want
-
-After SSH
-you can check that docker command is working by typing 
-
-```
-$root@midascode:~# docker
-```
-
-#### Set Up Your Laravel Project
-
-```
-$root@midascode:~# apt-get install git
-$root@midascode:~# git clone https://github.com/laravel/laravel
-$root@midascode:~# cd laravel
-$root@midascode:~/laravel/ git submodule add https://github.com/LaraDock/laradock.git
-$root@midascode:~/laravel/ cd laradock
-```
-
-#### Install docker-compose command
-
-```
-$root@midascode:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
-$root@midascode:~/chmod +x /usr/local/bin/docker-compose
-```
-
-#### Create Your LaraDock Containers
-
-```
-$root@midascode:~/laravel/laradock# docker-compose up -d nginx mysql
-```
-
-#### Go to Your Workspace
-
-```
-docker-compose exec workspace bash
-```
-
-#### Install laravel Dependencies, Add .env , generate Key and give proper permission certain folder
-
-```
-$ root@0e77851d27d3:/var/www# composer install
-$ root@0e77851d27d3:/var/www# cp .env.example .env
-$ root@0e77851d27d3:/var/www# php artisan key:generate
-$ root@0e77851d27d3:/var/www# exit
-$root@midascode:~/laravel/laradock# cd ..
-$root@midascode:~/laravel# sudo chmod -R 777 storage bootstrap/cache
-```
-
-you can then view your laravel site at your ipaddress
-for example
-```
-192.168.1.1 
-```
-
-You will see there Laravel Default Welcome Page
-
-but if you need to view on your custom domain name
-which you would.
-
-#### Using Your Own Domain Name
-login to your DNS provider
-Godaddy, Namecheap what ever...
-And Point the Custom Domain Name Server to
-
-```
-ns1.digitalocean.com
-ns2.digitalocean.com
-ns3.digitalocean.com
-```
-In Your Digital Ocean Account go to 
-```
-https://cloud.digitalocean.com/networking/domains
-```
-add your domain name and choose the server ip you provision earlier
-
-#### Serve Site With NGINX (HTTP ONLY)
-Go back to command line
-```
-$root@midascode:~/laravel/laradock# cd nginx
-$root@midascode:~/laravel/laradock/nginx# vim laravel.conf
-```
-remove default_server
-```
-
-    listen 80 default_server;
-    listen [::]:80 default_server ipv6only=on;
-
-```
- and add server_name (your custom domain)
-```
-    listen 80;
-    listen [::]:80 ipv6only=on;
-    server_name yourdomain.com;
-```
-
-#### Rebuild Your Nginx
-```
-$root@midascode:~/laravel/laradock/nginx# docker-compose down
-$root@midascode:~/laravel/laradock/nginx# docker-compose build nginx
-```
-
-#### Re Run Your Containers MYSQL and NGINX
-```
-$root@midascode:~/laravel/laradock/nginx# docker-compose up -d nginx mysql
-```
-
-###### View Your Site with HTTP ONLY (http://yourdomain.com)
-
-#### Run Site on SSL with Let's Encrypt Certificate
-
-###### Note: You need to Use Caddy here Instead of Nginx
-
-###### To go Caddy Folders and Edit CaddyFile
-
-```
-$root@midascode:~/laravel/laradock# cd caddy
-$root@midascode:~/laravel/laradock/caddy# vim Caddyfile
-```
-
-Remove 0.0.0.0:80 
-
-```
-0.0.0.0:80
-root /var/www/public
-``` 
-and replace with your https://yourdomain.com
-
-```
-https://yourdomain.com
-root /var/www/public
-```
-uncomment tls 
-
-```
-#tls self-signed
-```
-and replace self-signed with your email address
-
-```
-tls midascodebreaker@gmai.com
-```
-This is needed Prior to Creating Let's Encypt 
-
-####  Run Your  Caddy Container without the -d flag and Generate SSL with Let's Encrypt
-
-```
-$root@midascode:~/laravel/laradock/caddy# docker-compose up  caddy
-```
-
-you will be prompt here to enter your email... you may enter it or not
-```
-Attaching to laradock_mysql_1, laradock_caddy_1
-caddy_1               | Activating privacy features...
-caddy_1               | Your sites will be served over HTTPS automatically using Let's Encrypt.
-caddy_1               | By continuing, you agree to the Let's Encrypt Subscriber Agreement at:
-caddy_1               |   https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf
-caddy_1               | Activating privacy features... done.
-caddy_1               | https://yourdomain.com
-caddy_1               | http://yourdomain.com
-```
-
-After it finish Press Ctrl + C to exit ...
-
-#### Stop All Containers and ReRun Caddy and Other Containers on Background
-
-```
-$root@midascode:~/laravel/laradock/caddy# docker-compose down
-$root@midascode:~/laravel/laradock/caddy# docker-compose up -d mysql caddy
-```
-View your Site in the Browser Securely Using HTTPS (https://yourdomain.com)
-
-##### Note that Certificate will be Automatically Renew By Caddy
-
->References: 
->
-- [https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04)
-- [https://www.digitalocean.com/products/one-click-apps/docker/](https://www.digitalocean.com/products/one-click-apps/docker/)
-- [https://docs.docker.com/engine/installation/linux/ubuntulinux/](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
-- [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
-- [https://caddyserver.com/docs/automatic-https](https://caddyserver.com/docs/automatic-https)
-- [https://caddyserver.com/docs/tls](https://caddyserver.com/docs/tls)
-- [https://caddyserver.com/docs/caddyfile](https://caddyserver.com/docs/caddyfile)
-
-
-
-
-
-
-
-
-
-
-

_scripts/travis-build.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+#### Build the Docker Images
+if [ -n "${PHP_VERSION}" ]; then
+    cp env-example .env
+    sed -i -- 's/=false/=true/g' .env
+    cat .env
+    docker-compose build
+    docker images
+fi
+
+#### Generate the Laradock Documentation site using Hugo
+if [ -n "${HUGO_VERSION}" ]; then
+    HUGO_PACKAGE=hugo_${HUGO_VERSION}_Linux-64bit
+    HUGO_BIN=hugo_${HUGO_VERSION}_linux_amd64
+
+    # Download hugo binary
+    curl -L https://github.com/spf13/hugo/releases/download/v$HUGO_VERSION/$HUGO_PACKAGE.tar.gz | tar xz
+    mkdir $HOME/bin
+    mv ./${HUGO_BIN}/${HUGO_BIN} $HOME/bin/hugo
+
+    # Remove existing docs
+    rm -r ./docs
+
+    # Build docs
+    cd DOCUMENTATION
+    hugo
+fi

adminer/Dockerfile

@@ -0,0 +1,9 @@
+FROM adminer:latest
+
+MAINTAINER Patrick Artounian <partounian@gmail.com>
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose Adminer on port 8080 (Adminer's default)
+EXPOSE 8080

apache2/Dockerfile

@@ -12,6 +12,8 @@ EXPOSE 80 443
 
 WORKDIR /var/www/
 
+ADD vhost.conf /etc/apache2/sites-enabled/vhost.conf
+
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
 CMD ["supervisord"]

apache2/sites/.gitignore

@@ -0,0 +1,3 @@
+*.conf
+!default.conf
+!default.apache.conf

apache2/sites/default.apache.conf

@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+  ServerName laradock.dev
+  DocumentRoot /var/www/html/
+  Options Indexes FollowSymLinks
+
+  <Directory "/var/www/html/">
+    AllowOverride All
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </Directory>
+
+</VirtualHost>

apache2/sites/sample.conf.example

@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+  ServerName sample.dev
+  DocumentRoot /var/www/sample/public/
+  Options Indexes FollowSymLinks
+
+  <Directory "/var/www/sample/public/">
+    AllowOverride All
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </Directory>
+
+</VirtualHost>

apache2/vhost.conf

@@ -0,0 +1 @@
+Include /etc/apache2/sites-available/*.conf

certbot/Dockerfile

@@ -1,5 +1,7 @@
 FROM phusion/baseimage:latest
 
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
 COPY run-certbot.sh /root/certbot/run-certbot.sh
 
 RUN apt-get update

docker-compose.yml

@@ -26,14 +26,15 @@ services:
           - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
           - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
           - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
-                - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
-                - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+          - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER}
+          - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW}
           - INSTALL_MC=${WORKSPACE_INSTALL_MC}
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
           - NODE_VERSION=${WORKSPACE_NODE_VERSION}
-                - YARN_VERSION=${WORKSPACE_TIMEZONE}
+          - YARN_VERSION=${WORKSPACE_YARN_VERSION}
           - TZ=${WORKSPACE_TIMEZONE}
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
       extra_hosts:
@@ -41,6 +42,9 @@ services:
       ports:
         - "${WORKSPACE_SSH_PORT}:22"
       tty: true
+      networks:
+        - frontend
+        - backend
 
 ### PHP-FPM Container #######################################
 
@@ -60,9 +64,13 @@ services:
           - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
           - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
           - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
-            dockerfile: ${PHP_FPM_DOCKER_FILE}
+          - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
+          - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
+      volumes:
+        - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
       expose:
         - "9000"
       depends_on:
@@ -71,6 +79,20 @@ services:
         - "dockerhost:${DOCKER_HOST_IP}"
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
+      networks:
+        - backend
+
+### PHP Worker Container #####################################
+
+    php-worker:
+      build:
+        context: ./php-worker
+      volumes_from:
+        - applications
+      depends_on:
+        - workspace
+      networks:
+        - backend
 
 ### Nginx Server Container ##################################
 
@@ -89,6 +111,9 @@ services:
         - "${NGINX_HOST_HTTPS_PORT}:443"
       depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### Apache Server Container #################################
 
@@ -101,11 +126,15 @@ services:
         - applications
       volumes:
         - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
+        - ./apache2/sites:/etc/apache2/sites-available
       ports:
         - "${APACHE_HOST_HTTP_PORT}:80"
         - "${APACHE_HOST_HTTPS_PORT}:443"
       depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### HHVM Container ##########################################
 
@@ -117,6 +146,9 @@ services:
         - "9000"
       depends_on:
         - workspace
+      networks:
+        - frontend
+        - backend
 
 ### Minio Container #########################################
 
@@ -127,63 +159,106 @@ services:
       ports:
         - "${MINIO_PORT}:9000"
       environment:
-          MINIO_ACCESS_KEY: access
-          MINIO_SECRET_KEY: secretkey
+        - MINIO_ACCESS_KEY=access
+        - MINIO_SECRET_KEY=secretkey
+      networks:
+        - frontend
 
 ### MySQL Container #########################################
 
     mysql:
       build:
         context: ./mysql
-            args:
+      environment:
         - MYSQL_DATABASE=${MYSQL_DATABASE}
         - MYSQL_USER=${MYSQL_USER}
         - MYSQL_PASSWORD=${MYSQL_PASSWORD}
         - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       volumes:
-            - mysql:/var/lib/mysql
+        - ${DATA_SAVE_PATH}/mysql:/var/lib/mysql
       ports:
         - "${MYSQL_PORT}:3306"
+      networks:
+        - backend
+
+### Percona Container #########################################
+
+    percona:
+      build:
+        context: ./percona
+      environment:
+        - MYSQL_DATABASE=${PERCONA_DATABASE}
+        - MYSQL_USER=${PERCONA_USER}
+        - MYSQL_PASSWORD=${PERCONA_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${PERCONA_ROOT_PASSWORD}
+      volumes:
+        - percona:/var/lib/mysql
+      ports:
+        - "${PERCONA_PORT}:3306"
+      networks:
+        - backend
+
+### MSSQL Container #########################################
+
+    mssql:
+      build:
+        context: ./mssql
+      environment:
+        - MSSQL_DATABASE=${MSSQL_DATABASE}
+        - SA_PASSWORD=${MSSQL_PASSWORD}
+        - ACCEPT_EULA=Y
+      volumes:
+        - ${DATA_SAVE_PATH}/mssql:/var/opt/mssql
+      ports:
+        - "${MSSQL_PORT}:1433"
+      networks:
+        - backend
 
 ### MariaDB Container #######################################
 
     mariadb:
       build: ./mariadb
       volumes:
-            - mariadb:/var/lib/mysql
+        - ${DATA_SAVE_PATH}/mariadb:/var/lib/mysql
       ports:
         - "${MARIADB_PORT}:3306"
       environment:
-            MYSQL_DATABASE: ${MARIADB_DATABASE}
-            MYSQL_USER: ${MARIADB_USER}
-            MYSQL_PASSWORD: ${MARIADB_PASSWORD}
-            MYSQL_ROOT_PASSWORD: ${MARIADB_PORT}
+        - MYSQL_DATABASE=${MARIADB_DATABASE}
+        - MYSQL_USER=${MARIADB_USER}
+        - MYSQL_PASSWORD=${MARIADB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
+      networks:
+        - backend
 
 ### PostgreSQL Container ####################################
 
     postgres:
       build: ./postgres
       volumes:
-            - postgres:/var/lib/postgresql/data
+        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
       ports:
         - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: ${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        - POSTGRES_DB=${POSTGRES_DB}
+        - POSTGRES_USER=${POSTGRES_USER}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      networks:
+        - backend
 
 ### PostgreSQL PostGis Container ############################
 
     postgres-postgis:
       build: ./postgres-postgis
       volumes:
-            - postgres:/var/lib/postgresql/data
+        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
       ports:
         - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: ${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        - POSTGRES_DB=${POSTGRES_DB}
+        - POSTGRES_USER=${POSTGRES_USER}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      networks:
+        - backend
 
 ### Neo4j Container #########################################
 
@@ -195,7 +270,9 @@ services:
       environment:
         - NEO4J_AUTH=default:secret
       volumes:
-            - neo4j:/var/lib/neo4j/data
+        - ${DATA_SAVE_PATH}/neo4j:/var/lib/neo4j/data
+      networks:
+        - backend
 
 ### MongoDB Container #######################################
 
@@ -204,7 +281,9 @@ services:
       ports:
         - "27017:27017"
       volumes:
-            - mongo:/data/db
+        - ${DATA_SAVE_PATH}/mongo:/data/db
+      networks:
+        - backend
 
 ### RethinkDB Container #######################################
 
@@ -213,16 +292,20 @@ services:
       ports:
         - "8090:8080"
       volumes:
-            - rethinkdb:/data/rethinkdb_data
+        - ${DATA_SAVE_PATH}/rethinkdb:/data/rethinkdb_data
+      networks:
+        - backend
 
 ### Redis Container #########################################
 
     redis:
       build: ./redis
       volumes:
-            - redis:/data
+        - ${DATA_SAVE_PATH}/redis:/data
       ports:
         - "6379:6379"
+      networks:
+        - backend
 
 ### Aerospike c Container ###################################
 
@@ -231,24 +314,27 @@ services:
       volumes_from:
         - workspace
       volumes:
-            - aerospike:/opt/aerospike/data
+        - ${DATA_SAVE_PATH}/aerospike:/opt/aerospike/data
       ports:
         - "3000:3000"
         - "3001:3001"
         - "3002:3002"
         - "3003:3003"
-
+      networks:
+        - backend
 
 ### Memcached Container #####################################
 
     memcached:
       build: ./memcached
       volumes:
-            - memcached:/var/lib/memcached
+        - ${DATA_SAVE_PATH}/memcached:/var/lib/memcached
       ports:
         - "${MEMCACHED_HOST_PORT}:11211"
       depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### Beanstalkd Container ####################################
 
@@ -259,6 +345,8 @@ services:
       privileged: true
       depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### RabbitMQ Container ######################################
 
@@ -270,10 +358,12 @@ services:
         - "${RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT}:15671"
       privileged: true
       environment:
-            RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER}
-            RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS}
+        - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
+        - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
       depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### Beanstalkd Console Container ############################
 
@@ -283,6 +373,8 @@ services:
         - "2080:2080"
       depends_on:
         - beanstalkd
+      networks:
+        - backend
 
 ### Caddy Server Container ##################################
 
@@ -300,20 +392,38 @@ services:
         - caddy:/root/.caddy
       depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### phpMyAdmin Container ####################################
 
     phpmyadmin:
       build: ./phpmyadmin
       environment:
-            PMA_ARBITRARY: 1
-            MYSQL_USER: ${PMA_USER}
-            MYSQL_PASSWORD: ${PMA_PASSWORD}
-            MYSQL_ROOT_PASSWORD: ${PMA_ROOT_PASSWORD}
+        - PMA_ARBITRARY=1
+        - MYSQL_USER=${PMA_USER}
+        - MYSQL_PASSWORD=${PMA_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${PMA_ROOT_PASSWORD}
       ports:
         - "${PMA_PORT}:80"
       depends_on:
         - "${PMA_DB_ENGINE}"
+      networks:
+        - frontend
+        - backend
+
+### Adminer Container ####################################
+
+    adminer:
+      build: ./adminer
+      ports:
+        - "${ADM_PORT}:8080"
+      depends_on:
+        - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### pgAdmin Container #######################################
 
@@ -323,6 +433,9 @@ services:
         - "5050:5050"
       depends_on:
         - postgres
+      networks:
+        - frontend
+        - backend
 
 ### ElasticSearch Container #################################
 
@@ -336,6 +449,9 @@ services:
         - "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"
       depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### Certbot Container ##################################
 
@@ -346,8 +462,10 @@ services:
         - ./data/certbot/certs/:/var/certs
         - ./certbot/letsencrypt/:/var/www/letsencrypt
       environment:
-            CN: "fake.domain.com"
-            EMAIL: "fake.email@gmail.com"
+        - CN="fake.domain.com"
+        - EMAIL="fake.email@gmail.com"
+      networks:
+        - frontend
 
 ### Mailhog Container #########################################
 
@@ -356,8 +474,10 @@ services:
       ports:
         - "1025:1025"
         - "8025:8025"
+      networks:
+        - frontend
 
-### Selenium Container #########################################
+### Selenium Container ########################################
 
     selenium:
       build: ./selenium
@@ -365,12 +485,89 @@ services:
         - "${SELENIUM_PORT}:4444"
       volumes:
         - /dev/shm:/dev/shm
+      networks:
+        - frontend
 
-### Volumes Setup ###########################################
+### Varnish Proxy 1 ##########################################
+
+    proxy:
+      build: ./varnish
+      expose:
+        - ${VARNISH_PORT}
+      environment:
+        - VARNISH_CONFIG=${VARNISH_CONFIG}
+        - CACHE_SIZE=${VARNISH_PROXY1_CACHE_SIZE}
+        - VARNISHD_PARAMS=${VARNISHD_PARAMS}
+        - VARNISH_PORT=${VARNISH_PORT}
+        - BACKEND_HOST=${VARNISH_PROXY1_BACKEND_HOST}
+        - BACKEND_PORT=${VARNISH_BACKEND_PORT}
+        - VARNISH_SERVER=${VARNISH_PROXY1_SERVER}
+      links:
+        - workspace
+      networks:
+        - frontend
+
+### Varnish Proxy 2 ##########################################
+
+    proxy2:
+      build: ./varnish
+      expose:
+        - ${VARNISH_PORT}
+      environment:
+        - VARNISH_CONFIG=${VARNISH_CONFIG}
+        - CACHE_SIZE=${VARNISH_PROXY2_CACHE_SIZE}
+        - VARNISHD_PARAMS=${VARNISHD_PARAMS}
+        - VARNISH_PORT=${VARNISH_PORT}
+        - BACKEND_HOST=${VARNISH_PROXY2_BACKEND_HOST}
+        - BACKEND_PORT=${VARNISH_BACKEND_PORT}
+        - VARNISH_SERVER=${VARNISH_PROXY2_SERVER}
+      links:
+        - workspace
+      networks:
+        - frontend
+
+### Balancer Haproxy ##########################################
+
+    balancer:
+      build: ./haproxy
+      ports:
+        - "${HAPROXY_HOST_HTTP_PORT}:8085"
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+      links:
+        - proxy
+        - proxy2
+
+### Jenkins ###################################################
+    jenkins:
+      build: ./jenkins
+      environment:
+        JAVA_OPTS: "-Djava.awt.headless=true"
+      ports:
+        - "${JENKINS_HOST_SLAVE_AGENT_PORT}:50000"
+        - "${JENKINS_HOST_HTTP_PORT}:8080"
+      privileged: true
+      volumes:
+        - ${JENKINS_HOME}:/var/jenkins_home
+        - /var/run/docker.sock:/var/run/docker.sock
+
+### Networks Setup ############################################
+
+networks:
+  frontend:
+    driver: "bridge"
+  backend:
+    driver: "bridge"
+
+### Volumes Setup #############################################
 
 volumes:
   mysql:
     driver: "local"
+  percona:
+    driver: "local"
+  mssql:
+    driver: "local"
   postgres:
     driver: "local"
   memcached:
@@ -389,6 +586,8 @@ volumes:
     driver: "local"
   phpmyadmin:
     driver: "local"
+  adminer:
+    driver: "local"
   aerospike:
     driver: "local"
   caddy:

docs/contributing/index.html

@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Contributing - Laradock</title>
-    <meta name="generator" content="Hugo 0.18.1" />
+    <meta name="generator" content="Hugo 0.19" />
 
     
-    <meta name="description" content="Laradock documentations.">
+    <meta name="description" content="Full PHP development environment for Docker.">
     
     <link rel="canonical" href="http://laradock.io/contributing/">
     
@@ -22,7 +22,7 @@
 
     <meta property="og:url" content="http://laradock.io/contributing/">
     <meta property="og:title" content="Laradock">
-    
+    <meta property="og:image" content="http://laradock.io/images/logo.png">
     <meta name="apple-mobile-web-app-title" content="Laradock">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -129,15 +129,19 @@
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
+  <a href="http://laradock.io/" class="project">
+    <div class="banner">
+      
+        <div class="logo">
+          <img src="http://laradock.io/images/logo.png">
+        </div>
       
       
         
         
       
-        
-      
-    
-  
+    </div>
+  </a>
 
   <div class="scrollable">
     <div class="wrapper">
@@ -211,9 +215,9 @@
 
 
 
-<a  title="Related Projects" href="http://laradock.io/related-projects/">
+<a  title="Giudes" href="http://laradock.io/guides/">
 	
-	Related Projects
+	Giudes
 </a>
 
 
@@ -247,6 +251,24 @@
 
 
 
+<a  title="Related Projects" href="http://laradock.io/related-projects/">
+	
+	Related Projects
+</a>
+
+
+
+  
+</li>
+
+
+
+<li>
+  
+    
+
+
+
 <a class="current" title="Contributing" href="http://laradock.io/contributing/">
 	
 	Contributing
@@ -345,20 +367,26 @@ features, by not reporting duplicate issues.</em></p>
 
 <p>Laradock uses <a href="https://gohugo.io/">Hugo</a> as website generator tool, with the <a href="http://themes.gohugo.io/theme/material-docs/">Material Docs theme</a>. You might need to check their docs quickly.</p>
 
-<ol>
-<li>Install <a href="https://gohugo.io/">Hugo</a> on your machine (easy thing).</li>
-<li>Open the <code>DOCUMENTATION/_settings/content</code> and search for the markdown file you want to edit (every folder represents a section in the menu).</li>
-<li>Delete the <code>/docs</code> folder from the root.</li>
-<li>When you finish editing, run the <code>hugo</code> command to generate the HTML docs (in the <code>/docs</code>).</li>
-</ol>
+<p>Go the <code>DOCUMENTATION/content</code> and search for the markdown file you want to edit</p>
+
+<p>Note: Every folder represents a section in the sidebar &ldquo;Menu&rdquo;. And every page and sidebar has a <code>weight</code> number to show it&rsquo;s position in the site.</p>
+
+<p>To update the sidebar or add a new section to it, you can edit this <code>DOCUMENTATION/config.toml</code> toml file.</p>
+
+<blockquote>
+<p>The site will be auto-generated in the <code>docs/</code> folder by <a href="https://travis-ci.org/laradock/laradock/">Travis CI</a>.</p>
+</blockquote>
+
+<p><br></p>
 
 <h3 id="to-host-the-website-locally">To Host the website locally</h3>
 
-<p>Go to <code>DOCUMENTATION/_settings</code> in your terminal and run <code>hugo serve</code> to host the website locally.</p>
-
-<h3 id="edit-the-sidebar">Edit the sidebar</h3>
-
-<p>To add a new section to the sidebar or edit existing one, you need to edit this file <code>DOCUMENTATION/_settings/config.toml</code>.</p>
+<ol>
+<li>Install <a href="https://gohugo.io/">Hugo</a> on your machine.</li>
+<li>Edit the <code>DOCUMENTATION/content</code>.</li>
+<li>Delete the <code>/docs</code> folder from the root.</li>
+<li>After you finish the editing, go to <code>DOCUMENTATION/</code> and run the <code>hugo</code> command to generate the HTML docs (inside a new <code>/docs</code> folder).</li>
+</ol>
 
 <h2 id="how-to-support-new-software-add-new-container">How to support new Software (Add new Container)</h2>
 
@@ -496,7 +524,7 @@ git push origin my-fix-branch -f
 <nav class="pagination" aria-label="Footer">
   <div class="previous">
   
-      <a href="http://laradock.io/help/" title="Help &amp; Questions">
+      <a href="http://laradock.io/related-projects/" title="Related Projects">
         <span class="direction">
           Previous
         </span>
@@ -506,7 +534,7 @@ git push origin my-fix-branch -f
           </div>
           <div class="stretch">
             <div class="title">
-              Help &amp; Questions
+              Related Projects
             </div>
           </div>
         </div>

docs/contributing/index.xml

@@ -48,20 +48,26 @@ features, by not reporting duplicate issues.</em></p>
 
 <p>Laradock uses <a href="https://gohugo.io/">Hugo</a> as website generator tool, with the <a href="http://themes.gohugo.io/theme/material-docs/">Material Docs theme</a>. You might need to check their docs quickly.</p>
 
-<ol>
-<li>Install <a href="https://gohugo.io/">Hugo</a> on your machine (easy thing).</li>
-<li>Open the <code>DOCUMENTATION/_settings/content</code> and search for the markdown file you want to edit (every folder represents a section in the menu).</li>
-<li>Delete the <code>/docs</code> folder from the root.</li>
-<li>When you finish editing, run the <code>hugo</code> command to generate the HTML docs (in the <code>/docs</code>).</li>
-</ol>
+<p>Go the <code>DOCUMENTATION/content</code> and search for the markdown file you want to edit</p>
+
+<p>Note: Every folder represents a section in the sidebar “Menu”. And every page and sidebar has a <code>weight</code> number to show it’s position in the site.</p>
+
+<p>To update the sidebar or add a new section to it, you can edit this <code>DOCUMENTATION/config.toml</code> toml file.</p>
+
+<blockquote>
+<p>The site will be auto-generated in the <code>docs/</code> folder by <a href="https://travis-ci.org/laradock/laradock/">Travis CI</a>.</p>
+</blockquote>
+
+<p><br></p>
 
 <h3 id="to-host-the-website-locally">To Host the website locally</h3>
 
-<p>Go to <code>DOCUMENTATION/_settings</code> in your terminal and run <code>hugo serve</code> to host the website locally.</p>
-
-<h3 id="edit-the-sidebar">Edit the sidebar</h3>
-
-<p>To add a new section to the sidebar or edit existing one, you need to edit this file <code>DOCUMENTATION/_settings/config.toml</code>.</p>
+<ol>
+<li>Install <a href="https://gohugo.io/">Hugo</a> on your machine.</li>
+<li>Edit the <code>DOCUMENTATION/content</code>.</li>
+<li>Delete the <code>/docs</code> folder from the root.</li>
+<li>After you finish the editing, go to <code>DOCUMENTATION/</code> and run the <code>hugo</code> command to generate the HTML docs (inside a new <code>/docs</code> folder).</li>
+</ol>
 
 <h2 id="how-to-support-new-software-add-new-container">How to support new Software (Add new Container)</h2>
 

docs/documentation/index.html

@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Documentation - Laradock</title>
-    <meta name="generator" content="Hugo 0.18.1" />
+    <meta name="generator" content="Hugo 0.19" />
 
     
-    <meta name="description" content="Laradock documentations.">
+    <meta name="description" content="Full PHP development environment for Docker.">
     
     <link rel="canonical" href="http://laradock.io/documentation/">
     
@@ -22,7 +22,7 @@
 
     <meta property="og:url" content="http://laradock.io/documentation/">
     <meta property="og:title" content="Laradock">
-    
+    <meta property="og:image" content="http://laradock.io/images/logo.png">
     <meta name="apple-mobile-web-app-title" content="Laradock">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -129,15 +129,19 @@
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
+  <a href="http://laradock.io/" class="project">
+    <div class="banner">
+      
+        <div class="logo">
+          <img src="http://laradock.io/images/logo.png">
+        </div>
       
       
         
         
       
-        
-      
-    
-  
+    </div>
+  </a>
 
   <div class="scrollable">
     <div class="wrapper">
@@ -214,9 +218,9 @@
 
 
 
-<a  title="Related Projects" href="http://laradock.io/related-projects/">
+<a  title="Giudes" href="http://laradock.io/guides/">
 	
-	Related Projects
+	Giudes
 </a>
 
 
@@ -250,6 +254,24 @@
 
 
 
+<a  title="Related Projects" href="http://laradock.io/related-projects/">
+	
+	Related Projects
+</a>
+
+
+
+  
+</li>
+
+
+
+<li>
+  
+    
+
+
+
 <a  title="Contributing" href="http://laradock.io/contributing/">
 	
 	Contributing
@@ -888,6 +910,18 @@ docker-compose up -d mariadb phpmyadmin
 
 <p>2 - Open your browser and visit the localhost on port <strong>8080</strong>:  <code>http://localhost:8080</code></p>
 
+<p><br>
+<a name="Use-Adminer"></a></p>
+
+<h2 id="use-adminer">Use Adminer</h2>
+
+<p>1 - Run the Adminer Container (<code>adminer</code>) with the <code>docker-compose up</code> command. Example:</p>
+
+<pre><code class="language-bash">docker-compose up -d adminer  
+</code></pre>
+
+<p>2 - Open your browser and visit the localhost on port <strong>8080</strong>:  <code>http://localhost:8080</code></p>
+
 <p><br>
 <a name="Use-pgAdmin"></a></p>
 
@@ -1401,13 +1435,27 @@ e) set it to <code>true</code></p>
 
 <h2 id="improve-speed-on-macos">Improve speed on MacOS</h2>
 
-<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. You can get around this issue by using NFS to share your files betwen your host and your container.</p>
+<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. Likely there are some workarounds:</p>
 
-<blockquote>
-<p>How to share files using NFS (d4m-nfs)</p>
-</blockquote>
+<h3 id="workaround-a-using-dinghy">Workaround A: using dinghy</h3>
 
-<p><a href="https://github.com/IFSight/d4m-nfs">d4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
+<p><a href="https://github.com/codekitchen/dinghy">Dinghy</a> creates its own VM using docker-machine, it will not modify your existing docker-machine VMs.</p>
+
+<p>Quick Setup giude, (we recommend you check their docs)</p>
+
+<p>1) <code>brew tap codekitchen/dinghy</code></p>
+
+<p>2) <code>brew install dinghy</code></p>
+
+<p>3) <code>dinghy create --provider virtualbox</code> (must have virtualbox installed, but they support other providers if you prefer)</p>
+
+<p>4) after the above command is done it will display some env variables, copy them to the bash profile or zsh or.. (this will instruct docker to use the server running inside the VM)</p>
+
+<p>5) <code>docker-compose up ...</code></p>
+
+<h3 id="workaround-b-using-d4m-nfs">Workaround B: using d4m-nfs</h3>
+
+<p><a href="https://github.com/IFSight/d4m-nfs">D4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
 
 <p>1) Update the Docker [File Sharing] preferences:</p>
 
@@ -1423,23 +1471,30 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>
 
-<p>6) Run the <code>d4m-nfs.sh</code> script:</p>
+<p>6) Run the <code>d4m-nfs.sh</code> script (might need Sudo):</p>
 
 <pre><code class="language-bash">~/d4m-nfs/d4m-nfs.sh
 </code></pre>
 
 <p>That&rsquo;s it! Run your containers.. Example:</p>
 
-<pre><code class="language-bash">docker-compose up -d nginx mysql
+<pre><code class="language-bash">docker-compose up ...
 </code></pre>
 
-<p><strong>Note:</strong> If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</p>
+<p><em>Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</em></p>
+
+<h3 id="other-good-workarounds">Other good workarounds:</h3>
+
+<ul>
+<li><a href="https://github.com/EugenMayer/docker-sync">docker-sync</a></li>
+<li>Add more here..</li>
+</ul>
+
+<p>More details about this issue <a href="https://github.com/docker/for-mac/issues/77">here</a>.</p>
 
 <p><br>
 <a name="Common-Problems"></a></p>
@@ -1544,14 +1599,14 @@ e) set it to <code>true</code></p>
 
   <div class="next">
   
-      <a href="http://laradock.io/related-projects/" title="Related Projects">
+      <a href="http://laradock.io/guides/" title="Guides">
         <span class="direction">
           Next
         </span>
         <div class="page">
           <div class="stretch">
             <div class="title">
-              Related Projects
+              Guides
             </div>
           </div>
           <div class="button button-next" role="button" aria-label="Next">

docs/documentation/index.xml

@@ -591,6 +591,18 @@ docker-compose up -d mariadb phpmyadmin
 
 <p>2 - Open your browser and visit the localhost on port <strong>8080</strong>:  <code>http://localhost:8080</code></p>
 
+<p><br>
+<a name="Use-Adminer"></a></p>
+
+<h2 id="use-adminer">Use Adminer</h2>
+
+<p>1 - Run the Adminer Container (<code>adminer</code>) with the <code>docker-compose up</code> command. Example:</p>
+
+<pre><code class="language-bash">docker-compose up -d adminer  
+</code></pre>
+
+<p>2 - Open your browser and visit the localhost on port <strong>8080</strong>:  <code>http://localhost:8080</code></p>
+
 <p><br>
 <a name="Use-pgAdmin"></a></p>
 
@@ -1104,13 +1116,27 @@ e) set it to <code>true</code></p>
 
 <h2 id="improve-speed-on-macos">Improve speed on MacOS</h2>
 
-<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. You can get around this issue by using NFS to share your files betwen your host and your container.</p>
+<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. Likely there are some workarounds:</p>
 
-<blockquote>
-<p>How to share files using NFS (d4m-nfs)</p>
-</blockquote>
+<h3 id="workaround-a-using-dinghy">Workaround A: using dinghy</h3>
 
-<p><a href="https://github.com/IFSight/d4m-nfs">d4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
+<p><a href="https://github.com/codekitchen/dinghy">Dinghy</a> creates its own VM using docker-machine, it will not modify your existing docker-machine VMs.</p>
+
+<p>Quick Setup giude, (we recommend you check their docs)</p>
+
+<p>1) <code>brew tap codekitchen/dinghy</code></p>
+
+<p>2) <code>brew install dinghy</code></p>
+
+<p>3) <code>dinghy create --provider virtualbox</code> (must have virtualbox installed, but they support other providers if you prefer)</p>
+
+<p>4) after the above command is done it will display some env variables, copy them to the bash profile or zsh or.. (this will instruct docker to use the server running inside the VM)</p>
+
+<p>5) <code>docker-compose up ...</code></p>
+
+<h3 id="workaround-b-using-d4m-nfs">Workaround B: using d4m-nfs</h3>
+
+<p><a href="https://github.com/IFSight/d4m-nfs">D4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
 
 <p>1) Update the Docker [File Sharing] preferences:</p>
 
@@ -1126,23 +1152,30 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>
 
-<p>6) Run the <code>d4m-nfs.sh</code> script:</p>
+<p>6) Run the <code>d4m-nfs.sh</code> script (might need Sudo):</p>
 
 <pre><code class="language-bash">~/d4m-nfs/d4m-nfs.sh
 </code></pre>
 
 <p>That’s it! Run your containers.. Example:</p>
 
-<pre><code class="language-bash">docker-compose up -d nginx mysql
+<pre><code class="language-bash">docker-compose up ...
 </code></pre>
 
-<p><strong>Note:</strong> If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</p>
+<p><em>Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</em></p>
+
+<h3 id="other-good-workarounds">Other good workarounds:</h3>
+
+<ul>
+<li><a href="https://github.com/EugenMayer/docker-sync">docker-sync</a></li>
+<li>Add more here..</li>
+</ul>
+
+<p>More details about this issue <a href="https://github.com/docker/for-mac/issues/77">here</a>.</p>
 
 <p><br>
 <a name="Common-Problems"></a></p>

docs/getting-started/index.html

@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Getting Started - Laradock</title>
-    <meta name="generator" content="Hugo 0.18.1" />
+    <meta name="generator" content="Hugo 0.19" />
 
     
-    <meta name="description" content="Laradock documentations.">
+    <meta name="description" content="Full PHP development environment for Docker.">
     
     <link rel="canonical" href="http://laradock.io/getting-started/">
     
@@ -22,7 +22,7 @@
 
     <meta property="og:url" content="http://laradock.io/getting-started/">
     <meta property="og:title" content="Laradock">
-    
+    <meta property="og:image" content="http://laradock.io/images/logo.png">
     <meta name="apple-mobile-web-app-title" content="Laradock">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -129,15 +129,19 @@
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
+  <a href="http://laradock.io/" class="project">
+    <div class="banner">
+      
+        <div class="logo">
+          <img src="http://laradock.io/images/logo.png">
+        </div>
       
       
         
         
       
-        
-      
-    
-  
+    </div>
+  </a>
 
   <div class="scrollable">
     <div class="wrapper">
@@ -214,9 +218,9 @@
 
 
 
-<a  title="Related Projects" href="http://laradock.io/related-projects/">
+<a  title="Giudes" href="http://laradock.io/guides/">
 	
-	Related Projects
+	Giudes
 </a>
 
 
@@ -250,6 +254,24 @@
 
 
 
+<a  title="Related Projects" href="http://laradock.io/related-projects/">
+	
+	Related Projects
+</a>
+
+
+
+  
+</li>
+
+
+
+<li>
+  
+    
+
+
+
 <a  title="Contributing" href="http://laradock.io/contributing/">
 	
 	Contributing
@@ -346,10 +368,6 @@
 
 <h3 id="a-1-already-have-a-php-project">A.1) Already have a PHP project:</h3>
 
-<blockquote>
-<p>(Follow these steps if you already have a PHP project, and all you need is an environment to run it)</p>
-</blockquote>
-
 <p>1 - Clone laradock on your project root directory:</p>
 
 <pre><code class="language-bash">git submodule add https://github.com/Laradock/laradock.git
@@ -360,7 +378,7 @@
 <ul>
 <li><p>If you are not using Git yet for your project, you can use <code>git clone</code> instead of <code>git submodule</code>.</p></li>
 
-<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="#keep-tracking-Laradock">Check this</a></p></li>
+<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="http://laradock.io/documentation/#keep-track-of-your-laradock-changes">Check this</a></p></li>
 </ul>
 
 <p>Your folder structure should look like this:</p>
@@ -371,16 +389,16 @@
 	+ laradock-b
 </code></pre>
 
-<p>(It&rsquo;s important to rename the folders differently in each project)</p>
+<p>(It&rsquo;s important to rename the folders differently in each project.)</p>
+
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
 
 <p><a name="A2"></a></p>
 
 <h3 id="a-2-don-t-have-a-php-project-yet">A.2) Don&rsquo;t have a PHP project yet:</h3>
 
-<blockquote>
-<p>(Follow these steps if you don&rsquo;t have a PHP project yet, and you need an environment to create the project)</p>
-</blockquote>
-
 <p>1 - Clone this repository anywhere on your machine:</p>
 
 <pre><code class="language-bash">git clone https://github.com/laradock/laradock.git
@@ -400,9 +418,11 @@
 
 <p><strong>In case of Apache:</strong> :P</p>
 
-<p>3 - Run your <code>docker-compose up</code> command and you&rsquo;re ready to go.</p>
+<p><br></p>
 
-<p><em>Note: if you already had your containers up, you might need to take them down first and rebuild them for the changes to take effect.</em></p>
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
 
 <p><a name="B"></a></p>
 
@@ -438,7 +458,11 @@
 127.0.0.1  project-2.dev
 </code></pre>
 
-<p>5 - Visit <code>http://project-1.dev/</code> and <code>http://project-2.dev/</code>.</p>
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
+
+<p><a name="Usage"></a></p>
 
 <h2 id="usage">Usage</h2>
 
@@ -447,8 +471,8 @@
 <p>If you are using <strong>Docker Toolbox</strong> (VM), do one of the following:</p>
 
 <ul>
-<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="#upgrading-laradock">Upgrading Laradock</a></li>
-<li>Use Laradock v3.* (Visit the <code>Laradock-ToolBox</code> <a href="https://github.com/laradock/laradock/tree/Laradock-ToolBox">Branch</a>).</li>
+<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="http://laradock.io/documentation/#upgrading-laradock">Upgrading Laradock</a></li>
+<li>Use Laradock v3.*. Visit the <a href="https://github.com/laradock/laradock/tree/LaraDock-ToolBox">LaraDock-ToolBox</a> branch. <em>(outdated)</em></li>
 </ul>
 
 <p><br></p>
@@ -459,28 +483,33 @@
 
 <p><br></p>
 
-<p>1 - Run Containers: <em>(Make sure you are in the <code>laradock</code> folder before running the <code>docker-compose</code> commands).</em></p>
+<p>1 - Enter the laradock folder and rename <code>env-example</code> to <code>.env</code></p>
 
-<p><strong>Example:</strong> Running NGINX and MySQL:</p>
+<pre><code class="language-shell">cp env-example .env
+</code></pre>
+
+<p>You can edit the <code>.env</code> file to chose which software&rsquo;s you want to be installed in your environment. You can always refer to the <code>docker-compose.yml</code> file to see how those variables are been used.</p>
+
+<p>2 - Build the enviroment and run it using <code>docker-compose</code></p>
+
+<p>In this example we&rsquo;ll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:</p>
 
 <pre><code class="language-bash">docker-compose up -d nginx mysql
 </code></pre>
 
 <p><strong>Note</strong>: The <code>workspace</code> and <code>php-fpm</code> will run automatically in most of the cases, so no need to specify them in the <code>up</code> command. If you couldn&rsquo;t find them running then you need specify them as follow: <code>docker-compose up -d nginx php-fpm mysql workspace</code>.</p>
 
-<p>You can select your own combination of Containers form the list below:</p>
-
-<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more&hellip;!</p>
+<p>You can select your own combination of containers form <a href="http://laradock.io/introduction/#supported-software-images">this list</a>.</p>
 
 <p><em>(Please note that sometimes we forget to update the docs, so check the <code>docker-compose.yml</code> file to see an updated list of all available containers).</em></p>
 
 <p><br>
-2 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, &hellip;).</p>
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, &hellip;)</p>
 
 <pre><code class="language-bash">docker-compose exec workspace bash
 </code></pre>
 
-<p>Alternatively, for Windows PowerShell users: execute the following command to enter any running container:</p>
+<p><em>Alternatively, for Windows PowerShell users: execute the following command to enter any running container:</em></p>
 
 <pre><code class="language-bash">docker exec -it {workspace-container-id} bash
 </code></pre>
@@ -490,12 +519,12 @@
 <pre><code class="language-shell">docker-compose exec --user=laradock workspace bash
 </code></pre>
 
-<p><em>You can change the PUID (User id) and PGID (group id) variables from the <code>docker-compose.yml</code> or the <code>.env</code>)</em></p>
+<p><em>You can change the PUID (User id) and PGID (group id) variables from the <code>.env</code> file)</em></p>
 
 <p><br>
-3 - Edit your project configurations.</p>
+4 - Update your project configurations to use the database host</p>
 
-<p>Open your <code>.env</code> file and set the <code>DB_HOST</code> to <code>mysql</code>:</p>
+<p>Open your PHP project&rsquo;s <code>.env</code> file or whichever configuration file you are reading from, and set the database host <code>DB_HOST</code> to <code>mysql</code>:</p>
 
 <pre><code class="language-env">DB_HOST=mysql
 </code></pre>
@@ -503,7 +532,7 @@
 <p><em>If you want to install Laravel as PHP project, see <a href="#Install-Laravel">How to Install Laravel in a Docker Container</a>.</em></p>
 
 <p><br>
-4 - Open your browser and visit your localhost address <code>http://localhost/</code>.</p>
+5 - Open your browser and visit your localhost address <code>http://localhost/</code>. If you followed the multiple projects setup, you can visit <code>http://project-1.dev/</code> and <code>http://project-2.dev/</code>. But first don&rsquo;t</p>
 
 
 			<aside class="copyright" role="note">

docs/getting-started/index.xml

@@ -49,10 +49,6 @@
 
 <h3 id="a-1-already-have-a-php-project">A.1) Already have a PHP project:</h3>
 
-<blockquote>
-<p>(Follow these steps if you already have a PHP project, and all you need is an environment to run it)</p>
-</blockquote>
-
 <p>1 - Clone laradock on your project root directory:</p>
 
 <pre><code class="language-bash">git submodule add https://github.com/Laradock/laradock.git
@@ -63,7 +59,7 @@
 <ul>
 <li><p>If you are not using Git yet for your project, you can use <code>git clone</code> instead of <code>git submodule</code>.</p></li>
 
-<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="#keep-tracking-Laradock">Check this</a></p></li>
+<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="http://laradock.io/documentation/#keep-track-of-your-laradock-changes">Check this</a></p></li>
 </ul>
 
 <p>Your folder structure should look like this:</p>
@@ -74,16 +70,16 @@
 	+ laradock-b
 </code></pre>
 
-<p>(It’s important to rename the folders differently in each project)</p>
+<p>(It’s important to rename the folders differently in each project.)</p>
+
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
 
 <p><a name="A2"></a></p>
 
 <h3 id="a-2-don-t-have-a-php-project-yet">A.2) Don’t have a PHP project yet:</h3>
 
-<blockquote>
-<p>(Follow these steps if you don’t have a PHP project yet, and you need an environment to create the project)</p>
-</blockquote>
-
 <p>1 - Clone this repository anywhere on your machine:</p>
 
 <pre><code class="language-bash">git clone https://github.com/laradock/laradock.git
@@ -103,9 +99,11 @@
 
 <p><strong>In case of Apache:</strong> :P</p>
 
-<p>3 - Run your <code>docker-compose up</code> command and you’re ready to go.</p>
+<p><br></p>
 
-<p><em>Note: if you already had your containers up, you might need to take them down first and rebuild them for the changes to take effect.</em></p>
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
 
 <p><a name="B"></a></p>
 
@@ -141,7 +139,11 @@
 127.0.0.1  project-2.dev
 </code></pre>
 
-<p>5 - Visit <code>http://project-1.dev/</code> and <code>http://project-2.dev/</code>.</p>
+<blockquote>
+<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
+</blockquote>
+
+<p><a name="Usage"></a></p>
 
 <h2 id="usage">Usage</h2>
 
@@ -150,8 +152,8 @@
 <p>If you are using <strong>Docker Toolbox</strong> (VM), do one of the following:</p>
 
 <ul>
-<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="#upgrading-laradock">Upgrading Laradock</a></li>
-<li>Use Laradock v3.* (Visit the <code>Laradock-ToolBox</code> <a href="https://github.com/laradock/laradock/tree/Laradock-ToolBox">Branch</a>).</li>
+<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="http://laradock.io/documentation/#upgrading-laradock">Upgrading Laradock</a></li>
+<li>Use Laradock v3.*. Visit the <a href="https://github.com/laradock/laradock/tree/LaraDock-ToolBox">LaraDock-ToolBox</a> branch. <em>(outdated)</em></li>
 </ul>
 
 <p><br></p>
@@ -162,28 +164,33 @@
 
 <p><br></p>
 
-<p>1 - Run Containers: <em>(Make sure you are in the <code>laradock</code> folder before running the <code>docker-compose</code> commands).</em></p>
+<p>1 - Enter the laradock folder and rename <code>env-example</code> to <code>.env</code></p>
 
-<p><strong>Example:</strong> Running NGINX and MySQL:</p>
+<pre><code class="language-shell">cp env-example .env
+</code></pre>
+
+<p>You can edit the <code>.env</code> file to chose which software’s you want to be installed in your environment. You can always refer to the <code>docker-compose.yml</code> file to see how those variables are been used.</p>
+
+<p>2 - Build the enviroment and run it using <code>docker-compose</code></p>
+
+<p>In this example we’ll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:</p>
 
 <pre><code class="language-bash">docker-compose up -d nginx mysql
 </code></pre>
 
 <p><strong>Note</strong>: The <code>workspace</code> and <code>php-fpm</code> will run automatically in most of the cases, so no need to specify them in the <code>up</code> command. If you couldn’t find them running then you need specify them as follow: <code>docker-compose up -d nginx php-fpm mysql workspace</code>.</p>
 
-<p>You can select your own combination of Containers form the list below:</p>
-
-<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more…!</p>
+<p>You can select your own combination of containers form <a href="http://laradock.io/introduction/#supported-software-images">this list</a>.</p>
 
 <p><em>(Please note that sometimes we forget to update the docs, so check the <code>docker-compose.yml</code> file to see an updated list of all available containers).</em></p>
 
 <p><br>
-2 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, …).</p>
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, …)</p>
 
 <pre><code class="language-bash">docker-compose exec workspace bash
 </code></pre>
 
-<p>Alternatively, for Windows PowerShell users: execute the following command to enter any running container:</p>
+<p><em>Alternatively, for Windows PowerShell users: execute the following command to enter any running container:</em></p>
 
 <pre><code class="language-bash">docker exec -it {workspace-container-id} bash
 </code></pre>
@@ -193,12 +200,12 @@
 <pre><code class="language-shell">docker-compose exec --user=laradock workspace bash
 </code></pre>
 
-<p><em>You can change the PUID (User id) and PGID (group id) variables from the <code>docker-compose.yml</code> or the <code>.env</code>)</em></p>
+<p><em>You can change the PUID (User id) and PGID (group id) variables from the <code>.env</code> file)</em></p>
 
 <p><br>
-3 - Edit your project configurations.</p>
+4 - Update your project configurations to use the database host</p>
 
-<p>Open your <code>.env</code> file and set the <code>DB_HOST</code> to <code>mysql</code>:</p>
+<p>Open your PHP project’s <code>.env</code> file or whichever configuration file you are reading from, and set the database host <code>DB_HOST</code> to <code>mysql</code>:</p>
 
 <pre><code class="language-env">DB_HOST=mysql
 </code></pre>
@@ -206,7 +213,7 @@
 <p><em>If you want to install Laravel as PHP project, see <a href="#Install-Laravel">How to Install Laravel in a Docker Container</a>.</em></p>
 
 <p><br>
-4 - Open your browser and visit your localhost address <code>http://localhost/</code>.</p>
+5 - Open your browser and visit your localhost address <code>http://localhost/</code>. If you followed the multiple projects setup, you can visit <code>http://project-1.dev/</code> and <code>http://project-2.dev/</code>. But first don’t</p>
 </description>
     </item>
     

docs/help/index.html

@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Help &amp; Questions - Laradock</title>
-    <meta name="generator" content="Hugo 0.18.1" />
+    <meta name="generator" content="Hugo 0.19" />
 
     
-    <meta name="description" content="Laradock documentations.">
+    <meta name="description" content="Full PHP development environment for Docker.">
     
     <link rel="canonical" href="http://laradock.io/help/">
     
@@ -22,7 +22,7 @@
 
     <meta property="og:url" content="http://laradock.io/help/">
     <meta property="og:title" content="Laradock">
-    
+    <meta property="og:image" content="http://laradock.io/images/logo.png">
     <meta name="apple-mobile-web-app-title" content="Laradock">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -129,15 +129,19 @@
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
+  <a href="http://laradock.io/" class="project">
+    <div class="banner">
+      
+        <div class="logo">
+          <img src="http://laradock.io/images/logo.png">
+        </div>
       
       
         
         
       
-        
-      
-    
-  
+    </div>
+  </a>
 
   <div class="scrollable">
     <div class="wrapper">
@@ -211,9 +215,9 @@
 
 
 
-<a  title="Related Projects" href="http://laradock.io/related-projects/">
+<a  title="Giudes" href="http://laradock.io/guides/">
 	
-	Related Projects
+	Giudes
 </a>
 
 
@@ -250,6 +254,24 @@
 
 
 
+<a  title="Related Projects" href="http://laradock.io/related-projects/">
+	
+	Related Projects
+</a>
+
+
+
+  
+</li>
+
+
+
+<li>
+  
+    
+
+
+
 <a  title="Contributing" href="http://laradock.io/contributing/">
 	
 	Contributing
@@ -330,7 +352,7 @@
 <nav class="pagination" aria-label="Footer">
   <div class="previous">
   
-      <a href="http://laradock.io/related-projects/" title="Related Projects">
+      <a href="http://laradock.io/guides/" title="Guides">
         <span class="direction">
           Previous
         </span>
@@ -340,7 +362,7 @@
           </div>
           <div class="stretch">
             <div class="title">
-              Related Projects
+              Guides
             </div>
           </div>
         </div>
@@ -350,14 +372,14 @@
 
   <div class="next">
   
-      <a href="http://laradock.io/contributing/" title="Contributing">
+      <a href="http://laradock.io/related-projects/" title="Related Projects">
         <span class="direction">
           Next
         </span>
         <div class="page">
           <div class="stretch">
             <div class="title">
-              Contributing
+              Related Projects
             </div>
           </div>
           <div class="button button-next" role="button" aria-label="Next">