Merge pull request #684 from laradock/revert-639-master

Revert "Add apache conf file for specific virtualhost ServerName"

certbot/Dockerfile

@@ -0,0 +1,8 @@
+FROM phusion/baseimage:latest
+
+COPY run-certbot.sh /root/certbot/run-certbot.sh
+
+RUN apt-get update
+RUN apt-get install -y letsencrypt
+
+ENTRYPOINT bash -c "bash /root/certbot/run-certbot.sh && sleep infinity"

certbot/run-certbot.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+letsencrypt certonly --webroot -w /var/www/letsencrypt -d "$CN" --agree-tos --email "$EMAIL" --non-interactive --text
+
+cp /etc/letsencrypt/archive/"$CN"/cert1.pem /var/certs/cert1.pem
+cp /etc/letsencrypt/archive/"$CN"/privkey1.pem /var/certs/privkey1.pem

docker-compose.yml

@@ -35,6 +35,7 @@ services:
                 - NODE_VERSION=stable
                 - YARN_VERSION=latest
                 - TZ=UTC
+            # dockerfile: Dockerfile-71
         volumes_from:
             - applications
         extra_hosts:
@@ -61,6 +62,7 @@ services:
                 - INSTALL_EXIF=false
                 - INSTALL_AEROSPIKE_EXTENSION=false
                 - CODEIGNITER=false
+                - GHOSTSCRIPT=false
             dockerfile: Dockerfile-70
         volumes_from:
             - applications
@@ -336,12 +338,32 @@ services:
         build: ./elasticsearch
         volumes:
             - elasticsearch-data:/usr/share/elasticsearch/data
-            - elasticsearch-plugins:/usr/share/elasticsearch/data
+            - elasticsearch-plugins:/usr/share/elasticsearch/plugins
         ports:
             - "9200:9200"
             - "9300:9300"
         links:
             - php-fpm
+            
+### Certbot Container ##################################
+            
+    certbot:
+        build:
+            context: ./certbot
+        volumes:
+            - ./data/certbot/certs/:/var/certs
+            - ./certbot/letsencrypt/:/var/www/letsencrypt
+        environment:
+            CN: "fake.domain.com"
+            EMAIL: "fake.email@gmail.com"
+
+### Mailhog Container #########################################
+
+    mailhog:
+        build: ./mailhog
+        ports:
+            - "1025:1025"
+            - "8025:8025"
 
 ### Selenium Container #########################################
 

docs/_settings/config.toml

@@ -1,7 +1,7 @@
 baseurl = "http://laradock.io/"
 languageCode = "en-us"
 publishDir = "../"
-title = "Laradock Docs"
+title = "Laradock"
 theme = "hugo-material-docs"
 metadataformat = "yaml"
 canonifyurls = true
@@ -15,8 +15,8 @@ googleAnalytics = "UA-37514928-9"
 	copyright = ""
 
 	# Repository
-	provider = "GitHub"
-	repo_url = "https://github.com/laradock/laradock"
+	provider = ""
+	repo_url = ""
 
 	version = ""
 	logo = ""
@@ -32,8 +32,8 @@ googleAnalytics = "UA-37514928-9"
 	highlight_css  = ""
 
 	[params.palette]
-    	primary = "purple"
-    	accent  = "deep-purple"
+    	primary = "deep-purple"
+    	accent  = "purple"
 
     [params.font]
     	text = "Doctarine"
@@ -41,7 +41,7 @@ googleAnalytics = "UA-37514928-9"
 
 [social]
 	twitter = ""
-	github  = "laradock"
+	github  = "laradock/laradock"
 	email   = ""
 
 # ------- MENU START -----------------------------------------

docs/_settings/content/contributing/index.md

