Merge branch 'master' into master

.gitignore

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

DOCUMENTATION/_settings/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:
 
@@ -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,6 +130,7 @@ You can rename the config files, project folders and domains as you like, just m
 
 
 
+<a name="Usage"></a>
 ## Usage
 
 **Read Before starting:**
@@ -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,21 @@ 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:
+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...!
+> `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...!
 
 *(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 +192,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 +206,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 
+
+

docker-compose.yml

@@ -350,6 +350,7 @@ services:
         - CN="fake.domain.com"
         - EMAIL="fake.email@gmail.com"
 
+
 ### Mailhog Container #########################################
 
     mailhog:
@@ -358,7 +359,6 @@ services:
         - "1025:1025"
         - "8025:8025"
 
-
 ### Selenium Container #########################################
 
     selenium:

docs/getting-started/index.html

@@ -346,10 +346,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
@@ -371,16 +367,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
@@ -398,11 +394,12 @@
 
 <p><em>Or you can keep <code>default.conf</code> as it is, and create a separate config <code>my-site.conf</code> file for it.</em></p>
 
-<p><strong>In case of Apache:</strong> :P</p>
+<p><strong>In case of Apache:</strong> :P
+<br></p>
 
-<p>3 - Run your <code>docker-compose up</code> command and you&rsquo;re ready to go.</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 +435,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>
 
@@ -459,28 +460,37 @@
 
 <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>
+
+<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><strong>Example:</strong> Running NGINX and MySQL:</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>You can select your own combination of containers form the list below:</p>
 
+<blockquote>
 <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>
+</blockquote>
 
 <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 +500,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 +513,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
@@ -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
@@ -101,11 +97,12 @@
 
 <p><em>Or you can keep <code>default.conf</code> as it is, and create a separate config <code>my-site.conf</code> file for it.</em></p>
 
-<p><strong>In case of Apache:</strong> :P</p>
+<p><strong>In case of Apache:</strong> :P
+<br></p>
 
-<p>3 - Run your <code>docker-compose up</code> command and you’re ready to go.</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 +138,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>
 
@@ -162,28 +163,37 @@
 
 <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>
+
+<pre><code class="language-shell">cp env-example .env
+</code></pre>
 
-<p><strong>Example:</strong> Running NGINX and MySQL:</p>
+<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>You can select your own combination of containers form the list below:</p>
 
+<blockquote>
 <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>
+</blockquote>
 
 <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 +203,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 +216,8 @@
 <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/index.html

@@ -544,10 +544,6 @@ QUEUE_HOST=beanstalkd
 
 <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
@@ -569,16 +565,16 @@ QUEUE_HOST=beanstalkd
 	+ 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
@@ -596,11 +592,12 @@ QUEUE_HOST=beanstalkd
 
 <p><em>Or you can keep <code>default.conf</code> as it is, and create a separate config <code>my-site.conf</code> file for it.</em></p>
 
-<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><strong>In case of Apache:</strong> :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>
 
@@ -636,7 +633,11 @@ QUEUE_HOST=beanstalkd
 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>
 
@@ -657,28 +658,37 @@ QUEUE_HOST=beanstalkd
 
 <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>
+
+<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><strong>Example:</strong> Running NGINX and MySQL:</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>You can select your own combination of containers form the list below:</p>
 
+<blockquote>
 <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>
+</blockquote>
 
 <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>
@@ -688,12 +698,12 @@ QUEUE_HOST=beanstalkd
 <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>
@@ -701,7 +711,7 @@ QUEUE_HOST=beanstalkd
 <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>
 
 			
 				<h1>Documentation </h1>
@@ -1939,7 +1949,6 @@ These Docker Compose projects have piqued our interest:</li>
 <h2 id="i-have-a-question-problem">I have a Question/Problem</h2>
 
 <p>If you have questions about how to use Laradock, please direct your questions to the discussion on <a href="https://gitter.im/Laradock/laradock">Gitter</a>. If you believe your question could help others, then consider opening an <a href="https://github.com/laradock/laradock/issues">Issue</a> (it will be labeled as <code>Question</code>) And you can still seek help on Gitter for it.</p>
-
 <h2 id="i-found-an-issue">I found an Issue</h2>
 
 <p>If have an issue or you found a typo in the documentation, you can help us by

docs/index.xml

@@ -251,10 +251,6 @@ QUEUE_HOST=beanstalkd
 
 <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
@@ -276,16 +272,16 @@ QUEUE_HOST=beanstalkd
 	+ 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
@@ -303,11 +299,12 @@ QUEUE_HOST=beanstalkd
 
 <p><em>Or you can keep <code>default.conf</code> as it is, and create a separate config <code>my-site.conf</code> file for it.</em></p>
 
-<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><strong>In case of Apache:</strong> :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>
 
@@ -343,7 +340,11 @@ QUEUE_HOST=beanstalkd
 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>
 
@@ -364,28 +365,37 @@ QUEUE_HOST=beanstalkd
 
 <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>
+
+<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><strong>Example:</strong> Running NGINX and MySQL:</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>You can select your own combination of containers form the list below:</p>
 
+<blockquote>
 <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>
+</blockquote>
 
 <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>
@@ -395,12 +405,12 @@ QUEUE_HOST=beanstalkd
 <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>
@@ -408,7 +418,7 @@ QUEUE_HOST=beanstalkd
 <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>
     
@@ -1703,7 +1713,6 @@ features, by not reporting duplicate issues.&lt;/em&gt;&lt;/p&gt;
 &lt;h3 id=&#34;to-host-the-website-locally&#34;&gt;To Host the website locally&lt;/h3&gt;
 
 &lt;p&gt;Go to &lt;code&gt;DOCUMENTATION/_settings&lt;/code&gt; in your terminal and run &lt;code&gt;hugo serve&lt;/code&gt; to host the website locally.&lt;/p&gt;
-
 &lt;h3 id=&#34;edit-the-sidebar&#34;&gt;Edit the sidebar&lt;/h3&gt;
 
 &lt;p&gt;To add a new section to the sidebar or edit existing one, you need to edit this file &lt;code&gt;DOCUMENTATION/_settings/config.toml&lt;/code&gt;.&lt;/p&gt;

php-fpm/Dockerfile-70

@@ -179,7 +179,7 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 # Mysqli Modifications:
 #####################################
 ARG INSTALL_MYSQLI=false
-RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \    
      docker-php-ext-install mysqli \
 ;fi