@@ -19,7 +19,7 @@ submitting an [Issue](https://github.com/laradock/laradock/issues). Even better
 You can request a new feature by submitting an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.
 
 
-## Edit the documentation
+## Update Documentation (Site)
 
 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.
 
@@ -30,7 +30,7 @@ Laradock uses [Hugo](https://gohugo.io/) as website generator tool, with the [Ma
 4. Delete everything except the `_settings` folder & the `CNAME` file.
 5. Open `docs/_settings` from your terminal and run `hugo serve` to host the website locally.
 6. Open the `docs/_settings/content` and search for the folder of the section you want to edit.
-7. In each secion there's an `index.md` file, that's the file you need to edit.
+7. In each section there's an `index.md` file, that's the file you need to edit.
 8. To edit the sidebar (in case you are adding new section) go to `docs/_settings/config.toml` and add the section there.
 9. After done editing, run the this command `hugo` to generate the updated site inside the `docs` folder.
 10. Go back to the project root directory, commit and push..

docs/_settings/themes/hugo-material-docs/exampleSite/config.toml

@@ -1,78 +0,0 @@
-baseurl = "https://example.org/"
-languageCode = "en-us"
-title = "Material Docs"
-theme = "hugo-material-docs"
-metadataformat = "yaml"
-canonifyurls = true
-# Enable Google Analytics by entering your tracking id
-googleAnalytics = ""
-
-[params]
-	# General information
-	author = "Digitalcraftsman"
-	description = "A material design theme for documentations."
-	copyright = "Released under the MIT license"
-
-	# Repository
-	provider = "GitHub"
-	repo_url = "https://github.com/digitalcraftsman/hugo-material-docs"
-
-	version = "1.0.0"
-	logo = "images/logo.png"
-	favicon = ""
-
-	permalink = "#"
-
-	# Custom assets
-	custom_css = []
-	custom_js  = []
-
-	# Syntax highlighting theme
-	highlight_css  = ""
-
-	[params.palette]
-    	primary = "red"
-    	accent  = "teal"
-
-    [params.font]
-    	text = "Ubuntu"
-    	code = "Ubuntu Mono"
-
-
-[social]
-	twitter = ""
-	github  = "digitalcraftsman"
-	email   = "hello@email.com"
-
-
-[[menu.main]]
-	name   = "Material"
-	url    = "/"
-	weight = 0
-
-[[menu.main]]
-	name   = "Getting started"
-	url    = "getting-started/"
-	weight = 10
-
-[[menu.main]]
-	name   = "Adding content"
-	url    = "adding-content/"
-	weight = 20
-
-[[menu.main]]
-	name   = "Roadmap"
-	url    = "roadmap/"
-	weight = 30
-
-[[menu.main]]
-	name   = "License"
-	url    = "license/"
-	weight = 40
-
-
-[blackfriday]
-	smartypants	= true
-	fractions = true
-	smartDashes = true
-	plainIDAnchors = true

docs/_settings/themes/hugo-material-docs/exampleSite/content/adding-content/index.md

@@ -1,61 +0,0 @@
----
-date: 2016-03-09T19:56:50+01:00
-title: Adding content
-weight: 20
----
-
-## Hello world
-
-Let's create our first content file for your documentation. Open a terminal and add the following command for each new file you want to add. Replace `<section-name>` with a general term that describes your document in detail.
-
-```sh
-hugo new <section-name>/filename.md
-```
-
-Visitors of your website will find the final document under `www.example.com/<section-name>/filename/`.
-
-Since it's possible to have multiple content files in the same section I recommend to create at least one `index.md` file per section. This ensures that users will find an index page under `www.example.com/<section-name>`.
-
-## Homepage
-
-To add content to the homepage you need to add a small indicator to the frontmatter of the content file:
-
-```toml
-type: index
-```
-
-Otherwise the theme will not be able to find the corresponding content file.
-
-## Table of contents
-
-You maybe noticed that the menu on the left contains a small table of contents of the current page. All `<h2>` tags (`## Headline` in Markdown) will be added automatically.
-
-## Admonitions
-
-Admonition is a handy feature that adds block-styled side content to your documentation, for example hints, notes or warnings. It can be enabled by using the corresponding [shortcodes](http://gohugo.io/extras/shortcodes/) inside your content:
-
-```go
-{{</* note title="Note" */>}}
-Nothing to see here, move along.
-{{</* /note */>}}
-```
-
-This will print the following block:
-
-{{< note title="Note" >}}
-Nothing to see here, move along.
-{{< /note >}}
-
-The shortcode adds a neutral color for the note class and a red color for the warning class. You can also add a custom title:
-
-```go
-{{</* warning title="Don't try this at home" */>}}
-Nothing to see here, move along.
-{{</* /warning */>}}
-```
-
-This will print the following block:
-
-{{< warning title="Don't try this at home" >}}
-Nothing to see here, move along.
-{{< /warning >}}

docs/_settings/themes/hugo-material-docs/exampleSite/content/getting-started/index.md

@@ -1,240 +0,0 @@
----
-date: 2016-03-09T00:11:02+01:00
-title: Getting started
-weight: 10
----
-
-## Installation
-
-### Installing Hugo
-
-Hugo itself is just a single binary without dependencies on expensive runtimes like Ruby, Python or PHP and without dependencies on any databases. You just need to download the [latest version](https://github.com/spf13/hugo/releases). For more information read the official [installation guides](http://gohugo.io/overview/installing/).
-
-Let's make sure Hugo is set up as expected. You should see a similar version number in your terminal:
-
-```sh
-hugo version
-# Hugo Static Site Generator v0.15 BuildDate: 2016-01-03T12:47:47+01:00
-```
-
-### Installing Material
-
-Next, assuming you have Hugo up and running the `hugo-material-docs` theme can be installed with `git`:
-
-```sh
-# create a new Hugo website
-hugo new site my-awesome-docs
-
-# move into the themes folder of your website
-cd my-awesome-docs/themes/
-
-# download the theme
-git clone git@github.com:digitalcraftsman/hugo-material-docs.git
-```
-
-## Setup
-
-Next, take a look in the `exampleSite` folder at `themes/hugo-material-docs/`. This directory contains an example config file and the content that you are currently reading. It serves as an example setup for your documentation.
-
-Copy at least the `config.toml` in the root directory of your website. Overwrite the existing config file if necessary.
-
-Hugo includes a development server, so you can view your changes as you go -
-very handy. Spin it up with the following command:
-
-``` sh
-hugo server
-```
-
-Now you can go to [localhost:1313](http://localhost:1313) and the Material
-theme should be visible. You can now start writing your documentation, or read
-on and customize the theme through some options.
-
-## Configuration
-
-Before you are able to deploy your documentation you should take a few minute to adjust some information in the `config.toml`. Open the file in an editor:
-
-```toml
-baseurl = "https://example.com/"
-languageCode = "en-us"
-title = "Material Docs"
-
-[params]
-  # General information
-  author = "Digitalcraftsman"
-  description = "A material design theme for documentations."
-  copyright = "Released under the MIT license"
-```
-
-## Options
-
-### Github integration
-
-If your project is hosted on GitHub, add the repository link to the
-configuration. If the `provider` equals **GitHub**, the Material theme will
-add a download and star button, and display the number of stars:
-
-```toml
-[params]
-  # Repository
-  provider = "GitHub"
-  repo_url = "https://github.com/digitalcraftsman/hugo-material-docs"
-```
-
-### Adding a version
-
-In order to add the current version next to the project banner inside the
-drawer, you can set the variable `version`:
-
-```toml
-[params]
-  version = "1.0.0"
-```
-
-This will also change the link behind the download button to point to the
-archive with the respective version on GitHub, assuming a release tagged with
-this exact version identifier.
-
-### Adding a logo
-
-If your project has a logo, you can add it to the drawer/navigation by defining
-the variable `logo`. Ideally, the image of your logo should have
-rectangular shape with a minimum resolution of 128x128 and leave some room
-towards the edges. The logo will also be used as a web application icon on iOS.
-Either save your logo somewhere in the `static/` folder and reference the file relative to this location or use an external URL:
-
-```toml
-[params]
-  logo = "images/logo.png"
-```
-
-### Adding a custom favicon
-
-Favicons are small small icons that are displayed in the tabs right next to the title of the current page. As with the logo above you need to save your favicon in `static/` and link it relative to this folder or use an external URL:
-
-```toml
-[params]
-  favicon = "favicon.ico"
-```
-
-### Google Analytics
-
-You can enable Google Analytics by replacing `UA-XXXXXXXX-X` with your own tracking code.
-
-```toml
-googleAnalytics = "UA-XXXXXXXX-X"
-```
-
-### Small tweaks
-
-This theme provides a simple way for making small adjustments, that is changing
-some margins, centering text, etc. The `custom_css` and `custom_js` option allow you to add further CSS and JS files. They can either reside locally in the `/static` folder or on an external server, e.g. a CDN. In both cases use either the relative path to `/static` or the absolute URL to the external ressource.
-
-
-```toml
-[params]
-  # Custom assets
-  custom_css = [
-    "foo.css",
-    "bar.css"
-  ]
-
-  custom_js  = ["buzz.js"]
-```
-
-### Changing the color palette
-
-Material defines a default hue for every primary and accent color on Google's
-material design [color palette][]. This makes it very easy to change the overall look of the theme. Just set the variables `palette.primary` and `palette.accent` to one of the colors defined in the palette:
-
-```toml
-[params.palette]
-  primary = "red"
-  accent  = "light-green"
-```
-
-Color names can be written upper- or lowercase but must match the names of the
-material design [color palette](http://www.materialui.co/colors). Valid values are: _red_, _pink_, _purple_, _deep purple_, _indigo_, _blue_, _light-blue_, _cyan_, _teal_, _green_, _light-green_,
-_lime_, _yellow_, _amber_, _orange_, _deep-orange_, _brown_, _grey_ and
-_blue-grey_. The last three colors can only be used as a primary color.
-
-![Color palette](/images/colors.png)
-
-If the color is set via this configuration, an additional CSS file called
-`palettes.css` is included that defines the color palettes.
-
-### Changing the font family
-
-Material uses the [Ubuntu font family](http://font.ubuntu.com) by default, specifically the regular sans-serif type for text and the monospaced type for code. Both fonts are loaded from [Google Fonts](https://www.google.com/fonts) and can be easily changed to other fonts, like for example Google's own [Roboto font](https://www.google.com/fonts/specimen/Roboto):
-
-```toml
-[params.font]
-  text = "Roboto"
-  code = "Roboto Mono"
-```
-
-The text font will be loaded in font-weights 400 and **700**, the monospaced
-font in regular weight.
-
-### Syntax highlighting
-
-This theme uses the popular [Highlight.js](https://highlightjs.org/) library to colorize code examples. The default theme is called `Github` with a few small tweaks. You can link our own theme if you like. Again, store your stylesheet in the `static/` folder and set the relative path in the config file:
-
-```toml
-[params]
-  # Syntax highlighting theme
-  highlight_css  = "path/to/theme.css"
-```
-
-### Adding a GitHub and Twitter account
-
-If you have a GitHub and/or Twitter account, you can add links to your
-accounts to the drawer by setting the variables `github` and
-`twitter` respectively:
-
-``` toml
-[social]
-  twitter = ""
-  github  = "digitalcraftsman"
-```
-
-### Adding menu entries
-
-Once you created your first content files you can link them manually in the sidebar on the left. A menu entry has the following schema:
-
-```toml
-[[menu.main]]
-  name   = "Material"
-  url    = "/"
-  weight = 0
-  pre    = ""
-```
-
-`name` is the title displayed in the menu and `url` the relative URL to the content. The `weight` attribute allows you to modify the order of the menu entries. A menu entry appears further down the more weight you add. The `pre` attribute is optional and allows you to *pre*pend elements to a menu link, e.g. an icon.
-
-Instead of just linking a single file you can enhance the sidebar by creating a nested menu. This way you can list all pages of a section instead of linking them one by one (without nesting).
-
-You need extend the frontmatter of each file content file in a section slightly. The snippet below registers this content file as 'child' of a menu entry that already exists.
-
-```yaml
-menu:
-  main:
-    parent: Material
-    identifier: <link name>
-    weight: 0
-```
-
-`main` specifies to which menu the content file should be added. `main` is the only menu in this theme by default. `parent` let's you register this content file to an existing menu entry, in this case the `Material` link. Note that the parent in the frontmatter needs to match the name in `config.toml`.
-
-`identifier` is the link that is shown in the menu. Ideally you choose the same name for the `identifier` and the `title` of the page. Again, `weight` allows you to change the order of the nested links in a section.
-
-### Markdown extensions
-
-Hugo uses [Blackfriday](https://github.com/russross/blackfriday) to process your content. For a detailed description of all options take a look at the [Blackfriday configuration](http://gohugo.io/overview/configuration/#configure-blackfriday-rendering) section in the Hugo documentation.
-
-```toml
-[blackfriday]
-  smartypants = true
-  fractions = true
-  smartDashes = true
-  plainIDAnchors = true
-```

docs/_settings/themes/hugo-material-docs/exampleSite/content/index.md

@@ -1,55 +0,0 @@
----
-date: 2016-03-08T21:07:13+01:00
-title: Material for Hugo
-type: index
-weight: 0
----
-
-## Beautiful documentation
-
-Material is a theme for [Hugo](https://gohugo.io), a fast and flexible static site generator. It is built using Google's [material design](https://www.google.com/design/spec/material-design/introduction.html)
-guidelines, fully responsive, optimized for touch and pointer devices as well
-as all sorts of screen sizes.
-
-![Material Screenshot](/images/screen.png)
-
-Material is very lightweight – it is built from scratch using Javascript and
-CSS that weighs less than 30kb (minified, gzipped and excluding Google Fonts
-and Analytics). Yet, it is highly customizable and degrades gracefully in older
-browsers.
-
-## Quick start
-
-Install with `git`:
-
-```sh
-git clone git@github.com:digitalcraftsman/hugo-material-docs.git themes/hugo-material-docs
-```
-
-## Features
-
-- Beautiful, readable and very user-friendly design based on Google's material
-  design guidelines, packed in a full responsive template with a well-defined
-  and [easily customizable color palette]({{< relref "getting-started/index.md#changing-the-color-palette" >}}), great typography, as well as a
-  beautiful search interface and footer.
-
-- Well-tested and optimized Javascript and CSS including a cross-browser
-  fixed/sticky header, a drawer that even works without Javascript using
-  the [checkbox hack](http://tutorialzine.com/2015/08/quick-tip-css-only-dropdowns-with-the-checkbox-hack/) with fallbacks, responsive tables that scroll when
-  the screen is too small and well-defined print styles.
-
-- Extra configuration options like a [project logo]({{< relref "getting-started/index.md#adding-a-logo" >}}), links to the authors
-  [GitHub and Twitter accounts]({{< relref "getting-started/index.md#adding-a-github-and-twitter-account" >}}) and display of the amount of stars the
-  project has on GitHub.
-
-- Web application capability on iOS – when the page is saved to the homescreen,
-  it behaves and looks like a native application.
-
-See the [getting started guide]({{< relref "getting-started/index.md" >}}) for instructions how to get
-it up and running.
-
-## Acknowledgements
-
-Last but not least a big thank you to [Martin Donath](https://github.com/squidfunk). He created the original [Material theme](https://github.com/squidfunk/mkdocs-material) for Hugo's companion [MkDocs](http://www.mkdocs.org/). This port wouldn't be possible without him.
-
-Furthermore, thanks to [Steve Francia](https://gihub.com/spf13) for creating Hugo and the [awesome community](https://github.com/spf13/hugo/graphs/contributors) around the project.

docs/_settings/themes/hugo-material-docs/exampleSite/content/license/index.md

@@ -1,27 +0,0 @@
----
-date: 2016-03-09T20:10:46+01:00
-title: License
-weight: 40
----
-
-Copyright (c) 2016 Digitalcraftsman <digitalcraftsman@protonmail.com><br>
-Copyright (c) 2016 Martin Donath <martin.donath@squidfunk.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-

docs/_settings/themes/hugo-material-docs/exampleSite/content/roadmap/index.md

@@ -1,27 +0,0 @@
----
-date: 2016-03-09T20:08:11+01:00
-title: Roadmap
-weight: 30
----
-
-Quo vadis? The port of the original [Material theme](https://github.com/squidfunk/mkdocs-material) has replicated nearly all of its features. A few are still missing but I've good news: the Hugo community is actively working on this issues. Maybe with the next release of Hugo we can abandon this list. Stay tuned.
-
-## Localization
-
-Currently, it is possible to collect all strings in a single place for easy customization. However, this only enables you to define all strings in a single language. This approach is quite limiting in terms of localization support. Therefore, I decided to wait for a native integration. This way we can avoid a second setup of all strings in your website.
-
-Keep an eye on [#1734](https://github.com/spf13/hugo/issues/1734).
-
-## Search
-
-Beside third-party services, some hacky workarounds and Grunt-/Gulp-based scripts that only require unnecessary dependencies, future versions of Hugo will support the generation of a content index as a core feature.
-
-This approach plays well with this theme since MkDocs does the same.
-
-Keep an eye on [#1853](https://github.com/spf13/hugo/pull/1853).
-
-## Contributing
-
-Did you found an bug or you would like to suggest a new feature? I'm open for feedback. Please open a new [issue](https://github.com/digitalcraftsman/hugo-material-docs/issues) and let me know.
-
-You're also welcome to contribute with [pull requests](https://github.com/digitalcraftsman/hugo-material-docs/pulls).

docs/_settings/themes/hugo-material-docs/layouts/index.html

@@ -37,7 +37,9 @@
 				Documentation built with
 				<a href="https://www.gohugo.io" target="_blank">Hugo</a>
 				using the
-				<a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme.
+				<a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme,
+                by
+                <a href="https://zalt.me">Mahmoud Zalt</a>.
 			</aside>
 
 			<footer class="footer">

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

@@ -1,20 +1,20 @@
 <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 }}
-      <div class="name">
-        <strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>
-        {{ with .Scratch.Get "repo_id" }}
-          <br>
-          {{ . }}
-        {{ end }}
-      </div>
-    </div>
-  </a>
+  <!--<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" }}-->
+          <!--<br>-->
+          <!--{{ . }}-->
+        <!--{{ end }}-->
+      <!--</div>-->
+    <!--</div>-->
+  <!--</a>-->
 
   <div class="scrollable">
     <div class="wrapper">
@@ -43,8 +43,8 @@
         {{ end }}
 
         {{ if isset .Site.Params "author" }}
-        <hr>
-        <span class="section">The author</span>
+        <!--<hr>-->
+        <!--<span class="section">The author</span>-->
         
         <ul>
           {{ with .Site.Social.twitter }}
@@ -55,13 +55,13 @@
           </li>
           {{ end }}
 
-          {{ with .Site.Social.github }}
-          <li>
-            <a href="https://github.com/{{ . }}" target="_blank" title="@{{ . }} on GitHub">
-              @{{ . }} on GitHub
-            </a>
-          </li>
-          {{ end }}
+          <!--{{ with .Site.Social.github }}-->
+          <!--<li>-->
+            <!--<a href="https://github.com/{{ . }}" target="_blank" title="@{{ . }} on GitHub">-->
+              <!--@{{ . }} on GitHub-->
+            <!--</a>-->
+          <!--</li>-->
+          <!--{{ end }}-->
 
           {{ with .Site.Social.email }}
           <li>

docs/_settings/themes/hugo-material-docs/layouts/partials/header.html

@@ -7,7 +7,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        {{ .Title }}
+          <b>{{ .Site.Title }}</b> <span style="color: rgba(249, 245, 255, 0.63);"> / {{ .Title }}</span>
       </div>
     </div>
 
@@ -19,8 +19,9 @@
 
     {{ with .Site.Social.github }}
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     {{ end }}
     
     <!-- TODO: disabled until Hugo supports the generation of a content index natively 
@@ -42,4 +43,4 @@
       <button class="toggle-button icon icon-close" id="reset-search"></button>
     </div>
   </div>
-</nav>
+</nav>

docs/contributing/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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 Docs</title>
+    <title>Contributing - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/contributing/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Contributing
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Contributing</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -347,7 +328,7 @@ submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a>. E
 
 <p>You can request a new feature by submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a> (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.</p>
 
-<h2 id="edit-the-documentation">Edit the documentation</h2>
+<h2 id="update-documentation-site">Update Documentation (Site)</h2>
 
 <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>
 
@@ -358,7 +339,7 @@ submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a>. E
 <li>Delete everything except the <code>_settings</code> folder &amp; the <code>CNAME</code> file.</li>
 <li>Open <code>docs/_settings</code> from your terminal and run <code>hugo serve</code> to host the website locally.</li>
 <li>Open the <code>docs/_settings/content</code> and search for the folder of the section you want to edit.</li>
-<li>In each secion there&rsquo;s an <code>index.md</code> file, that&rsquo;s the file you need to edit.</li>
+<li>In each section there&rsquo;s an <code>index.md</code> file, that&rsquo;s the file you need to edit.</li>
 <li>To edit the sidebar (in case you are adding new section) go to <code>docs/_settings/config.toml</code> and add the section there.</li>
 <li>After done editing, run the this command <code>hugo</code> to generate the updated site inside the <code>docs</code> folder.</li>
 <li>Go back to the project root directory, commit and push..</li>
@@ -570,8 +551,8 @@ from the main (upstream) repository:</p>
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/contributing/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Contributings on Laradock Docs</title>
+    <title>Contributings on Laradock</title>
     <link>http://laradock.io/contributing/index.xml</link>
-    <description>Recent content in Contributings on Laradock Docs</description>
+    <description>Recent content in Contributings on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/contributing/index.xml" rel="self" type="application/rss+xml" />
@@ -31,7 +31,7 @@ submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&g
 
 &lt;p&gt;You can request a new feature by submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&gt;Issue&lt;/a&gt; (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.&lt;/p&gt;
 
-&lt;h2 id=&#34;edit-the-documentation&#34;&gt;Edit the documentation&lt;/h2&gt;
+&lt;h2 id=&#34;update-documentation-site&#34;&gt;Update Documentation (Site)&lt;/h2&gt;
 
 &lt;p&gt;Laradock uses &lt;a href=&#34;https://gohugo.io/&#34;&gt;Hugo&lt;/a&gt; as website generator tool, with the &lt;a href=&#34;http://themes.gohugo.io/theme/material-docs/&#34;&gt;Material Docs theme&lt;/a&gt;. You might need to check their docs quickly.&lt;/p&gt;
 
@@ -42,7 +42,7 @@ submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&g
 &lt;li&gt;Delete everything except the &lt;code&gt;_settings&lt;/code&gt; folder &amp;amp; the &lt;code&gt;CNAME&lt;/code&gt; file.&lt;/li&gt;
 &lt;li&gt;Open &lt;code&gt;docs/_settings&lt;/code&gt; from your terminal and run &lt;code&gt;hugo serve&lt;/code&gt; to host the website locally.&lt;/li&gt;
 &lt;li&gt;Open the &lt;code&gt;docs/_settings/content&lt;/code&gt; and search for the folder of the section you want to edit.&lt;/li&gt;
-&lt;li&gt;In each secion there&amp;rsquo;s an &lt;code&gt;index.md&lt;/code&gt; file, that&amp;rsquo;s the file you need to edit.&lt;/li&gt;
+&lt;li&gt;In each section there&amp;rsquo;s an &lt;code&gt;index.md&lt;/code&gt; file, that&amp;rsquo;s the file you need to edit.&lt;/li&gt;
 &lt;li&gt;To edit the sidebar (in case you are adding new section) go to &lt;code&gt;docs/_settings/config.toml&lt;/code&gt; and add the section there.&lt;/li&gt;
 &lt;li&gt;After done editing, run the this command &lt;code&gt;hugo&lt;/code&gt; to generate the updated site inside the &lt;code&gt;docs&lt;/code&gt; folder.&lt;/li&gt;
 &lt;li&gt;Go back to the project root directory, commit and push..&lt;/li&gt;

docs/documentation/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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 Docs</title>
+    <title>Documentation - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/documentation/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Documentation
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Documentation</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -1028,6 +1009,36 @@ A package (<a href="https://github.com/duxet/laravel-rethinkdb">Laravel RethinkD
 <li>set the <code>DB_DATABASE</code> to <code>database</code>.</li>
 </ul>
 
+<p><br>
+<a name="Use-Minio"></a></p>
+
+<h2 id="use-minio">Use Minio</h2>
+
+<p>1 - Configure Minio:
+  - On the workspace container, change <code>INSTALL_MC</code> to true to get the client
+  - Set <code>MINIO_ACCESS_KEY</code> and <code>MINIO_ACCESS_SECRET</code> if you wish to set proper keys</p>
+
+<p>2 - Run the Minio Container (<code>minio</code>) with the <code>docker-compose up</code> command. Example:</p>
+
+<pre><code class="language-bash">docker-compose up -d minio
+</code></pre>
+
+<p>3 - Open your browser and visit the localhost on port <strong>9000</strong> at the following URL:  <code>http://localhost:9000</code></p>
+
+<p>4 - Create a bucket either through the webui or using the mc client:</p>
+
+<pre><code class="language-bash">  mc mb minio/bucket
+</code></pre>
+
+<p>5 - When configuring your other clients use the following details:</p>
+
+<pre><code>  S3_HOST=http://minio
+  S3_KEY=access
+  S3_SECRET=secretkey
+  S3_REGION=us-east-1
+  S3_BUCKET=bucket
+</code></pre>
+
 <p><br>
 <a name="CodeIgniter"></a></p>
 
@@ -1567,8 +1578,8 @@ e) set it to <code>true</code></p>
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/documentation/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Documentations on Laradock Docs</title>
+    <title>Documentations on Laradock</title>
     <link>http://laradock.io/documentation/index.xml</link>
-    <description>Recent content in Documentations on Laradock Docs</description>
+    <description>Recent content in Documentations on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/documentation/index.xml" rel="self" type="application/rss+xml" />
@@ -712,6 +712,36 @@ A package (&lt;a href=&#34;https://github.com/duxet/laravel-rethinkdb&#34;&gt;La
 &lt;li&gt;set the &lt;code&gt;DB_DATABASE&lt;/code&gt; to &lt;code&gt;database&lt;/code&gt;.&lt;/li&gt;
 &lt;/ul&gt;
 
+&lt;p&gt;&lt;br&gt;
+&lt;a name=&#34;Use-Minio&#34;&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;h2 id=&#34;use-minio&#34;&gt;Use Minio&lt;/h2&gt;
+
+&lt;p&gt;1 - Configure Minio:
+  - On the workspace container, change &lt;code&gt;INSTALL_MC&lt;/code&gt; to true to get the client
+  - Set &lt;code&gt;MINIO_ACCESS_KEY&lt;/code&gt; and &lt;code&gt;MINIO_ACCESS_SECRET&lt;/code&gt; if you wish to set proper keys&lt;/p&gt;
+
+&lt;p&gt;2 - Run the Minio Container (&lt;code&gt;minio&lt;/code&gt;) with the &lt;code&gt;docker-compose up&lt;/code&gt; command. Example:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-bash&#34;&gt;docker-compose up -d minio
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;p&gt;3 - Open your browser and visit the localhost on port &lt;strong&gt;9000&lt;/strong&gt; at the following URL:  &lt;code&gt;http://localhost:9000&lt;/code&gt;&lt;/p&gt;
+
+&lt;p&gt;4 - Create a bucket either through the webui or using the mc client:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-bash&#34;&gt;  mc mb minio/bucket
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;p&gt;5 - When configuring your other clients use the following details:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code&gt;  S3_HOST=http://minio
+  S3_KEY=access
+  S3_SECRET=secretkey
+  S3_REGION=us-east-1
+  S3_BUCKET=bucket
+&lt;/code&gt;&lt;/pre&gt;
+
 &lt;p&gt;&lt;br&gt;
 &lt;a name=&#34;CodeIgniter&#34;&gt;&lt;/a&gt;&lt;/p&gt;
 

docs/getting-started/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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 Docs</title>
+    <title>Getting Started - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/getting-started/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Getting Started
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Getting Started</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -563,8 +544,8 @@
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/getting-started/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Getting-starteds on Laradock Docs</title>
+    <title>Getting-starteds on Laradock</title>
     <link>http://laradock.io/getting-started/index.xml</link>
-    <description>Recent content in Getting-starteds on Laradock Docs</description>
+    <description>Recent content in Getting-starteds on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/getting-started/index.xml" rel="self" type="application/rss+xml" />

docs/help/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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 Docs</title>
+    <title>Help &amp; Questions - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/help/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Help &amp; Questions
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Help &amp; Questions</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -408,8 +389,8 @@
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/help/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Helps on Laradock Docs</title>
+    <title>Helps on Laradock</title>
     <link>http://laradock.io/help/index.xml</link>
-    <description>Recent content in Helps on Laradock Docs</description>
+    <description>Recent content in Helps on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/help/index.xml" rel="self" type="application/rss+xml" />

docs/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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>Laradock Docs</title>
+    <title>Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -69,18 +69,15 @@
     <script src="http://laradock.io/javascripts/modernizr.js"></script>
 
     
-    <link href="http://laradock.io/index.xml" rel="alternate" type="application/rss+xml" title="Laradock Docs" />
-    <link href="http://laradock.io/index.xml" rel="feed" type="application/rss+xml" title="Laradock Docs" />
+    <link href="http://laradock.io/index.xml" rel="alternate" type="application/rss+xml" title="Laradock" />
+    <link href="http://laradock.io/index.xml" rel="feed" type="application/rss+xml" title="Laradock" />
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -100,7 +97,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Laradock Docs
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Laradock</span>
       </div>
     </div>
 
@@ -108,8 +105,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -128,42 +126,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -484,6 +465,7 @@ QUEUE_HOST=beanstalkd
 <li>PgAdmin</li>
 <li>ElasticSearch</li>
 <li>Selenium</li>
+<li>Minio</li>
 <li>Workspace
 
 <ul>
@@ -1379,6 +1361,36 @@ A package (<a href="https://github.com/duxet/laravel-rethinkdb">Laravel RethinkD
 <li>set the <code>DB_DATABASE</code> to <code>database</code>.</li>
 </ul>
 
+<p><br>
+<a name="Use-Minio"></a></p>
+
+<h2 id="use-minio">Use Minio</h2>
+
+<p>1 - Configure Minio:
+  - On the workspace container, change <code>INSTALL_MC</code> to true to get the client
+  - Set <code>MINIO_ACCESS_KEY</code> and <code>MINIO_ACCESS_SECRET</code> if you wish to set proper keys</p>
+
+<p>2 - Run the Minio Container (<code>minio</code>) with the <code>docker-compose up</code> command. Example:</p>
+
+<pre><code class="language-bash">docker-compose up -d minio
+</code></pre>
+
+<p>3 - Open your browser and visit the localhost on port <strong>9000</strong> at the following URL:  <code>http://localhost:9000</code></p>
+
+<p>4 - Create a bucket either through the webui or using the mc client:</p>
+
+<pre><code class="language-bash">  mc mb minio/bucket
+</code></pre>
+
+<p>5 - When configuring your other clients use the following details:</p>
+
+<pre><code>  S3_HOST=http://minio
+  S3_KEY=access
+  S3_SECRET=secretkey
+  S3_REGION=us-east-1
+  S3_BUCKET=bucket
+</code></pre>
+
 <p><br>
 <a name="CodeIgniter"></a></p>
 
@@ -1889,7 +1901,7 @@ submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a>. E
 
 <p>You can request a new feature by submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a> (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.</p>
 
-<h2 id="edit-the-documentation">Edit the documentation</h2>
+<h2 id="update-documentation-site">Update Documentation (Site)</h2>
 
 <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>
 
@@ -1900,7 +1912,7 @@ submitting an <a href="https://github.com/laradock/laradock/issues">Issue</a>. E
 <li>Delete everything except the <code>_settings</code> folder &amp; the <code>CNAME</code> file.</li>
 <li>Open <code>docs/_settings</code> from your terminal and run <code>hugo serve</code> to host the website locally.</li>
 <li>Open the <code>docs/_settings/content</code> and search for the folder of the section you want to edit.</li>
-<li>In each secion there&rsquo;s an <code>index.md</code> file, that&rsquo;s the file you need to edit.</li>
+<li>In each section there&rsquo;s an <code>index.md</code> file, that&rsquo;s the file you need to edit.</li>
 <li>To edit the sidebar (in case you are adding new section) go to <code>docs/_settings/config.toml</code> and add the section there.</li>
 <li>After done editing, run the this command <code>hugo</code> to generate the updated site inside the <code>docs</code> folder.</li>
 <li>Go back to the project root directory, commit and push..</li>
@@ -2054,7 +2066,9 @@ from the main (upstream) repository:</p>
 				Documentation built with
 				<a href="https://www.gohugo.io" target="_blank">Hugo</a>
 				using the
-				<a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme.
+				<a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme,
+                by
+                <a href="https://zalt.me">Mahmoud Zalt</a>.
 			</aside>
 
 			<footer class="footer">
@@ -2105,8 +2119,8 @@ from the main (upstream) repository:</p>
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Laradock Docs</title>
+    <title>Laradock</title>
     <link>http://laradock.io/index.xml</link>
-    <description>Recent content on Laradock Docs</description>
+    <description>Recent content on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/index.xml" rel="self" type="application/rss+xml" />
@@ -167,6 +167,7 @@ QUEUE_HOST=beanstalkd
 &lt;li&gt;PgAdmin&lt;/li&gt;
 &lt;li&gt;ElasticSearch&lt;/li&gt;
 &lt;li&gt;Selenium&lt;/li&gt;
+&lt;li&gt;Minio&lt;/li&gt;
 &lt;li&gt;Workspace
 
 &lt;ul&gt;
@@ -1072,6 +1073,36 @@ A package (&lt;a href=&#34;https://github.com/duxet/laravel-rethinkdb&#34;&gt;La
 &lt;li&gt;set the &lt;code&gt;DB_DATABASE&lt;/code&gt; to &lt;code&gt;database&lt;/code&gt;.&lt;/li&gt;
 &lt;/ul&gt;
 
+&lt;p&gt;&lt;br&gt;
+&lt;a name=&#34;Use-Minio&#34;&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;h2 id=&#34;use-minio&#34;&gt;Use Minio&lt;/h2&gt;
+
+&lt;p&gt;1 - Configure Minio:
+  - On the workspace container, change &lt;code&gt;INSTALL_MC&lt;/code&gt; to true to get the client
+  - Set &lt;code&gt;MINIO_ACCESS_KEY&lt;/code&gt; and &lt;code&gt;MINIO_ACCESS_SECRET&lt;/code&gt; if you wish to set proper keys&lt;/p&gt;
+
+&lt;p&gt;2 - Run the Minio Container (&lt;code&gt;minio&lt;/code&gt;) with the &lt;code&gt;docker-compose up&lt;/code&gt; command. Example:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-bash&#34;&gt;docker-compose up -d minio
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;p&gt;3 - Open your browser and visit the localhost on port &lt;strong&gt;9000&lt;/strong&gt; at the following URL:  &lt;code&gt;http://localhost:9000&lt;/code&gt;&lt;/p&gt;
+
+&lt;p&gt;4 - Create a bucket either through the webui or using the mc client:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-bash&#34;&gt;  mc mb minio/bucket
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;p&gt;5 - When configuring your other clients use the following details:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code&gt;  S3_HOST=http://minio
+  S3_KEY=access
+  S3_SECRET=secretkey
+  S3_REGION=us-east-1
+  S3_BUCKET=bucket
+&lt;/code&gt;&lt;/pre&gt;
+
 &lt;p&gt;&lt;br&gt;
 &lt;a name=&#34;CodeIgniter&#34;&gt;&lt;/a&gt;&lt;/p&gt;
 
@@ -1597,7 +1628,7 @@ submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&g
 
 &lt;p&gt;You can request a new feature by submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&gt;Issue&lt;/a&gt; (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.&lt;/p&gt;
 
-&lt;h2 id=&#34;edit-the-documentation&#34;&gt;Edit the documentation&lt;/h2&gt;
+&lt;h2 id=&#34;update-documentation-site&#34;&gt;Update Documentation (Site)&lt;/h2&gt;
 
 &lt;p&gt;Laradock uses &lt;a href=&#34;https://gohugo.io/&#34;&gt;Hugo&lt;/a&gt; as website generator tool, with the &lt;a href=&#34;http://themes.gohugo.io/theme/material-docs/&#34;&gt;Material Docs theme&lt;/a&gt;. You might need to check their docs quickly.&lt;/p&gt;
 
@@ -1608,7 +1639,7 @@ submitting an &lt;a href=&#34;https://github.com/laradock/laradock/issues&#34;&g
 &lt;li&gt;Delete everything except the &lt;code&gt;_settings&lt;/code&gt; folder &amp;amp; the &lt;code&gt;CNAME&lt;/code&gt; file.&lt;/li&gt;
 &lt;li&gt;Open &lt;code&gt;docs/_settings&lt;/code&gt; from your terminal and run &lt;code&gt;hugo serve&lt;/code&gt; to host the website locally.&lt;/li&gt;
 &lt;li&gt;Open the &lt;code&gt;docs/_settings/content&lt;/code&gt; and search for the folder of the section you want to edit.&lt;/li&gt;
-&lt;li&gt;In each secion there&amp;rsquo;s an &lt;code&gt;index.md&lt;/code&gt; file, that&amp;rsquo;s the file you need to edit.&lt;/li&gt;
+&lt;li&gt;In each section there&amp;rsquo;s an &lt;code&gt;index.md&lt;/code&gt; file, that&amp;rsquo;s the file you need to edit.&lt;/li&gt;
 &lt;li&gt;To edit the sidebar (in case you are adding new section) go to &lt;code&gt;docs/_settings/config.toml&lt;/code&gt; and add the section there.&lt;/li&gt;
 &lt;li&gt;After done editing, run the this command &lt;code&gt;hugo&lt;/code&gt; to generate the updated site inside the &lt;code&gt;docs&lt;/code&gt; folder.&lt;/li&gt;
 &lt;li&gt;Go back to the project root directory, commit and push..&lt;/li&gt;

docs/introduction/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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>Introduction - Laradock Docs</title>
+    <title>Introduction - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/introduction/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Introduction
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Introduction</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -483,6 +464,7 @@ QUEUE_HOST=beanstalkd
 <li>PgAdmin</li>
 <li>ElasticSearch</li>
 <li>Selenium</li>
+<li>Minio</li>
 <li>Workspace
 
 <ul>
@@ -573,8 +555,8 @@ QUEUE_HOST=beanstalkd
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/introduction/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Introductions on Laradock Docs</title>
+    <title>Introductions on Laradock</title>
     <link>http://laradock.io/introduction/index.xml</link>
-    <description>Recent content in Introductions on Laradock Docs</description>
+    <description>Recent content in Introductions on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/introduction/index.xml" rel="self" type="application/rss+xml" />
@@ -167,6 +167,7 @@ QUEUE_HOST=beanstalkd
 &lt;li&gt;PgAdmin&lt;/li&gt;
 &lt;li&gt;ElasticSearch&lt;/li&gt;
 &lt;li&gt;Selenium&lt;/li&gt;
+&lt;li&gt;Minio&lt;/li&gt;
 &lt;li&gt;Workspace
 
 &lt;ul&gt;

docs/license/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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>License - Laradock Docs</title>
+    <title>License - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/license/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        License
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / License</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -406,8 +387,8 @@
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/license/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Licenses on Laradock Docs</title>
+    <title>Licenses on Laradock</title>
     <link>http://laradock.io/license/index.xml</link>
-    <description>Recent content in Licenses on Laradock Docs</description>
+    <description>Recent content in Licenses on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/license/index.xml" rel="self" type="application/rss+xml" />

docs/related-projects/index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <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>Related Projects - Laradock Docs</title>
+    <title>Related Projects - Laradock</title>
     <meta name="generator" content="Hugo 0.18.1" />
 
     
@@ -21,9 +21,9 @@
     
 
     <meta property="og:url" content="http://laradock.io/related-projects/">
-    <meta property="og:title" content="Laradock Docs">
+    <meta property="og:title" content="Laradock">
     
-    <meta name="apple-mobile-web-app-title" content="Laradock Docs">
+    <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">
 
@@ -71,13 +71,10 @@
     
 
   </head>
-  <body class="palette-primary-purple palette-accent-deep-purple">
+  <body class="palette-primary-deep-purple palette-accent-purple">
 
 
 
-	
-	
-
 
 <div class="backdrop">
 	<div class="backdrop-paper"></div>
@@ -97,7 +94,7 @@
     </div>
     <div class="stretch">
       <div class="title">
-        Related Projects
+          <b>Laradock</b> <span style="color: rgba(249, 245, 255, 0.63);"> / Related Projects</span>
       </div>
     </div>
 
@@ -105,8 +102,9 @@
 
     
     <div class="button button-github" role="button" aria-label="GitHub">
-      <a href="https://github.com/laradock" title="@laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+        <a style="padding: 0px; font-size:40px" href="https://github.com/laradock/laradock" title="@laradock/laradock on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+      <p style="font-size: 18px; padding: 8px">Github</p>
     
     
         
@@ -125,42 +123,25 @@
     </div>
   </div>
 </nav>
+
 </header>
 
 <main class="main">
 	<div class="drawer">
 		<nav aria-label="Navigation">
-  <a href="https://github.com/laradock/laradock" class="project">
-    <div class="banner">
+  
+    
+      
       
-      <div class="name">
-        <strong>Laradock Docs </strong>
         
-          <br>
-          laradock/laradock
         
-      </div>
-    </div>
-  </a>
+      
+    
+  
 
   <div class="scrollable">
     <div class="wrapper">
       
-        <ul class="repo">
-          <li class="repo-download">
-            <a href="https://github.com/laradock/laradock/archive/master.zip" target="_blank" title="Download" data-action="download">
-              <i class="icon icon-download"></i> Download
-            </a>
-          </li>
-          <li class="repo-stars">
-            <a href="https://github.com/laradock/laradock/stargazers" target="_blank" title="Stargazers" data-action="star">
-              <i class="icon icon-star"></i> Stars
-              <span class="count">&ndash;</span>
-            </a>
-          </li>
-        </ul>
-        <hr>
-      
 
       <div class="toc">
         
@@ -302,18 +283,18 @@
         
 
         
-        <hr>
-        <span class="section">The author</span>
+        
+        
         
         <ul>
           
 
           
-          <li>
-            <a href="https://github.com/laradock" target="_blank" title="@laradock on GitHub">
-              @laradock on GitHub
-            </a>
-          </li>
+          
+            
+              
+            
+          
           
 
           
@@ -419,8 +400,8 @@ These Docker Compose projects have piqued our interest:</li>
 
     <script>
     
-      var base_url = 'http:\/\/laradock.io\/';
-      var repo_id  = 'laradock\/laradock';
+      var base_url = '';
+      var repo_id  = '';
     
     </script>
 

docs/related-projects/index.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>Related-projects on Laradock Docs</title>
+    <title>Related-projects on Laradock</title>
     <link>http://laradock.io/related-projects/index.xml</link>
-    <description>Recent content in Related-projects on Laradock Docs</description>
+    <description>Recent content in Related-projects on Laradock</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
     <atom:link href="http://laradock.io/related-projects/index.xml" rel="self" type="application/rss+xml" />

mailhog/Dockerfile

@@ -0,0 +1,7 @@
+FROM mailhog/mailhog
+
+Maintainer Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["Mailhog"]
+
+EXPOSE 1025 8025

nginx/nginx.conf

@@ -23,8 +23,12 @@ http {
   error_log /var/log/nginx/error.log;
   gzip on;
   gzip_disable "msie6";
+  
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+  
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/sites-available/*;
-  open_file_cache max=100;
+  open_file_cache off; # Disabled for issue 619
   charset UTF-8;
 }

nginx/sites/default.conf

@@ -24,6 +24,11 @@ server {
     location ~ /\.ht {
         deny all;
     }
+    
+    location /.well-known/acme-challenge/ {
+        root /var/www/letsencrypt/;
+        log_not_found off;
+    }
 }
 
 

nginx/sites/laravel-https.conf

@@ -0,0 +1,30 @@
+server {
+
+    listen 443 default_server;
+    listen [::]:443 default_server ipv6only=on;
+
+    ssl on;
+    ssl_certificate /var/certs/cert1.pem;
+    ssl_certificate_key /var/certs/privkey1.pem;
+
+    server_name laravel;
+    root /var/www/laravel/public;
+    index index.php index.html index.htm;
+
+    location / {
+         try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+    location ~ \.php$ {
+        try_files $uri /index.php =404;
+        fastcgi_pass php-upstream;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+    
+}

php-fpm/Dockerfile-70

@@ -186,6 +186,20 @@ RUN if [ ${CODEIGNITER} = true ]; then \
      docker-php-ext-install tokenizer \
 ;fi
 
+#####################################
+# GHOSTSCRIPT:
+#####################################
+
+ARG GHOSTSCRIPT=false
+RUN if [ ${GHOSTSCRIPT} = true ]; then \
+    # Install the ghostscript extension
+    # for PDF editing
+    apt-get -y update \
+    && apt-get install -y \
+    poppler-utils \
+    ghostscript \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-fpm/Dockerfile-71

@@ -0,0 +1,160 @@
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To edit the 'php-fpm' base Image, visit its repository on Github
+#    https://github.com/LaraDock/php-fpm
+#
+# To change its version, see the available Tags on the Docker Hub:
+#    https://hub.docker.com/r/laradock/php-fpm/tags/
+#
+
+FROM laradock/php-fpm:7.1--0.0 # placeholder. Need change after new image would be built.
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+# Example:
+#   - INSTALL_ZIP_ARCHIVE=true
+#   - ...
+#
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=false
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Install the xdebug extension
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug \
+;fi
+
+# Copy xdebug configration for remote debugging
+COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=false
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    docker-php-ext-enable mongodb \
+;fi
+
+#####################################
+# ZipArchive:
+#####################################
+
+ARG INSTALL_ZIP_ARCHIVE=false
+RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+    # Install the zip extension
+    pecl install zip && \
+    docker-php-ext-enable zip \
+;fi
+
+#####################################
+# PHP Memcached:
+#####################################
+
+ARG INSTALL_MEMCACHED=false
+RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
+    # Install the php memcached extension
+    curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
+    && mkdir -p memcached \
+    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
+    && ( \
+        cd memcached \
+        && phpize \
+        && ./configure \
+        && make -j$(nproc) \
+        && make install \
+    ) \
+    && rm -r memcached \
+    && rm /tmp/memcached.tar.gz \
+    && docker-php-ext-enable memcached \
+;fi
+
+#####################################
+# PHP Aerospike:
+#####################################
+
+ARG INSTALL_AEROSPIKE_EXTENSION=false
+ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION}
+# Copy aerospike configration for remote debugging
+COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
+RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
+    # Install the php aerospike extension
+    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/luciano-jr/aerospike-client-php/archive/master.tar.gz" \
+    && mkdir -p aerospike-client-php \
+    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
+    && ( \
+        cd aerospike-client-php/src/aerospike \
+        && phpize \
+        && ./build.sh \
+        && make install \
+    ) \
+    && rm /tmp/aerospike-client-php.tar.gz \
+;fi
+
+#####################################
+# Opcache:
+#####################################
+ARG INSTALL_OPCACHE=false
+RUN if [ ${INSTALL_OPCACHE} = true ]; then \
+    docker-php-ext-install opcache && \
+    docker-php-ext-enable opcache \
+;fi
+
+# Copy opcache configration
+COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
+
+#####################################
+# Codeigniter Modifications:
+#####################################
+
+ARG CODEIGNITER=false
+RUN if [ ${CODEIGNITER} = true ]; then \
+    # Install Codeigniter PHP extentions requirements
+     docker-php-ext-install mysqli && \
+     docker-php-ext-install tokenizer \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN rm -r /var/lib/apt/lists/*
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/opcache.ini

@@ -1,4 +1,5 @@
-extension=opcache.so
+; NOTE: The actual opcache.so extention is NOT SET HERE but rather (/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini)
+
 opcache.enable="1"
 opcache.memory_consumption="256"
 opcache.use_cwd="0"

workspace/Dockerfile-71

@@ -0,0 +1,260 @@
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To edit the 'workspace' base Image, visit its repository on Github
+#    https://github.com/LaraDock/workspace
+#
+# To change its version, see the available Tags on the Docker Hub:
+#    https://hub.docker.com/r/laradock/workspace/tags/
+#
+
+FROM laradock/workspace:1.3 # placeholder. Need change after new image would be built.
+
+MAINTAINER MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("php7.1-cli", "git", "vim", ....) are
+# installed on the base image 'laradock/workspace' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/workspace).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+# Example:
+#   - INSTALL_NODE=false
+#   - ...
+#
+
+#####################################
+# Non-Root User:
+#####################################
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+ARG PUID=1000
+ARG PGID=1000
+RUN groupadd -g $PGID laradock && \
+    useradd -u $PUID -g laradock -m laradock
+
+#####################################
+# Set Timezone
+#####################################
+
+ARG TZ=UTC
+ENV TZ ${TZ}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+#####################################
+# Composer:
+#####################################
+
+# Add the composer.json
+COPY ./composer.json /home/laradock/.composer/composer.json
+
+# Make sure that ~/.composer belongs to laradock
+RUN chown -R laradock:laradock /home/laradock/.composer
+USER laradock
+
+# Check if global install need to be ran
+ARG COMPOSER_GLOBAL_INSTALL=false
+ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
+RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
+    # run the install
+    composer global install \
+;fi
+
+#####################################
+# Crontab
+#####################################
+USER root
+
+COPY ./crontab /var/spool/cron/crontabs
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=false
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Load the xdebug extension only with phpunit commands
+    apt-get update && \
+    apt-get install -y --force-yes php-xdebug && \
+    sed -i 's/^/;/g' /etc/php/7.1/cli/conf.d/20-xdebug.ini && \
+    echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \
+;fi
+# ADD for REMOTE debugging
+COPY ./xdebug.ini /etc/php/7.1/cli/conf.d/xdebug.ini
+
+#####################################
+# ssh:
+#####################################
+ARG INSTALL_WORKSPACE_SSH=false
+ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
+
+ADD insecure_id_rsa /tmp/id_rsa
+ADD insecure_id_rsa.pub /tmp/id_rsa.pub
+
+RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
+    rm -f /etc/service/sshd/down && \
+    cat /tmp/id_rsa.pub >> /root/.ssh/authorized_keys \
+        && cat /tmp/id_rsa.pub >> /root/.ssh/id_rsa.pub \
+        && cat /tmp/id_rsa >> /root/.ssh/id_rsa \
+        && rm -f /tmp/id_rsa* \
+        && chmod 644 /root/.ssh/authorized_keys /root/.ssh/id_rsa.pub \
+    && chmod 400 /root/.ssh/id_rsa \
+;fi
+
+#####################################
+# MongoDB:
+#####################################
+
+# Check if Mongo needs to be installed
+ARG INSTALL_MONGO=false
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    echo "extension=mongodb.so" >> /etc/php/7.1/cli/conf.d/30-mongodb.ini \
+;fi
+
+#####################################
+# Drush:
+#####################################
+USER root
+ENV DRUSH_VERSION 8.1.2
+ARG INSTALL_DRUSH=false
+ENV INSTALL_DRUSH ${INSTALL_DRUSH}
+RUN if [ ${INSTALL_DRUSH} = true ]; then \
+    # Install Drush 8 with the phar file.
+    curl -fsSL -o /usr/local/bin/drush https://github.com/drush-ops/drush/releases/download/$DRUSH_VERSION/drush.phar | bash && \
+    chmod +x /usr/local/bin/drush && \
+    drush core-status \
+;fi
+
+USER laradock
+
+#####################################
+# Node / NVM:
+#####################################
+
+# Check if NVM needs to be installed
+ARG NODE_VERSION=stable
+ENV NODE_VERSION ${NODE_VERSION}
+ARG INSTALL_NODE=false
+ENV INSTALL_NODE ${INSTALL_NODE}
+ENV NVM_DIR /home/laradock/.nvm
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    # Install nvm (A Node Version Manager)
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.6/install.sh | bash && \
+        . $NVM_DIR/nvm.sh && \
+        nvm install ${NODE_VERSION} && \
+        nvm use ${NODE_VERSION} && \
+        nvm alias ${NODE_VERSION} && \
+        npm install -g gulp bower vue-cli \
+;fi
+
+# Wouldn't execute when added to the RUN statement in the above block
+# Source NVM when loading bash since ~/.profile isn't loaded on non-login shell
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    echo "" >> ~/.bashrc && \
+    echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc && \
+    echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> ~/.bashrc \
+;fi
+
+# Add NVM binaries to root's .bashrc
+USER root
+
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    echo "" >> ~/.bashrc && \
+    echo 'export NVM_DIR="/home/laradock/.nvm"' >> ~/.bashrc && \
+    echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> ~/.bashrc \
+;fi
+
+#####################################
+# YARN:
+#####################################
+
+USER laradock
+
+ARG INSTALL_YARN=false
+ENV INSTALL_YARN ${INSTALL_YARN}
+
+RUN if [ ${INSTALL_YARN} = true ]; then \
+    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \
+    curl -o- -L https://yarnpkg.com/install.sh | bash && \
+    echo "" >> ~/.bashrc && \
+    echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \
+;fi
+
+# Add YARN binaries to root's .bashrc
+USER root
+
+RUN if [ ${INSTALL_YARN} = true ]; then \
+    echo "" >> ~/.bashrc && \
+    echo 'export YARN_DIR="/home/laradock/.yarn"' >> ~/.bashrc && \
+    echo 'export PATH="$YARN_DIR/bin:$PATH"' >> ~/.bashrc \
+;fi
+
+#####################################
+# PHP Aerospike:
+#####################################
+USER root
+
+ARG INSTALL_AEROSPIKE_EXTENSION=true
+ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION}
+
+# Copy aerospike configration for remote debugging
+COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini
+
+RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
+    # Install the php aerospike extension
+    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/luciano-jr/aerospike-client-php/archive/master.tar.gz" \
+    && mkdir -p aerospike-client-php \
+    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
+    && ( \
+        cd aerospike-client-php/src/aerospike \
+        && phpize \
+        && ./build.sh \
+        && make install \
+    ) \
+    && rm /tmp/aerospike-client-php.tar.gz \
+;fi
+
+RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \
+    rm /etc/php/7.1/cli/conf.d/aerospike.ini \
+;fi
+
+#####################################
+# Non-root user : PHPUnit path
+#####################################
+
+# add ./vendor/bin to non-root user's bashrc (needed for phpunit)
+USER laradock
+
+RUN echo "" >> ~/.bashrc && \
+    echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
+# Clean up
+USER root
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Set default work directory
+WORKDIR /var/www

xdebugPhpFpm

@@ -4,7 +4,7 @@
 
 
 # Grab full name of php-fpm container
-PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d " " -f 1)
+PHP_FPM_CONTAINER=$(docker ps | grep php-fpm | awk '{print $1}')
 
 
 # Grab OS type