Merge pull request #850 from winfried-van-loon/849-apache-webroot

Updating webroots to have the same defaults

.editorconfig

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

.env

@@ -1 +0,0 @@
-COMPOSE_CONVERT_WINDOWS_PATHS=1

.gitignore

@@ -1,3 +1,5 @@
 .idea
 /logs
 /data
+.env
+/.project

.travis.yml

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

CONTRIBUTING.md

@@ -1,140 +0,0 @@
-# Contributing to LaraDock
-
-Your contribution is more than welcome. Let's keep LaraDock amazing.
-
-
-### Got a Question or Problem?
-
-If you have questions about how to use LaraDock, please direct your questions to the discussion on [Gitter](https://gitter.im/LaraDock/laradock). If you believe your question could help others, then consider opening an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Question).
-
-### Found an Issue?
-If you find a bug in the source code or a mistake in the documentation, you can help us by
-submitting an [Issue](https://github.com/laradock/laradock/issues). Even better you can submit a Pull Request with a fix.
-
-### Want a Feature?
-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.
-
-
-## Coding Guidelines
-
-### Support new Software
-
-* Create folder with the software name.
-
-* Add a `Dockerfile`, write your code there.
-
-* You may add additional files in the software folder.
-
-* Add the software to the `docker-compose.yml` file.
-
-* Make sure you follow our commenting style.
-
-* Add the software in the `Readme`.
-
-### Edit existing Software
-
-* Open the software (container) folder.
-
-* Edit the files you want to update.
-
-* **Note:** If you want to edit the base image of the `Workspace` or the `php-fpm` Containers, 
-you need to edit their Dockerfiles from their Github repositories. For more info read their Dockerfiles comment on the LaraDock repository.
-
-* Make sure to update the `Readme` incase you made any changes.
-
-## Issue/PR Submission Guidelines
-
-### Submitting an Issue
-Before you submit your issue search the archive, maybe your question was already answered.
-
-If your issue appears to be a bug, and hasn't been reported, open a new issue.
-Help us to maximize the effort we can spend fixing issues and adding new
-features, by not reporting duplicate issues.
-
-
-### Before Submitting a Pull Request (PR)
-
-Always Test everything and make sure its working:
-
-- Pull the latest updates (or fork of you don’t have permission)
-- Before editing anything:
-    - Test building the container (docker-compose build --no-cache container-name) build with no cache first.
-    - Test running the container with some other containers in real app and see of everything is working fine.
-- Now edit the container (edit section by section and test rebuilding the container after every edited section)
-    - Testing building the container (docker-compose build container-name) with no errors.
-    - Test it in real App.
-
-
-### Submitting a PR
-Consider the following guidelines:
-
-* Search [GitHub](https://github.com/LaraDock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.
-
-* Make your changes in a new git branch:
-
-     ```shell
-     git checkout -b my-fix-branch master
-     ```
-* Commit your changes using a descriptive commit message.
-
-* Push your branch to GitHub:
-
-    ```shell
-    git push origin my-fix-branch
-    ```
-
-* In GitHub, send a pull request to `laradock:master`.
-* If we suggest changes then:
-  * Make the required updates.
-  * Commit your changes to your branch (e.g. `my-fix-branch`).
-  * Push the changes to your GitHub repository (this will update your Pull Request).
-
-> If the PR gets too outdated we may ask you to rebase and force push to update the PR:
-
-```shell
-git rebase master -i
-git push origin my-fix-branch -f
-```
-
-*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
-
-
-
-
-
-
-### After your PR is merged
-
-After your pull request is merged, you can safely delete your branch and pull the changes
-from the main (upstream) repository:
-
-* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
-
-    ```shell
-    git push origin --delete my-fix-branch
-    ```
-
-* Check out the master branch:
-
-    ```shell
-    git checkout master -f
-    ```
-
-* Delete the local branch:
-
-    ```shell
-    git branch -D my-fix-branch
-    ```
-
-* Update your master with the latest upstream version:
-
-    ```shell
-    git pull --ff upstream master
-    ```
-
-
-
-
-
-<br>
-### Happy Coding :)

DOCUMENTATION/config.toml

@@ -0,0 +1,97 @@
+baseurl = "http://laradock.io/"
+languageCode = "en-us"
+publishDir = "../docs"
+title = "Laradock"
+theme = "hugo-material-docs"
+metadataformat = "yaml"
+canonifyurls = true
+uglyurls = true
+# Enable Google Analytics by entering your tracking id
+googleAnalytics = "UA-37514928-9"
+
+[params]
+	# General information
+	author = "Mahmoud Zalt"
+	description = "Full PHP development environment for Docker."
+	copyright = ""
+
+	# Repository
+	provider = ""
+	repo_url = ""
+
+	version = ""
+	logo = "images/logo.png"
+	favicon = ""
+
+	permalink = "#"
+
+	# Custom assets
+	custom_css = []
+	custom_js  = []
+
+	# Syntax highlighting theme
+	highlight_css  = ""
+
+	[params.palette]
+    	primary = "deep-purple"
+    	accent  = "purple"
+
+    [params.font]
+    	text = "Doctarine"
+    	code = "Source Code Pro"
+
+[social]
+	twitter = ""
+	github  = "laradock/laradock"
+	email   = ""
+
+# ------- MENU START -----------------------------------------
+
+[[menu.main]]
+	name   = "Introduction"
+	url    = "introduction/"
+	weight = 1
+
+[[menu.main]]
+	name   = "Getting Started"
+	url    = "getting-started/"
+	weight = 2
+
+[[menu.main]]
+	name   = "Documentation"
+	url    = "documentation/"
+	weight = 3
+
+[[menu.main]]
+	name   = "Guides"
+	url    = "guides/"
+	weight = 4
+
+[[menu.main]]
+	name   = "Help & Questions"
+	url    = "help/"
+	weight = 5
+
+[[menu.main]]
+	name   = "Related Projects"
+	url    = "related-projects/"
+	weight = 6
+
+[[menu.main]]
+	name   = "Contributing"
+	url    = "contributing/"
+	weight = 7
+
+[[menu.main]]
+	name   = "License"
+	url    = "license/"
+	weight = 8
+
+# ------- MENU END -----------------------------------------
+
+[blackfriday]
+	smartypants	= true
+	fractions = true
+	smartDashes = true
+	plainIDAnchors = true
+

DOCUMENTATION/content/contributing/index.md

@@ -0,0 +1,207 @@
+---
+title: Contributing
+type: index
+weight: 7
+---
+
+
+## Have a Question
+
+If you have questions about how to use Laradock, please direct your questions to the discussion on [Gitter](https://gitter.im/Laradock/laradock). If you believe your question could help others, then consider opening an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as `Question`) And you can still seek help on Gitter for it.
+
+
+
+## Found an Issue
+
+If have an issue or you found a typo in the documentation, you can help us by
+opnening an [Issue](https://github.com/laradock/laradock/issues).
+
+**Steps to do before opening an Issue:**
+
+1. Before you submit your issue search the archive, maybe your question was already answered couple hours ago (search in the closed Issues as well).
+
+2. Decide if the Issue belongs to this project or to [Docker](https://github.com/docker) itself! or even the tool you are using such as Nginx or MongoDB...
+
+If your issue appears to be a bug, and hasn't been reported, then open a new issue.
+
+*This Help us to maximize the effort we can spend fixing issues and adding new
+features, by not reporting duplicate issues.*
+
+
+
+## Want a Feature
+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 yourself.
+
+
+
+
+## Update the 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.
+
+Go the `DOCUMENTATION/content` and search for the markdown file you want to edit
+
+Note: Every folder represents a section in the sidebar "Menu". And every page and sidebar has a `weight` number to show it's position in the site.
+
+To update the sidebar or add a new section to it, you can edit this `DOCUMENTATION/config.toml` toml file.
+
+> The site will be auto-generated in the `docs/` folder by [Travis CI](https://travis-ci.org/laradock/laradock/).
+
+
+
+### Host the documentation locally
+
+1. Install [Hugo](https://gohugo.io/) on your machine.
+2. Edit the `DOCUMENTATION/content`.
+3. Delete the `/docs` folder from the root.
+4. After you finish the editing, go to `DOCUMENTATION/` and run the `hugo` command to generate the HTML docs (inside a new `/docs` folder).
+
+
+
+
+## Support new Software (Add new Container)
+
+* Forke the repo and clone the code.
+
+* Create folder as the software name (example: `mysql` - `nginx`).
+
+* Add your `Dockerfile` in the folder "you may add additional files as well".
+
+* Add the software to the `docker-compose.yml` file.
+
+* Make sure you follow the same code/comments style.
+
+* Add the environment variables to the `env-example` if you have any.
+
+* **MOST IMPORTANTLY** updated the `Documentation`, add as much information.
+
+* Submit a Pull Request, to the `master` branch.
+
+
+
+## Edit supported Software (Edit a Container)
+
+* Forke the repo and clone the code.
+
+* Open the software (container) folder (example: `mysql` - `nginx`).
+
+* Edit the files.
+
+* Make sure to update the `Documentation` in case you made any changes.
+
+* Submit a Pull Request, to the `master` branch.
+
+
+
+
+## Edit Base Image
+
+* Open any dockerfile, copy the base image name (example: `FROM phusion/baseimage:latest`).
+
+* Search for the image in the [Docker Hub](https://hub.docker.com/search/) and find the source..
+
+*Most of the image in Laradock are offical images, these projects live in other repositories and maintainer by other orgnizations.*
+
+**Note:** Laradock has two base images for (`Workspace` and `php-fpm`, mainly made to speed up the build time on your machine.
+
+* Find the dockerfiles, edit them and submit a Pull Request.
+
+* When updating a Laradock base image (`Workspace` or `php-fpm`), ask a project maintainer "Admin" to build a new image after your PR is merged.
+
+**Note:** after the base image is updated, every dockerfile that uses that image, needs to update his base image tag to get the updated code.
+
+
+
+
+
+
+
+
+<br>
+
+
+
+
+## Submit Pull Request Instructions
+
+### 1. Before Submitting a Pull Request (PR)
+
+Always Test everything and make sure its working:
+
+- Pull the latest updates (or fork of you don’t have permission)
+- Before editing anything:
+    - Test building the container (docker-compose build --no-cache container-name) build with no cache first.
+    - Test running the container with some other containers in real app and see of everything is working fine.
+- Now edit the container (edit section by section and test rebuilding the container after every edited section)
+    - Testing building the container (docker-compose build container-name) with no errors.
+    - Test it in a real App if possible.
+
+
+### 2. Submitting a PR
+Consider the following guidelines:
+
+* Search [GitHub](https://github.com/laradock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate efforts.
+
+* Make your changes in a new git branch:
+
+     ```shell
+     git checkout -b my-fix-branch master
+     ```
+* Commit your changes using a descriptive commit message.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+* In GitHub, send a pull request to `laradock:master`.
+* If we suggest changes then:
+  * Make the required updates.
+  * Commit your changes to your branch (e.g. `my-fix-branch`).
+  * Push the changes to your GitHub repository (this will update your Pull Request).
+
+> If the PR gets too outdated we may ask you to rebase and force push to update the PR:
+
+```shell
+git rebase master -i
+git push origin my-fix-branch -f
+```
+
+*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
+
+
+### 3. After your PR is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository:
+
+* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
+
+    ```shell
+    git push origin --delete my-fix-branch
+    ```
+
+* Check out the master branch:
+
+    ```shell
+    git checkout master -f
+    ```
+
+* Delete the local branch:
+
+    ```shell
+    git branch -D my-fix-branch
+    ```
+
+* Update your master with the latest upstream version:
+
+    ```shell
+    git pull --ff upstream master
+    ```
+
+
+
+
+
+<br>
+#### Happy Coding :)

DOCUMENTATION/content/getting-started/index.md

@@ -0,0 +1,212 @@
+---
+title: Getting Started
+type: index
+weight: 2
+---
+
+## Requirements
+
+- [Git](https://git-scm.com/downloads)
+- [Docker](https://www.docker.com/products/docker/) `>= 1.12`
+
+
+
+
+
+
+
+## Installation
+
+Choose the setup the best suits your needs.
+
+- [A) Setup for Single Project](#A)
+	- [A.1) Already have a PHP project](#A1)
+ 	- [A.2) Don't have a PHP project yet](#A2)
+- [B) Setup for Multiple Projects](#B)
+
+
+<a name="A"></a>
+### A) Setup for Single Project
+> (Follow these steps if you want a separate Docker environment for each project)
+
+
+<a name="A1"></a>
+### A.1) Already have a PHP project:
+
+1 - Clone laradock on your project root directory:
+
+```bash
+git submodule add https://github.com/Laradock/laradock.git
+```
+
+Note: If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `.
+
+*To keep track of your Laradock changes, between your projects and also keep Laradock updated [check these docs](/documentation/#keep-track-of-your-laradock-changes)*
+
+
+Your folder structure should look like this:
+
+```
++ project-a
+  + laradock-a
++ project-b
+  + laradock-b
+```
+
+*(It's important to rename the laradock folders to unique name in each project, if you want to run laradock per project).*
+
+> **Now jump to the [Usage](#Usage) section.**
+
+<a name="A2"></a>
+### A.2) Don't have a PHP project yet:
+
+1 - Clone this repository anywhere on your machine:
+
+```bash
+git clone https://github.com/laradock/laradock.git
+```
+
+Your folder structure should look like this:
+
+```
++ laradock
++ project-z
+```
+
+2 - Edit your web server sites configuration.
+
+We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
+
+```
+cp env-example .env
+```
+
+At the top, change the `APPLICATION` variable to your project path.
+
+```
+APPLICATION=../project-z/public/
+```
+
+Make sure to replace `project-z` with your project folder name.
+
+> **Now jump to the [Usage](#Usage) section.**
+
+
+<a name="B"></a>
+### B) Setup for Multiple Projects:
+> (Follow these steps if you want a single Docker environment for all your project)
+
+1 - Clone this repository anywhere on your machine (similar to [Steps A.2. from above](#A2)):
+
+```bash
+git clone https://github.com/laradock/laradock.git
+```
+
+Your folder structure should look like this:
+
+```
++ laradock
++ project-1
++ project-2
+```
+
+2 - Go to `nginx/sites` and create config files to point to different project directory when visiting different domains.
+
+Laradock by default includes `project-1.conf` and `project-2.conf` as working samples.
+
+3 - change the default names `project-n`:
+
+You can rename the config files, project folders and domains as you like, just make sure the `root` in the config files, is pointing to the correct project folder name.
+
+4 - Add the domains to the **hosts** files.
+
+```
+127.0.0.1  project-1.dev
+127.0.0.1  project-2.dev
+```
+
+> **Now jump to the [Usage](#Usage) section.**
+
+
+
+
+
+
+
+<a name="Usage"></a>
+## Usage
+
+**Read Before starting:**
+
+If you are using **Docker Toolbox** (VM), do one of the following:
+
+- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
+- Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/Laradock-ToolBox) branch. *(outdated)*
+
+<br>
+
+>**Warning:** If you used an older version of Laradock it's highly recommended to rebuild the containers you need to use [see how you rebuild a container](#Build-Re-build-Containers) in order to prevent as much errors as possible.
+
+<br>
+
+1 - Enter the laradock folder and copy `env-example` to `.env`
+
+```shell
+cp env-example .env
+```
+
+You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
+
+
+2 - Build the enviroment and run it using `docker-compose`
+
+In this example we'll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:
+
+```bash
+docker-compose up -d nginx mysql
+```
+
+**Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`.
+
+
+You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images).
+
+*(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
+
+
+<br>
+3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...)
+
+```bash
+docker-compose exec workspace bash
+```
+
+*Alternatively, for Windows PowerShell users: execute the following command to enter any running container:*
+
+```bash
+docker exec -it {workspace-container-id} bash
+```
+
+**Note:** You can add `--user=laradock` to have files created as your host's user. Example: 
+
+```shell
+docker-compose exec --user=laradock workspace bash
+```
+
+*You can change the PUID (User id) and PGID (group id) variables from the `.env` file)*
+
+<br>
+4 - Update your project configurations to use the database host
+
+Open your PHP project's `.env` file or whichever configuration file you are reading from, and set the database host `DB_HOST` to `mysql`:
+
+```env
+DB_HOST=mysql
+```
+
+*If you want to install Laravel as PHP project, see [How to Install Laravel in a Docker Container](#Install-Laravel).*
+
+<br>
+5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.dev/` and `http://project-2.dev/`. But first don't 
+
+

DOCUMENTATION/content/guides/index.md

@@ -0,0 +1,546 @@
+---
+title: Guides
+type: index
+weight: 4
+---
+
+
+
+* [Production Setup on Digital Ocean](#Digital-Ocean)
+* [PHPStorm XDebug Setup](#PHPStorm-Debugging)
+
+
+
+<a name="Digital-Ocean"></a>
+# Production Setup on Digital Ocean
+
+## Install Docker
+
+- Visit [DigitalOcean](https://cloud.digitalocean.com/login) and login.
+- Click the `Create Droplet` button.
+- Open the `One-click apps` tab.
+- Select Docker with your preferred version.
+- Continue creating the droplet as you normally would.
+- If needed, check your e-mail for the droplet root password.
+
+## SSH to your Server
+
+Find the IP address of the droplet in the DigitalOcean interface. Use it to connect to the server.
+
+```
+ssh root@ipaddress
+```
+
+You may be prompted for a password. Type the one you found within your e-mailbox. It'll then ask you to change the password.
+
+You can now check if Docker is available:
+
+```
+$root@server:~# docker
+```
+
+## Set Up Your Laravel Project
+
+```
+$root@server:~# apt-get install git
+$root@server:~# git clone https://github.com/laravel/laravel
+$root@server:~# cd laravel
+$root@server:~/laravel/ git submodule add https://github.com/Laradock/laradock.git
+$root@server:~/laravel/ cd laradock
+```
+
+## Install docker-compose command
+
+```
+$root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
+$root@server:~/chmod +x /usr/local/bin/docker-compose
+```
+
+## Create Your Laradock Containers
+
+```
+$root@server:~/laravel/laradock# docker-compose up -d nginx mysql
+```
+
+Note that more containers are available, find them in the [docs](http://laradock.io/introduction/#supported-software-containers) or the `docker-compose.yml` file.
+
+## Go to Your Workspace
+
+```
+docker-compose exec workspace bash
+```
+
+## Install and configure Laravel
+
+Let's install Laravel's dependencies, add the `.env` file, generate the key and give proper permissions to the cache folder.
+
+```
+$ root@workspace:/var/www# composer install
+$ root@workspace:/var/www# cp .env.example .env
+$ root@workspace:/var/www# php artisan key:generate
+$ root@workspace:/var/www# exit
+$root@server:~/laravel/laradock# cd ..
+$root@server:~/laravel# sudo chmod -R 777 storage bootstrap/cache
+```
+
+You can then view your Laravel site by visiting the IP address of your server in your browser. For example:
+
+```
+http://192.168.1.1
+```
+
+It should show you the Laravel default welcome page.
+
+However, we want it to show up using your custom domain name, as well.
+
+## Using Your Own Domain Name
+
+Login to your DNS provider, such as Godaddy, Namecheap.
+
+Point the Custom Domain Name Server to:
+
+```
+ns1.digitalocean.com
+ns2.digitalocean.com
+ns3.digitalocean.com
+```
+
+Within DigitalOcean, you'll need to change some settings, too.
+
+Visit: https://cloud.digitalocean.com/networking/domains
+
+Add your domain name and choose the server IP you'd provision earlier.
+
+## Serving Site With NGINX (HTTP ONLY)
+
+Go back to command line.
+
+```
+$root@server:~/laravel/laradock# cd nginx
+$root@server:~/laravel/laradock/nginx# vim laravel.conf
+```
+
+Remove `default_server`
+
+```
+    listen 80 default_server;
+    listen [::]:80 default_server ipv6only=on;
+```
+
+And add `server_name` (your custom domain)
+
+```
+    listen 80;
+    listen [::]:80 ipv6only=on;
+    server_name yourdomain.com;
+```
+
+## Rebuild Your Nginx
+
+```
+$root@server:~/laravel/laradock/nginx# docker-compose down
+$root@server:~/laravel/laradock/nginx# docker-compose build nginx
+```
+
+## Re Run Your Containers MYSQL and NGINX
+
+```
+$root@server:~/laravel/laradock/nginx# docker-compose up -d nginx mysql
+```
+
+**View Your Site with HTTP ONLY (http://yourdomain.com)**
+
+## Run Site on SSL with Let's Encrypt Certificate
+
+**Note: You need to Use Caddy here Instead of Nginx**
+
+To go Caddy Folders and Edit CaddyFile
+
+```
+$root@server:~/laravel/laradock# cd caddy
+$root@server:~/laravel/laradock/caddy# vim Caddyfile
+```
+
+Remove 0.0.0.0:80
+
+```
+0.0.0.0:80
+root /var/www
+```
+
+and replace with your https://yourdomain.com
+
+```
+https://yourdomain.com
+root /var/www
+```
+
+uncomment tls
+
+```
+#tls self-signed
+```
+
+and replace self-signed with your email address
+
+```
+tls serverbreaker@gmai.com
+```
+
+This is needed Prior to Creating Let's Encypt
+
+## Run Your Caddy Container without the -d flag and Generate SSL with Let's Encrypt
+
+```
+$root@server:~/laravel/laradock/caddy# docker-compose up  caddy
+```
+
+You'll be prompt here to enter your email... you may enter it or not
+
+```
+Attaching to laradock_mysql_1, laradock_caddy_1
+caddy_1               | Activating privacy features...
+caddy_1               | Your sites will be served over HTTPS automatically using Let's Encrypt.
+caddy_1               | By continuing, you agree to the Let's Encrypt Subscriber Agreement at:
+caddy_1               |   https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf
+caddy_1               | Activating privacy features... done.
+caddy_1               | https://yourdomain.com
+caddy_1               | http://yourdomain.com
+```
+
+After it finishes, press `Ctrl` + `C` to exit.
+
+## Stop All Containers and ReRun Caddy and Other Containers on Background
+
+```
+$root@server:~/laravel/laradock/caddy# docker-compose down
+$root@server:~/laravel/laradock/caddy# docker-compose up -d mysql caddy
+```
+
+View your Site in the Browser Securely Using HTTPS (https://yourdomain.com)
+
+**Note that Certificate will be Automatically Renew By Caddy**
+
+>References:
+>
+- [https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04)
+- [https://www.digitalocean.com/products/one-click-apps/docker/](https://www.digitalocean.com/products/one-click-apps/docker/)
+- [https://docs.docker.com/engine/installation/linux/ubuntulinux/](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
+- [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
+- [https://caddyserver.com/docs/automatic-https](https://caddyserver.com/docs/automatic-https)
+- [https://caddyserver.com/docs/tls](https://caddyserver.com/docs/tls)
+- [https://caddyserver.com/docs/caddyfile](https://caddyserver.com/docs/caddyfile)
+
+
+
+
+
+<br>
+<br>
+<br>
+<br>
+<br>
+
+<a name="PHPStorm-Debugging"></a>
+# PHPStorm XDebug Setup
+
+- [Intro](#Intro)
+- [Installation](#Installation)
+    - [Customize laradock/docker-compose.yml](#CustomizeDockerCompose)
+        - [Clean House](#InstallCleanHouse)
+        - [Laradock Dial Tone](#InstallLaradockDialTone)
+        - [hosts](#AddToHosts)
+        - [Firewall](#FireWall)
+        - [Enable xDebug on php-fpm](#enablePhpXdebug)
+    - [PHPStorm Settings](#InstallPHPStorm)
+        - [Configs](#InstallPHPStormConfigs)
+- [Usage](#Usage)
+    - [Laravel](#UsageLaravel)
+        - [Run ExampleTest](#UsagePHPStormRunExampleTest)
+        - [Debug ExampleTest](#UsagePHPStormDebugExampleTest)
+        - [Debug Web Site](#UsagePHPStormDebugSite)
+- [SSH into workspace](#SSHintoWorkspace)
+    - [KiTTY](#InstallKiTTY)
+
+<a name="Intro"></a>
+## Intro
+
+Wiring up [Laravel](https://laravel.com/), [Laradock](https://github.com/Laradock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`,
+you should be able to adjust accordingly. This guide was written based on Docker for Windows Native.
+
+<a name="Installation"></a>
+## Installation
+
+- This guide assumes the following:
+    - you have already installed and are familiar with Laravel, Laradock and PHPStorm.
+    - you have installed Laravel as a parent of `laradock`. This guide assumes `/c/_dk/laravel`.
+
+<a name="AddToHosts"></a>
+## hosts
+- Add `laravel` to your hosts file located on Windows 10 at `C:\Windows\System32\drivers\etc\hosts`. It should be set to the IP of your running container. Mine is: `10.0.75.2`
+On Windows you can find it by opening Windows `Hyper-V Manager`.
+    - ![Windows Hyper-V Manager](images/photos/PHPStorm/Settings/WindowsHyperVManager.png)
+
+- [Hosts File Editor](https://github.com/scottlerch/HostsFileEditor) makes it easy to change your hosts file.
+    - Set `laravel` to your docker host IP. See [Example](images/photos/SimpleHostsEditor/AddHost_laravel.png).
+
+
+<a name="FireWall"></a>
+## Firewall
+Your PHPStorm will need to be able to receive a connection from PHP xdebug either your running workspace or php-fpm containers on port 9000. This means that your Windows Firewall should either enable connections from the Application PHPStorm OR the port.
+
+- It is important to note that if the Application PHPStorm is NOT enabled in the firewall, you will not be able to recreate a rule to override that.
+- Also be aware that if you are installing/upgrade different versions of PHPStorm, you MAY have orphaned references to PHPStorm in your Firewall! You may decide to remove orphaned references however in either case, make sure that they are set to receive public TCP traffic.
+
+### Edit laradock/docker-compose.yml
+Set the following variables:
+```
+### Workspace Utilities Container ###############
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_XDEBUG=true
+                - INSTALL_WORKSPACE_SSH=true
+                ...
+
+
+### PHP-FPM Container #####################
+
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_XDEBUG=true
+                ...
+
+```
+
+### Edit xdebug.ini files
+- `laradock/workspace/xdebug.ini`
+- `laradock/php-fpm/xdebug.ini`
+
+Set the following variables:
+```
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+xdebug.cli_color=1
+```
+
+
+<a name="InstallCleanHouse"></a>
+### Need to clean house first?
+Make sure you are starting with a clean state. For example, do you have other Laradock containers and images?
+Here are a few things I use to clean things up.
+
+- Delete all containers using `grep laradock_` on the names, see: [Remove all containers based on docker image name](https://linuxconfig.org/remove-all-containners-based-on-docker-image-name).
+`docker ps -a | awk '{ print $1,$2 }' | grep laradock_ | awk '{print $1}' | xargs -I {} docker rm {}`
+
+- Delete all images containing `laradock`.
+`docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}`
+**Note:** This will only delete images that were built with `Laradock`, **NOT** `laradock/*` which are pulled down by `Laradock` such as `laradock/workspace`, etc.
+**Note:** Some may fail with:
+`Error response from daemon: conflict: unable to delete 3f38eaed93df (cannot be forced) - image has dependent child images`
+
+- I added this to my `.bashrc` to remove orphaned images.
+    ```
+    dclean() {
+        processes=`docker ps -q -f status=exited`
+        if [ -n "$processes" ]; thend
+          docker rm $processes
+        fi
+
+        images=`docker images -q -f dangling=true`
+        if [ -n "$images" ]; then
+          docker rmi $images
+        fi
+    }
+    ```
+
+- If you frequently switch configurations for Laradock, you may find that adding the following and added to your `.bashrc` or equivalent useful:
+```
+# remove laravel* containers
+# remove laravel_* images
+dcleanlaradockfunction()
+{
+	echo 'Removing ALL containers associated with laradock'
+	docker ps -a | awk '{ print $1,$2 }' | grep laradock | awk '{print $1}' | xargs -I {} docker rm {}
+
+	# remove ALL images associated with laradock_
+	# does NOT delete laradock/* which are hub images
+	echo 'Removing ALL images associated with laradock_'
+	docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}
+
+	echo 'Listing all laradock docker hub images...'
+	docker images | grep laradock
+
+	echo 'dcleanlaradock completed'
+}
+# associate the above function with an alias
+# so can recall/lookup by typing 'alias'
+alias dcleanlaradock=dcleanlaradockfunction
+```
+
+<a name="InstallLaradockDialTone"></a>
+## Let's get a dial-tone with Laravel
+
+```
+# barebones at this point
+docker-compose up -d nginx mysql
+
+# run
+docker-compose ps
+
+# Should see:
+          Name                        Command             State                     Ports
+-----------------------------------------------------------------------------------------------------------
+laradock_mysql_1            docker-entrypoint.sh mysqld   Up       0.0.0.0:3306->3306/tcp
+laradock_nginx_1            nginx                         Up       0.0.0.0:443->443/tcp, 0.0.0.0:80->80/tcp
+laradock_php-fpm_1          php-fpm                       Up       9000/tcp
+laradock_volumes_data_1     true                          Exit 0
+laradock_volumes_source_1   true                          Exit 0
+laradock_workspace_1        /sbin/my_init                 Up       0.0.0.0:2222->22/tcp
+
+
+```
+
+<a name="enablePhpXdebug"></a>
+## Enable xDebug on php-fpm
+In a host terminal sitting in the laradock folder, run: `.php-fpm/xdebug status`
+You should see something like the following:
+```
+xDebug status
+laradock_php-fpm_1
+PHP 7.0.9 (cli) (built: Aug 10 2016 19:45:48) ( NTS )
+Copyright (c) 1997-2016 The PHP Group
+Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
+    with Xdebug v2.4.1, Copyright (c) 2002-2016, by Derick Rethans
+```
+Other commands include `.php-fpm/xdebug start | stop`.
+
+If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will already be running when
+`php-fpm` is started and listening for debug info on port 9000.
+
+
+<a name="InstallPHPStormConfigs"></a>
+## PHPStorm Settings
+- Here are some settings that are known to work:
+    - `Settings/BuildDeploymentConnection`
+        - ![Settings/BuildDeploymentConnection](/images/photos/PHPStorm/Settings/BuildDeploymentConnection.png)
+
+    - `Settings/BuildDeploymentConnectionMappings`
+        - ![Settings/BuildDeploymentConnectionMappings](/images/photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png)
+
+    - `Settings/BuildDeploymentDebugger`
+        - ![Settings/BuildDeploymentDebugger](/images/photos/PHPStorm/Settings/BuildDeploymentDebugger.png)
+
+    - `Settings/EditRunConfigurationRemoteWebDebug`
+        - ![Settings/EditRunConfigurationRemoteWebDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
+
+    - `Settings/EditRunConfigurationRemoteExampleTestDebug`
+        - ![Settings/EditRunConfigurationRemoteExampleTestDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
+
+    - `Settings/LangsPHPDebug`
+        - ![Settings/LangsPHPDebug](/images/photos/PHPStorm/Settings/LangsPHPDebug.png)
+
+    - `Settings/LangsPHPInterpreters`
+        - ![Settings/LangsPHPInterpreters](/images/photos/PHPStorm/Settings/LangsPHPInterpreters.png)
+
+    - `Settings/LangsPHPPHPUnit`
+        - ![Settings/LangsPHPPHPUnit](/images/photos/PHPStorm/Settings/LangsPHPPHPUnit.png)
+
+    - `Settings/LangsPHPServers`
+        - ![Settings/LangsPHPServers](/images/photos/PHPStorm/Settings/LangsPHPServers.png)
+
+    - `RemoteHost`
+        To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
+        - ![RemoteHost](/images/photos/PHPStorm/RemoteHost.png)
+
+    - `RemoteWebDebug`
+        - ![DebugRemoteOn](/images/photos/PHPStorm/DebugRemoteOn.png)
+
+    - `EditRunConfigurationRemoteWebDebug`
+        Go to: `Menu/Run/Edit Configurations`.
+        - ![EditRunConfigurationRemoteWebDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
+
+    - `EditRunConfigurationRemoteExampleTestDebug`
+        Go to: `Menu/Run/Edit Configurations`.
+        - ![EditRunConfigurationRemoteExampleTestDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
+
+    - `WindowsFirewallAllowedApps`
+        Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
+        - ![WindowsFirewallAllowedApps.png](/images/photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png)
+
+    - `hosts`
+        Edit: `C:\Windows\System32\drivers\etc\hosts`.
+        - ![WindowsFirewallAllowedApps.png](/images/photos/PHPStorm/Settings/hosts.png)
+
+        - [Enable xDebug on php-fpm](#enablePhpXdebug)
+
+
+
+<a name="Usage"></a>
+## Usage
+
+<a name="UsagePHPStormRunExampleTest"></a>
+### Run ExampleTest
+- right-click on `tests/ExampleTest.php`
+    - Select: `Run 'ExampleTest.php'` or `Ctrl+Shift+F10`.
+    - Should pass!! You just ran a remote test via SSH!
+
+<a name="UsagePHPStormDebugExampleTest"></a>
+### Debug ExampleTest
+- Open to edit: `tests/ExampleTest.php`
+- Add a BreakPoint on line 16: `$this->visit('/')`
+- right-click on `tests/ExampleTest.php`
+    - Select: `Debug 'ExampleTest.php'`.
+    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
+    - ![Remote Test Debugging Success](/images/photos/PHPStorm/RemoteTestDebuggingSuccess.png)
+
+
+<a name="UsagePHPStormDebugSite"></a>
+### Debug WebSite
+- In case xDebug is disabled, from the `laradock` folder run:
+`.php-fpm/xdebug start`.
+    - To switch xdebug off, run:
+`.php-fpm/xdebug stop`
+
+- Start Remote Debugging
+    - ![DebugRemoteOn](/images/photos/PHPStorm/DebugRemoteOn.png)
+
+- Open to edit: `bootstrap/app.php`
+- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
+- Reload [Laravel Site](http://laravel/)
+    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
+    - ![Remote Debugging Success](/images/photos/PHPStorm/RemoteDebuggingSuccess.png)
+
+
+<a name="SSHintoWorkspace"></a>
+## Let's shell into workspace
+Assuming that you are in laradock folder, type:
+`ssh -i workspace/insecure_id_rsa -p2222 root@laravel`
+**Cha Ching!!!!**
+- `workspace/insecure_id_rsa.ppk` may become corrupted. In which case:
+    - fire up `puttygen`
+    - import `workspace/insecure_id_rsa`
+    - save private key to `workspace/insecure_id_rsa.ppk`
+
+<a name="InstallKiTTY"></a>
+
+### KiTTY
+[Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
+
+- Here are some settings that are working for me:
+    - ![Session](/images/photos/KiTTY/Session.png)
+    - ![Terminal](/images/photos/KiTTY/Terminal.png)
+    - ![Window](/images/photos/KiTTY/Window.png)
+    - ![WindowAppearance](/images/photos/KiTTY/WindowAppearance.png)
+    - ![Connection](/images/photos/KiTTY/Connection.png)
+    - ![ConnectionData](/images/photos/KiTTY/ConnectionData.png)
+    - ![ConnectionSSH](/images/photos/KiTTY/ConnectionSSH.png)
+    - ![ConnectionSSHAuth](/images/photos/KiTTY/ConnectionSSHAuth.png)
+    - ![TerminalShell](/images/photos/KiTTY/TerminalShell.png)
+
+

DOCUMENTATION/content/help/index.md

@@ -0,0 +1,9 @@
+---
+title: Help & Questions
+type: index
+weight: 5
+---
+
+Join the chat room on [Gitter](https://gitter.im/Laradock/laradock) and get help and support from the community.
+
+You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/Laradock/laradock).

DOCUMENTATION/content/introduction/index.md

@@ -0,0 +1,168 @@
+---
+title: Introduction
+type: index
+weight: 1
+---
+
+
+
+
+A full PHP development environment for Docker.
+
+Includes pre-packaged Docker Images, all pre-configured to provide a wonderful PHP development environment.
+
+Laradock is well known in the Laravel community, as the project started with single focus on running Laravel projects on Docker. Later and due to the large adoption from the PHP community, it started supporting other PHP projects like Symfony, CodeIgniter, WordPress, Drupal...
+
+
+![](https://s19.postimg.org/jblfytw9f/laradock-logo.jpg)
+
+## Quick Overview
+
+Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `Beanstalkd`:
+
+1 - Clone Laradock inside your PHP project:
+
+```shell
+git clone https://github.com/Laradock/laradock.git
+```
+
+2 - Enter the laradock folder and rename `env-example` to `.env`.
+
+```shell
+cp env-example .env
+```
+
+3 - Run your containers:
+
+```shell
+docker-compose up -d nginx mysql redis beanstalkd
+```
+
+4 - Open your project's `.env` file and set the following:
+
+```shell
+DB_HOST=mysql
+REDIS_HOST=redis
+QUEUE_HOST=beanstalkd
+```
+
+5 - Open your browser and visit localhost: `http://localhost`.
+
+```shell
+That's it! enjoy :)
+```
+
+
+
+
+<a name="features"></a>
+## Features
+
+- Easy switch between PHP versions: 7.1, 7.0, 5.6...
+- Choose your favorite database engine: MySQL, Postgres, MariaDB...
+- Run your own combination of software: Memcached, HHVM, Beanstalkd...
+- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
+- Easy to customize any container, with simple edit to the `Dockerfile`.
+- All Images extends from an official base Image. (Trusted base Images).
+- Pre-configured NGINX to host any code at your root directory.
+- Can use Laradock per project, or single Laradock for all projects.
+- Easy to install/remove software's in Containers using environment variables.
+- Clean and well structured Dockerfiles (`Dockerfile`).
+- Latest version of the Docker Compose file (`docker-compose`).
+- Everything is visible and editable.
+- Fast Images Builds.
+- More to come every week..
+
+
+
+
+<a name="Supported-Containers"></a>
+## Supported Software (Images)
+
+In adhering to the separation of concerns principle as promoted by Docker, Laradock runs each software on its own Container.
+You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
+
+- **Database Engines:**
+MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.
+- **Cache Engines:**
+Redis - Memcached - Aerospike
+- **PHP Servers:**
+NGINX - Apache2 - Caddy
+- **PHP Compilers:**
+PHP FPM - HHVM
+- **Message Queuing:**
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker
+- **Tools:**
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog - [Blackfire](https://blackfire.io)...
+
+Laradock introduces the **Workspace** Image, as a development environment.
+It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose.
+
+**Workspace Image Tools**
+PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn - SOAP - Drush...
+
+You can choose, which tools to install in your workspace container and other containers, from the `.env` file.
+
+
+> If you modify `docker-compose.yml`, `.env` or any `dockerfile` file, you must re-build your containers, to see those effects in the running instance.
+
+
+
+If you can't find your Software in the list, build it yourself and sumit it. Contributions are welcomed :)
+
+
+
+
+
+
+<a name="what-is-docker"></a>
+## What is Docker?
+
+[Docker](https://www.docker.com) is an open platform for developing, shipping, and running applications.
+Docker enables you to separate your applications from your infrastructure so you can deliver software quickly.
+With Docker, you can manage your infrastructure in the same ways you manage your applications.
+By taking advantage of Docker’s methodologies for shipping, testing, and deploying code quickly, you can significantly reduce the delay between writing code and running it in production.
+
+
+
+
+
+<a name="why-docker-not-vagrant"></a>
+## Why Docker not Vagrant!?
+
+[Vagrant](https://www.vagrantup.com) creates Virtual Machines in minutes while Docker creates Virtual Containers in seconds.
+
+Instead of providing a full Virtual Machines, like you get with Vagrant, Docker provides you **lightweight** Virtual Containers, that share the same kernel and allow to safely execute independent processes.
+
+In addition to the speed, Docker gives tons of features that cannot be achieved with Vagrant.
+
+Most importantly Docker can run on Development and on Production (same environment everywhere). While Vagrant is designed for Development only, (so you have to re-provision your server on Production every time).
+
+
+
+
+
+
+<a name="Demo"></a>
+## Demo Video
+
+What's better than a **Demo Video**:
+
+- Laradock v5.* (soon or never)
+- Laradock [v4.*](https://www.youtube.com/watch?v=TQii1jDa96Y)
+- Laradock [v2.*](https://www.youtube.com/watch?v=-DamFMczwDA)
+- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
+- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
+
+
+
+
+
+
+
+<a name="Chat"></a>
+## Chat with us
+
+You are welcome to join our chat room on Gitter.
+
+[![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

DOCUMENTATION/content/license/index.md

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

DOCUMENTATION/content/related-projects/index.md

@@ -0,0 +1,18 @@
+---
+title: Related Projects
+type: index
+weight: 6
+---
+
+Laradock related projects:
+
+* [Laradock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
+* [Laradock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
+* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
+* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
+These Docker Compose projects have piqued our interest:
+* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
+* [RubyDev-Dock](https://github.com/scudelletti/rubydev-dock) by [Diogo Scudelletti](https://github.com/scudelletti)
+* [NoDock](https://github.com/Osedea/nodock) by [Osedea](https://github.com/Osedea)
+
+If you want your project listed here, please open an issue.

DOCUMENTATION/static/CNAME

@@ -0,0 +1 @@
+laradock.io

DOCUMENTATION/themes/hugo-material-docs/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+
+### 11th May 2016
+
+#### Add templates for section lists
+
+Sections such as www.example.com/foo/ will now be rendered with a list of all pages that are part of this section. The list shows the pages' title and a summary of their content.
+
+[Show me the diff](https://github.com/digitalcraftsman/hugo-material-docs/commit/1f8393a8d4ce1b8ee3fc7d87be05895c12810494)
+
+### 22nd March 2016
+
+#### Changing setup for Google Analytics
+
+Formerly, the tracking id for Google Analytics was set like below:
+
+```toml
+[params]
+    google_analytics = ["UA-XXXXXXXX-X", "auto"]
+```
+
+Now the theme uses Hugo's own Google Analytics config option. The variable moved outside the scope of `params` and the setup requires only the tracking id as a string:
+
+```toml
+googleAnalytics = "UA-XXXXXXXX-X"
+```
+
+[Show me the diff](https://github.com/digitalcraftsman/hugo-material-docs/commit/fa10c8eef935932426d46b662a51f29a5e0d48e2)

DOCUMENTATION/themes/hugo-material-docs/LICENSE.md

@@ -0,0 +1,20 @@
+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.

DOCUMENTATION/themes/hugo-material-docs/README.md

@@ -0,0 +1,40 @@
+# Material Docs
+
+A material design theme for [Hugo](https://gohugo.io).
+
+[![Screenshot](https://raw.githubusercontent.com/digitalcraftsman/hugo-material-docs/master/static/images/screen.png)](https://digitalcraftsman.github.io/hugo-material-docs/)
+
+## Quick start
+
+Install with `git`:
+
+
+    git clone https://github.com/digitalcraftsman/hugo-material-docs.git themes/hugo-material-docs
+
+
+Next, take a look in the `exampleSite` folder at. This directory contains an example config file and the content for the demo. 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. For detailed installation instructions visit the [demo](http://themes.gohugo.io/theme/material-docs/).
+
+Noteworthy changes of this theme are listed in the [changelog](https://github.com/digitalcraftsman/hugo-material-docs/blob/master/CHANGELOG.md).
+
+## Acknowledgements
+
+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.
+
+## License
+
+The theme is released under the MIT license. Read the [license](https://github.com/digitalcraftsman/hugo-material-docs/blob/master/LICENSE.md) for more information.
+

DOCUMENTATION/themes/hugo-material-docs/archetypes/default.md

@@ -0,0 +1,2 @@
+---
+---

DOCUMENTATION/themes/hugo-material-docs/layouts/_default/__list.html

@@ -0,0 +1,57 @@
+{{ partial "head" . }}
+
+<div class="backdrop">
+	<div class="backdrop-paper"></div>
+</div>
+
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
+<label class="toggle-button overlay" for="toggle-drawer"></label>
+
+<header class="header">
+	{{ partial "header" . }}
+</header>
+
+<main class="main">
+	<div class="drawer">
+		{{ partial "drawer" . }}
+	</div>
+
+	<article class="article">
+		<div class="wrapper">
+			<h1>Pages in {{ .Title | singularize }}</h1>
+
+			{{ range .Data.Pages }}
+			<a href="{{ .Permalink }}" title="{{ .Title }}">
+				<h2>{{ .Title }}</h2>
+			</a>
+
+			<br>
+			{{ printf "%s" .Summary | markdownify }}
+
+			<hr>
+			{{ end }}
+
+			<aside class="copyright" role="note">
+				{{ with .Site.Params.copyright }}
+				&copy; {{ $.Now.Format "2006" }} {{ . }} &ndash;
+				{{ end }}
+				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.
+			</aside>
+		</div>
+	</article>
+
+	<div class="results" role="status" aria-live="polite">
+		<div class="scrollable">
+			<div class="wrapper">
+				<div class="meta"></div>
+				<div class="list"></div>
+			</div>
+		</div>
+	</div>
+</main>
+
+{{ partial "footer_js" . }}

DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html

@@ -0,0 +1,57 @@
+{{ partial "head" . }}
+
+{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
+	{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+	{{ .Scratch.Set "repo_id" $repo_id }}
+{{ end }}
+
+<div class="backdrop">
+	<div class="backdrop-paper"></div>
+</div>
+
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
+<label class="toggle-button overlay" for="toggle-drawer"></label>
+
+<header class="header">
+	{{ partial "header" . }}
+</header>
+
+<main class="main">
+	<div class="drawer">
+		{{ partial "drawer" . }}
+	</div>
+
+	<article class="article">
+		<div class="wrapper">
+			<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
+
+			{{ .Content }}
+
+			<aside class="copyright" role="note">
+				{{ with .Site.Params.copyright }}
+				&copy; {{ $.Now.Format "2006" }} {{ . }} &ndash;
+				{{ end }}
+				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.
+			</aside>
+
+			<footer class="footer">
+				{{ partial "footer" . }}
+			</footer>
+		</div>
+	</article>
+
+	<div class="results" role="status" aria-live="polite">
+		<div class="scrollable">
+			<div class="wrapper">
+				<div class="meta"></div>
+				<div class="list"></div>
+			</div>
+		</div>
+	</div>
+</main>
+
+{{ partial "footer_js" . }}

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

@@ -0,0 +1,61 @@
+{{ partial "head" . }}
+
+{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
+	{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+	{{ .Scratch.Set "repo_id" $repo_id }}
+{{ end }}
+
+<div class="backdrop">
+	<div class="backdrop-paper"></div>
+</div>
+
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
+<label class="toggle-button overlay" for="toggle-drawer"></label>
+
+<header class="header">
+	{{ partial "header" . }}
+</header>
+
+<main class="main">
+	<div class="drawer">
+		{{ partial "drawer" . }}
+	</div>
+
+	<article class="article">
+		<div class="wrapper">
+			{{ range where .Site.Pages "Type" "index" }}
+				<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
+
+				{{ .Content }}
+			{{ end }}
+
+			<aside class="copyright" role="note">
+				{{ with .Site.Params.copyright }}
+				&copy; {{ $.Now.Format "2006" }} {{ . }} &ndash;
+				{{ end }}
+				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,
+                by
+                <a href="https://zalt.me">Mahmoud Zalt</a>.
+			</aside>
+
+			<footer class="footer">
+				{{ partial "footer" . }}
+			</footer>
+		</div>
+	</article>
+
+	<div class="results" role="status" aria-live="polite">
+		<div class="scrollable">
+			<div class="wrapper">
+				<div class="meta"></div>
+				<div class="list"></div>
+			</div>
+		</div>
+	</div>
+</main>
+
+{{ partial "footer_js" . }}

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

@@ -0,0 +1,78 @@
+<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>
+
+  <div class="scrollable">
+    <div class="wrapper">
+      {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
+        <ul class="repo">
+          <li class="repo-download">
+            <a href="{{ .Site.Params.repo_url }}/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="{{ .Site.Params.repo_url }}/stargazers" target="_blank" title="Stargazers" data-action="star">
+              <i class="icon icon-star"></i> Stars
+              <span class="count">&ndash;</span>
+            </a>
+          </li>
+        </ul>
+        <hr>
+      {{ end }}
+
+      <div class="toc">
+        {{ if gt (len .Site.Menus.main) 0 }}
+        <ul>
+          {{ partial "nav" . }}
+        </ul>
+        {{ end }}
+
+        {{ if isset .Site.Params "author" }}
+        <!--<hr>-->
+        <!--<span class="section">The author</span>-->
+        
+        <ul>
+          {{ with .Site.Social.twitter }}
+          <li>
+            <a href="https://twitter.com/{{ . }}" target="_blank" title="@{{ . }} on Twitter">
+              @{{ . }} on Twitter
+            </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>
+            <a href="mailto:{{ . }}" title="Email of {{ . }}">
+              Contact via email
+            </a>
+          </li>
+          {{ end }}
+        </ul>
+        {{ end }}
+      </div>
+    </div>
+  </div>
+</nav>

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

@@ -0,0 +1,74 @@
+{{ if .IsPage }}
+{{ if .Prev | or .Next }}
+<nav class="pagination" aria-label="Footer">
+  <div class="previous">
+  {{ if .Prev }}
+      <a href="{{ .Prev.Permalink }}" title="{{ .Prev.Title }}">
+        <span class="direction">
+          Previous
+        </span>
+        <div class="page">
+          <div class="button button-previous" role="button" aria-label="Previous">
+            <i class="icon icon-back"></i>
+          </div>
+          <div class="stretch">
+            <div class="title">
+              {{ .Prev.Title }}
+            </div>
+          </div>
+        </div>
+      </a>
+  {{ end }}
+  </div>
+
+  <div class="next">
+  {{ if .Next }}
+      <a href="{{ .Next.Permalink }}" title="{{ .Next.Title }}">
+        <span class="direction">
+          Next
+        </span>
+        <div class="page">
+          <div class="stretch">
+            <div class="title">
+              {{ .Next.Title }}
+            </div>
+          </div>
+          <div class="button button-next" role="button" aria-label="Next">
+            <i class="icon icon-forward"></i>
+          </div>
+        </div>
+      </a>
+  {{ end }}
+  </div>
+</nav>
+{{ end }}
+{{ end }}
+
+{{ if .IsHome }}
+{{ if gt (len .Site.Pages) 2 }}
+<nav class="pagination" aria-label="Footer">
+  <div class="previous">
+  </div>
+
+  {{ $title := (index (.Site.Pages.ByDate) 1).Title  }}
+  {{ $permalink := (index (.Site.Pages.ByDate) 1).Permalink }}
+  <div class="next">
+      <a href="{{ $permalink }}" title="{{ $title }}">
+        <span class="direction">
+          Next
+        </span>
+        <div class="page">
+          <div class="stretch">
+            <div class="title">
+              {{ $title }}
+            </div>
+          </div>
+          <div class="button button-next" role="button" aria-label="Next">
+            <i class="icon icon-forward"></i>
+          </div>
+        </div>
+      </a>
+  </div>
+</nav>
+{{ end }}
+{{ end }}

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

@@ -0,0 +1,91 @@
+    <script>
+    {{ with .Scratch.Get "repo_id" }}
+      var base_url = '{{ (printf "%s" $.Site.BaseURL) | safeJS }}';
+      var repo_id  = '{{ . | safeJS }}';
+    {{ else }}
+      var base_url = '';
+      var repo_id  = '';
+    {{ end }}
+    </script>
+
+    <script src="{{ "javascripts/application.js" | absURL }}"></script>
+    {{ range .Site.Params.custom_js }}
+    <script src="{{ . | absURL }}"></script>
+    {{ end }}
+
+    <script>
+      {{ "/* Add headers to scrollspy */" | safeJS }}
+      var headers   = document.getElementsByTagName("h2");
+      var scrollspy = document.getElementById('scrollspy');
+
+      if(scrollspy) {
+        if(headers.length > 0) {
+          for(var i = 0; i < headers.length; i++) {
+            var li = document.createElement("li");
+            li.setAttribute("class", "anchor");
+
+            var a  = document.createElement("a");
+            a.setAttribute("href", "#" + headers[i].id);
+            a.setAttribute("title", headers[i].innerHTML);
+            a.innerHTML = headers[i].innerHTML;
+
+            li.appendChild(a)
+            scrollspy.appendChild(li);
+          }
+        } else {
+          scrollspy.parentElement.removeChild(scrollspy)
+        }
+
+
+        {{ "/* Add permanent link next to the headers */" | safeJS }}
+        var headers = document.querySelectorAll("h1, h2, h3, h4, h5, h6");
+
+        for(var i = 0; i < headers.length; i++) {
+            var a = document.createElement("a");
+            a.setAttribute("class", "headerlink");
+            a.setAttribute("href", "#" + headers[i].id);
+            a.setAttribute("title", "Permanent link")
+            a.innerHTML = {{ or .Site.Params.permalink "¶" }};
+            headers[i].appendChild(a);
+        }
+      }
+    </script>
+
+    {{ with .Site.GoogleAnalytics }}
+      <script>
+        (function(i,s,o,g,r,a,m){
+          i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||
+          []).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;
+          m.parentNode.insertBefore(a,m)
+        })(window, document,
+          'script', '//www.google-analytics.com/analytics.js', 'ga');
+        /* General initialization */
+        ga('create', '{{ . }}', 'auto');
+        ga('set', 'anonymizeIp', true);
+        ga('send', 'pageview');
+        /* Track outbound links */
+        var buttons = document.querySelectorAll('a');
+        Array.prototype.map.call(buttons, function(item) {
+          if (item.host != document.location.host) {
+            item.addEventListener('click', function() {
+              var action = item.getAttribute('data-action') || 'follow';
+              ga('send', 'event', 'outbound', action, item.href);
+            });
+          }
+        });
+        /* Register handler to log search on blur */
+        var query = document.querySelector('.query');
+        query.addEventListener('blur', function() {
+          if (this.value) {
+            var path = document.location.pathname;
+            ga('send', 'pageview', path + '?q=' + this.value);
+          }
+        });
+      </script>
+    {{ end }}
+
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.8.0/highlight.min.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
+  </body>
+</html>

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

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+  <!--[if lt IE 7 ]><html class="no-js ie6"><![endif]-->
+  <!--[if IE 7 ]><html class="no-js ie7"><![endif]-->
+  <!--[if IE 8 ]><html class="no-js ie8"><![endif]-->
+  <!--[if IE 9 ]><html class="no-js ie9"><![endif]-->
+  <!--[if (gt IE 9)|!(IE)]><!--> <html class="no-js"> <!--<![endif]-->
+
+  <head {{ with .Site.LanguageCode }}lang="{{ . }}"{{ end }}>
+    <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>{{ .Title }}{{ if not .IsHome }} - {{ .Site.Title }}{{ end }}</title>
+    {{ .Hugo.Generator }}
+
+    {{ with .Site.Params.description }}
+    <meta name="description" content="{{ . }}">
+    {{ end }}
+    <link rel="canonical" href="{{ .Permalink }}">
+    {{ with .Site.Params.author }}
+    <meta name="author" content="{{ . }}">
+    {{ end }}
+
+    <meta property="og:url" content="{{ .Permalink }}">
+    {{ with .Site.Title }}<meta property="og:title" content="{{ . }}">{{ end }}
+    {{ with .Site.Params.logo }}<meta property="og:image" content="{{ . | absURL }}">{{ end }}
+    {{ with .Site.Title }}<meta name="apple-mobile-web-app-title" content="{{ . }}">{{ end }}
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+
+    <link rel="shortcut icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
+    <link rel="icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
+
+    <style>
+      @font-face {
+        font-family: 'Icon';
+        src: url('{{ "fonts/icon.eot?52m981" | absURL }}');
+        src: url('{{ "fonts/icon.eot?#iefix52m981" | absURL }}')
+               format('embedded-opentype'),
+             url('{{ "fonts/icon.woff?52m981" | absURL }}')
+               format('woff'),
+             url('{{ "fonts/icon.ttf?52m981" | absURL }}')
+               format('truetype'),
+             url('{{ "fonts/icon.svg?52m981#icon" | absURL }}')
+               format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
+    </style>
+
+    <link rel="stylesheet" href="{{ "stylesheets/application.css" | absURL }}">
+    <link rel="stylesheet" href="{{ "stylesheets/temporary.css" | absURL }}">
+    <link rel="stylesheet" href="{{ "stylesheets/palettes.css" | absURL }}">
+    <link rel="stylesheet" href="{{ with .Site.Params.highlight_css }}{{ . | absURL }}{{ else }}{{ "stylesheets/highlight/highlight.css" | absURL }}{{ end }}">
+
+    {{/* set default values if no custom ones are defined */}}
+    {{ $text := or .Site.Params.font.text "Roboto" }}
+    {{ $code := or .Site.Params.font.code "Roboto Mono" }}
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ $text }}:400,700|{{ replace  $code " " "+" | safeURL }}">
+    <style>
+      body, input {
+        font-family: '{{ $text }}', Helvetica, Arial, sans-serif;
+      }
+      pre, code {
+        font-family: '{{ $code }}', 'Courier New', 'Courier', monospace;
+      }
+    </style>
+
+    {{ range .Site.Params.custom_css }}
+    <link rel="stylesheet" href="{{ . | absURL }}">
+    {{ end }}
+    <script src="{{ "javascripts/modernizr.js" | absURL }}"></script>
+
+    {{ with .RSSLink }}
+    <link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+    <link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
+    {{ end }}
+
+  </head>
+  <body class="{{ with .Site.Params.palette.primary }}palette-primary-{{ . }}{{end }} {{ with .Site.Params.palette.accent }}palette-accent-{{ .  }}{{ end }}">

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

@@ -0,0 +1,46 @@
+<nav aria-label="Header">
+  <div class="bar default">
+    <div class="button button-menu" role="button" aria-label="Menu">
+      <label class="toggle-button icon icon-menu" for="toggle-drawer">
+        <span></span>
+      </label>
+    </div>
+    <div class="stretch">
+      <div class="title">
+          <b>{{ .Site.Title }}</b> <span style="color: rgba(249, 245, 255, 0.63);"> / {{ .Title }}</span>
+      </div>
+    </div>
+
+    {{ with .Site.Social.twitter }}
+    <div class="button button-twitter" role="button" aria-label="Twitter">
+       <a href="https://twitter.com/{{ . }}" title="@{{ . }} on Twitter" target="_blank" class="toggle-button icon icon-twitter"></a>
+    </div>
+    {{ end }}
+
+    {{ with .Site.Social.github }}
+    <div class="button button-github" role="button" aria-label="GitHub">
+        <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 
+    <div class="button button-search" role="button" aria-label="Search">
+      <label class="toggle-button icon icon-search" title="Search" for="toggle-search"></label>
+    </div>
+    -->    
+  </div>
+  <div class="bar search">
+    <div class="button button-close" role="button" aria-label="Close">
+      <label class="toggle-button icon icon-back" for="toggle-search"></label>
+    </div>
+    <div class="stretch">
+      <div class="field">
+        <input class="query" type="text" placeholder="Search" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck>
+      </div>
+    </div>
+    <div class="button button-reset" role="button" aria-label="Search">
+      <button class="toggle-button icon icon-close" id="reset-search"></button>
+    </div>
+  </div>
+</nav>

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

@@ -0,0 +1,19 @@
+{{ $currentNode := . }}
+
+{{ range .Site.Menus.main.ByWeight }}
+
+{{ $.Scratch.Set "currentMenuEntry" . }}
+<li>
+  {{ if .HasChildren }}
+    <span class="section">{{ .Name | title }}</span>
+    <ul>
+      {{ range .Children }}
+        {{ $.Scratch.Set "currentMenuEntry" . }}
+        {{ partial "nav_link" $currentNode }}
+      {{ end }}
+    </ul>
+  {{ else }}
+    {{ partial "nav_link" $currentNode }}
+  {{ end }}
+</li>
+{{ end }}

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

@@ -0,0 +1,13 @@
+{{ $currentMenuEntry := .Scratch.Get "currentMenuEntry" }}
+{{ $isCurrent := eq .Permalink ($currentMenuEntry.URL | absURL | printf "%s") }}
+
+
+<a {{ if $isCurrent }}class="current"{{ end }} title="{{ $currentMenuEntry.Name }}" href="{{ $currentMenuEntry.URL | relURL}}">
+	{{ $currentMenuEntry.Pre }}
+	{{ $currentMenuEntry.Name }}
+</a>
+
+{{ if $isCurrent }}
+<ul id="scrollspy">
+</ul>
+{{ end }}

DOCUMENTATION/themes/hugo-material-docs/layouts/shortcodes/note.html

@@ -0,0 +1,4 @@
+<div class="admonition note">
+<p class="admonition-title">{{ .Get "title" }}</p>
+<p>{{ printf "%s" .Inner | markdownify }}</p>
+</div>

DOCUMENTATION/themes/hugo-material-docs/layouts/shortcodes/warning.html

@@ -0,0 +1,4 @@
+<div class="admonition warning">
+<p class="admonition-title">{{ .Get "title" }}</p>
+<p>{{ printf "%s" .Inner | markdownify }}</p>
+</div>

DOCUMENTATION/themes/hugo-material-docs/static/fonts/icon.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe600;" glyph-name="search" d="M661.333 341.334h-33.92l-11.733 11.733c41.813 48.427 66.987 111.36 66.987 180.267 0 153.173-124.16 277.333-277.333 277.333s-277.333-124.16-277.333-277.333 124.16-277.333 277.333-277.333c68.907 0 131.84 25.173 180.267 66.773l11.733-11.733v-33.707l213.333-212.907 63.573 63.573-212.907 213.333zM405.333 341.334c-106.027 0-192 85.973-192 192s85.973 192 192 192 192-85.973 192-192-85.973-192-192-192z" />
+<glyph unicode="&#xe601;" glyph-name="arrow-back" d="M853.333 469.334h-519.253l238.293 238.293-60.373 60.373-341.333-341.333 341.333-341.333 60.373 60.373-238.293 238.293h519.253v85.333z" />
+<glyph unicode="&#xe602;" glyph-name="chevron-right" d="M426.667 682.667l-60.373-60.373 195.627-195.627-195.627-195.627 60.373-60.373 256 256z" />
+<glyph unicode="&#xe603;" glyph-name="close" d="M810.667 664.96l-60.373 60.373-238.293-238.293-238.293 238.293-60.373-60.373 238.293-238.293-238.293-238.293 60.373-60.373 238.293 238.293 238.293-238.293 60.373 60.373-238.293 238.293z" />
+<glyph unicode="&#xe604;" glyph-name="menu" d="M128 170.667h768v85.333h-768v-85.333zM128 384h768v85.333h-768v-85.333zM128 682.667v-85.333h768v85.333h-768z" />
+<glyph unicode="&#xe605;" glyph-name="arrow-forward" d="M512 768l-60.373-60.373 238.293-238.293h-519.253v-85.333h519.253l-238.293-238.293 60.373-60.373 341.333 341.333z" />
+<glyph unicode="&#xe606;" glyph-name="twitter" d="M1024 744.249c-37.676-16.708-78.164-28.002-120.66-33.080 43.372 26 76.686 67.17 92.372 116.23-40.596-24.078-85.556-41.56-133.41-50.98-38.32 40.83-92.922 66.34-153.346 66.34-116.022 0-210.088-94.058-210.088-210.078 0-16.466 1.858-32.5 5.44-47.878-174.6 8.764-329.402 92.4-433.018 219.506-18.084-31.028-28.446-67.116-28.446-105.618 0-72.888 37.088-137.192 93.46-174.866-34.438 1.092-66.832 10.542-95.154 26.278-0.020-0.876-0.020-1.756-0.020-2.642 0-101.788 72.418-186.696 168.522-206-17.626-4.8-36.188-7.372-55.348-7.372-13.538 0-26.698 1.32-39.528 3.772 26.736-83.46 104.32-144.206 196.252-145.896-71.9-56.35-162.486-89.934-260.916-89.934-16.958 0-33.68 0.994-50.116 2.94 92.972-59.61 203.402-94.394 322.042-94.394 386.422 0 597.736 320.124 597.736 597.744 0 9.108-0.206 18.168-0.61 27.18 41.056 29.62 76.672 66.62 104.836 108.748z" />
+<glyph unicode="&#xe607;" glyph-name="github" d="M512.008 926.025c-282.738 0-512.008-229.218-512.008-511.998 0-226.214 146.704-418.132 350.136-485.836 25.586-4.738 34.992 11.11 34.992 24.632 0 12.204-0.48 52.542-0.696 95.324-142.448-30.976-172.504 60.41-172.504 60.41-23.282 59.176-56.848 74.916-56.848 74.916-46.452 31.778 3.51 31.124 3.51 31.124 51.4-3.61 78.476-52.766 78.476-52.766 45.672-78.27 119.776-55.64 149.004-42.558 4.588 33.086 17.852 55.68 32.506 68.464-113.73 12.942-233.276 56.85-233.276 253.032 0 55.898 20.004 101.574 52.76 137.428-5.316 12.9-22.854 64.972 4.952 135.5 0 0 43.006 13.752 140.84-52.49 40.836 11.348 84.636 17.036 128.154 17.234 43.502-0.198 87.336-5.886 128.256-17.234 97.734 66.244 140.656 52.49 140.656 52.49 27.872-70.528 10.35-122.6 5.036-135.5 32.82-35.856 52.694-81.532 52.694-137.428 0-196.654-119.778-239.95-233.79-252.624 18.364-15.89 34.724-47.046 34.724-94.812 0-68.508-0.596-123.644-0.596-140.508 0-13.628 9.222-29.594 35.172-24.566 203.322 67.776 349.842 259.626 349.842 485.768 0 282.78-229.234 511.998-511.992 511.998z" />
+<glyph unicode="&#xe608;" glyph-name="download" d="M810.667 554.667h-170.667v256h-256v-256h-170.667l298.667-298.667 298.667 298.667zM213.333 170.667v-85.333h597.333v85.333h-597.333z" />
+<glyph unicode="&#xe609;" glyph-name="star" d="M512 201.814l263.68-159.147-69.973 299.947 232.96 201.813-306.773 26.027-119.893 282.88-119.893-282.88-306.773-26.027 232.96-201.813-69.973-299.947z" />
+<glyph unicode="&#xe610;" glyph-name="warning" d="M554 340.667v172h-84v-172h84zM554 170.667v86h-84v-86h84zM42 42.667l470 810 470-810h-940z" />
+<glyph unicode="&#xe611;" glyph-name="hint" d="M614 682.667h240v-426h-300l-16 84h-240v-298h-84v726h384z" />
+</font></defs></svg>

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

@@ -0,0 +1,116 @@
+/* 
+ * overwrite the current primary color of the 
+ * theme that is used as fallback in codeblocks 
+ */
+.article pre code {
+	color: rgba(0, 0, 0, 0.78) !important;
+}
+
+
+/*	
+	HIGHLIGHT.JS THEME 
+
+	tweaked version of the Github theme
+*/
+
+.hljs {
+display:block;
+overflow-x:auto;
+}
+
+.hljs-comment,
+.hljs-quote {
+color:#998;
+font-style:italic;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-subst {
+color:#333;
+font-weight:700;
+}
+
+.hljs-number,
+.hljs-literal,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag .hljs-attr {
+color:teal;
+}
+
+.hljs-string,
+.hljs-doctag {
+color:#d14;
+}
+
+.hljs-title,
+.hljs-section,
+.hljs-selector-id {
+color:#900;
+font-weight:700;
+}
+
+.hljs-subst {
+font-weight:400;
+}
+
+.hljs-type,
+.hljs-class .hljs-title {
+color:#458;
+font-weight:700;
+}
+
+.hljs-tag,
+.hljs-name,
+.hljs-attribute {
+color:navy;
+font-weight:400;
+}
+
+.hljs-regexp,
+.hljs-link {
+color:#009926;
+}
+
+.hljs-symbol,
+.hljs-bullet {
+color:#990073;
+}
+
+.hljs-built_in,
+.hljs-builtin-name {
+color:#0086b3;
+}
+
+.hljs-meta {
+color:#999;
+font-weight:700;
+}
+
+.hljs-deletion {
+background:#fdd;
+}
+
+.hljs-addition {
+background:#dfd;
+}
+
+.hljs-emphasis {
+font-style:italic;
+}
+
+.hljs-strong {
+font-weight:700;
+}
+
+/*
+    OVERRIDING THE DEFAULT STYLES - By Mahmoud Zalt (mahmoud@zalt.me) for Laradock.io
+*/
+
+.project .logo img{
+    width: 140px;
+    height: 140px;
+    background: transparent;
+    border-radius: 0%;
+}

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

@@ -0,0 +1,11 @@
+/*  This file only exists (temporarily) until the
+    custom styling can be replaced with the
+    implementation of the upstream project.
+*/
+
+blockquote {
+    padding: 0 20px;
+    margin: 0 0 20px;
+    font-size: inherit;
+    border-left: 5px solid #eee;
+}

DOCUMENTATION/themes/hugo-material-docs/theme.toml

@@ -0,0 +1,18 @@
+name = "Material Docs"
+license = "MIT"
+licenselink = "https://github.com/digitalcraftsman/hugo-material-docs/blob/master/LICENSE.md"
+description = "A material design theme for documentations."
+homepage = "https://github.com/digitalcraftsman/hugo-material-docs"
+tags = ["material", "documentation", "docs", "google analytics", "responsive"]
+features = ["", ""]
+min_version = 0.15
+
+[author]
+  name = "Digitalcraftsman"
+  homepage = "https://github.com/digitalcraftsman"
+
+# If porting an existing theme
+[original]
+  name = "Martin Donath"
+  homepage = "http://struct.cc/"
+  repo = "https://github.com/squidfunk/mkdocs-material"

README-zh.md

@@ -1,24 +1,23 @@
-# LaraDock
+# Laradock
 
 [![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
-[![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+Laradock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。
 
-LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
-<br>
 就像 Laravel Homestead 一样，但是 Docker 替换了 Vagrant。
-> 先在使用 LaraDock，然后再学习它们。
 
-<br>
+> 先在使用 Laradock，然后再学习它们。
+
 ## 目录
-
 - [Intro](#Intro)
 	- [Features](#features)
 	- [Supported Software's](#Supported-Containers)
 	- [What is Docker](#what-is-docker)
 	- [What is Laravel](#what-is-laravel)
 	- [Why Docker not Vagrant](#why-docker-not-vagrant)
-	- [LaraDock VS Homestead](#laradock-vs-homestead)
+	- [Laradock VS Homestead](#laradock-vs-homestead)
 - [Demo Video](#Demo)
 - [Requirements](#Requirements)
 - [Installation](#Installation)
@@ -50,30 +49,38 @@ LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
 		- [Install Prestissimo](#Install-Prestissimo)
 		- [Install Node + NVM](#Install-Node)
 		- [Debugging](#debugging)
-		- [Upgrading LaraDock](#upgrading-laradock)
+		- [Upgrading Laradock](#upgrading-laradock)
 - [Help & Questions](#Help)
 
 
-
 <a name="Intro"></a>
 ## 介绍
-LaraDock努力简化创建开发环境过程。
+
+Laradock 努力简化创建开发环境过程。
 它包含预包装 Docker 镜像，提供你一个美妙的开发环境而不需要安装 PHP, NGINX, MySQL 和其他任何软件在你本地机器上。
 
 **使用概览：**
 
-
 让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`，然后运行 `Laravel`
 
-1. 将LaraDock放到你的Laravel项目中：
-<br>
-`git clone https://github.com/LaraDock/laradock.git`.
-2. 进入LaraDock目录，然后运行这些容器。
-<br>
-`docker-compose up -d nginx mysql redis`
-3. 打开你的`.env`文件，然后设置`mysql`的`DB_HOST` 和  `redis`的`REDIS_HOST`。
-4. 打开浏览器，访问localhost：
+1. 将 Laradock 放到你的 Laravel 项目中：
+```bash
+git clone https://github.com/laradock/laradock.git
+```
 
+2. 进入 Laradock 目录
+ ```bash
+cp env-example .env
+```
+
+3. 运行这些容器。
+```bash
+docker-compose up -d nginx mysql redis
+```
+
+4. 打开你的Laravel 项目的 `.env` 文件，然后设置 `mysql` 的 `DB_HOST` 和  `redis` 的`REDIS_HOST`。
+
+5. 打开浏览器，访问 localhost：
 
 <a name="features"></a>
 ### 特点
@@ -82,11 +89,10 @@ LaraDock努力简化创建开发环境过程。
 - 可选择你最喜欢的数据库引擎，比如：MySQL, Postgres, MariaDB...
 - 可运行自己的软件组合，比如：Memcached, HHVM, Beanstalkd...
 - 所有软件运行在不同的容器之中，比如：PHP-FPM, NGINX, PHP-CLI...
-- 通过简单的编写`dockerfile`容易定制任何容器。
+- 通过简单的编写 `Dockerfile` 容易定制任何容器。
 - 所有镜像继承自一个官方基础镜像（Trusted base Images）
 - 可预配置Laravel的Nginx环境
-- 容易应用容器中的配置
-- 干净的结构化的Docker配置文件（`dockerfile`）
+- 容易应用容器中的配置 配置文件（`Dockerfile`）
 - 最新的 Docker Compose 版本（`docker-compose`）
 - 所有的都是可视化和可编辑的
 - 快速的镜像构建
@@ -115,6 +121,7 @@ LaraDock努力简化创建开发环境过程。
 	- Beanstalkd (+ Beanstalkd Console)
 - **工具:**
 	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
+
 >如果你找不到你需要的软件，构建它然后把它添加到这个列表。你的贡献是受欢迎的。
 
 <a name="what-is-docker"></a>
@@ -127,7 +134,6 @@ LaraDock努力简化创建开发环境过程。
 
 额，这很认真的!!!
 
-
 <a name="why-docker-not-vagrant"></a>
 ### 为什么使用 Docker 而不是 Vagrant!?
 
@@ -139,26 +145,22 @@ LaraDock努力简化创建开发环境过程。
 最重要的是 Docker 可以运行在开发和生产(相同环境无处不在)。Vagrant 是专为开发,(所以在生产环境你必须每一次重建您的服务器)。
 
 <a name="laradock-vs-homestead"></a>
-### LaraDock Homestead 对比
+### Laradock Homestead 对比
 
-LaraDock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。
+Laradock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。
 
 Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令)。Vagrant 可以管理你的管理虚容器。
 
-运行一个虚拟容器比运行一整个虚拟机快多了**LaraDock 比 Homestead快多了**
-
-
+运行一个虚拟容器比运行一整个虚拟机快多了 **Laradock 比 Homestead 快多了**
 
 <a name="Demo"></a>
 ## 演示视频
 还有什么比**演示视频**好：
 
-- LaraDock v4.0 (即将到来的...)
-- LaraDock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
-- LaraDock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
-- LaraDock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
-
-
+- Laradock [v4.0](https://www.youtube.com/watch?v=TQii1jDa96Y)
+- Laradock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
+- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
+- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
 
 <a name="Requirements"></a>
 ## 依赖
@@ -166,46 +168,36 @@ Homestead 是一个工具,为你控制虚拟机(使用Homestead特殊命令)。V
 - [Git](https://git-scm.com/downloads)       
 - [Docker](https://www.docker.com/products/docker/)
 
-
-
 <a name="Installation"></a>
 ## 安装
 
-
-1 - 克隆 `LaraDock` 仓库:
+1 - 克隆 `Laradock` 仓库:
 
 **A)** 如果你已经有一个 Laravel 项目,克隆这个仓库在到 `Laravel` 根目录
 
 ```bash
-git submodule add https://github.com/LaraDock/laradock.git
+git submodule add https://github.com/laradock/laradock.git
 ```
->如果你不是使用Git管理Laravel项目,您可以使用 `git clone` 而不是`git submodule`。
 
+>如果你不是使用 Git 管理 Laravel 项目,您可以使用 `git clone` 而不是 `git submodule`。
 
 **B)** 如果你没有一个 Laravel 项目,你想 Docker 安装 Laravel,克隆这个源在您的机器任何地方上:
 
 ```bash
-git clone https://github.com/LaraDock/laradock.git
+git clone https://github.com/laradock/laradock.git
 ```
 
-
-
 <a name="Usage"></a>
 ## 使用
 
-
 **请在开始之前阅读:**
 如果你正在使用 **Docker Toolbox** (VM)，选择以下任何一个方法：
 - 更新到 Docker [Native](https://www.docker.com/products/docker) Mac/Windows 版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
-- 使用 LaraDock v3.* (访问 `LaraDock-ToolBox` [分支](https://github.com/LaraDock/laradock/tree/LaraDock-ToolBox)).
-如果您使用的是**Docker Native**(Mac / Windows版本)甚至是Linux版本,通常可以继续阅读这个文档，LaraDock v4以上版本将仅支持**Docker Native**。
+- 使用 Laradock v3.* (访问 `Laradock-ToolBox` [分支](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
+如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档，Laradock v4 以上版本将仅支持 **Docker Native**。
 
-<br>
-<br>
 1 - 运行容器: *(在运行 `docker-compose` 命令之前，确认你在 `laradock` 目录中*
 
-
-
 **例子:** 运行 NGINX 和 MySQL:
 
 ```bash
@@ -213,26 +205,18 @@ docker-compose up -d  nginx mysql
 ```
 你可以从以下列表选择你自己的容器组合：
 
-
 `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
 
-
 **说明**: `workspace` 和 `php-fpm` 将运行在大部分实例中, 所以不需要在 `up` 命令中加上它们.
 
-
-
-<br>
 2 - 进入 Workspace 容器, 执行像 (Artisan, Composer, PHPUnit, Gulp, ...)等命令
 
 ```bash
 docker-compose exec workspace bash
 ```
-<br />
+
 增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件. (你可以从 `docker-compose.yml`修改 PUID (User id) 和 PGID (group id) 值 ).
 
-
-
-<br>
 3 - 编辑 Laravel 的配置.
 
 如果你还没有安装 Laravel 项目，请查看 [How to Install Laravel in a Docker Container](#Install-Laravel).
@@ -243,47 +227,28 @@ docker-compose exec workspace bash
 DB_HOST=mysql
 ```
 
-
-
-
-
-<br>
 4 - 打开浏览器访问 localhost (`http://localhost/`).
 
-
-
-<br>
 **调试**: 如果你碰到任何问题，请查看 [调试](#debugging) 章节
 如果你需要特别支持，请联系我，更多细节在[帮助 & 问题](#Help)章节
 
-
-<br>
 <a name="Documentation"></a>
 ## 文档
 
-
 <a name="Docker"></a>
 ### [Docker]
 
-
-
 <a name="List-current-running-Containers"></a>
 ### 列出正在运行的容器
 ```bash
 docker ps
 ```
+
 你也可以使用以下命令查看某项目的容器
-
-
 ```bash
 docker-compose ps
 ```
 
-
-
-
-
-<br>
 <a name="Close-all-running-Containers"></a>
 ### 关闭所有容器
 ```bash
@@ -296,21 +261,14 @@ docker-compose stop
 docker-compose stop {容器名称}
 ```
 
-<br>
 <a name="Delete-all-existing-Containers"></a>
 ### 删除所有容器
 ```bash
 docker-compose down
 ```
 
-
 小心这个命令,因为它也会删除你的数据容器。(如果你想保留你的数据你应该在上述命令后列出容器名称删除每个容器本身):*
 
-
-
-
-
-<br>
 <a name="Enter-Container"></a>
 ### 进入容器 (通过 SSH 进入一个运行中的容器)
 
@@ -331,12 +289,6 @@ docker-compose exec mysql bash
 3 - 退出容器, 键入 `exit`.
 
 
-
-
-
-
-
-<br>
 <a name="Edit-Container"></a>
 ### 编辑默认容器配置
 打开 `docker-compose.yml` 然后 按照你想的修改.
@@ -357,18 +309,10 @@ docker-compose exec mysql bash
     - "1111:6379"
 ```
 
-
-
-
-
-
-
-
-<br>
 <a name="Edit-a-Docker-Image"></a>
 ### 编辑 Docker 镜像
 
-1 - 找到你想修改的镜像的 `dockerfile` ,
+1 - 找到你想修改的镜像的 `Dockerfile` ,
 <br>
 例如： `mysql` 在 `mysql/Dockerfile`.
 
@@ -379,28 +323,19 @@ docker-compose exec mysql bash
 ```bash
 docker-compose build mysql
 ```
+
 更多信息在容器重建中[点击这里](#Build-Re-build-Containers).
 
-
-
-
-
-
-
-
-<br>
 <a name="Build-Re-build-Containers"></a>
 ### 建立/重建容器
 
-
-如果你做任何改变`dockerfile`确保你运行这个命令,可以让所有修改更改生效:
-
+如果你做任何改变 `Dockerfile` 确保你运行这个命令,可以让所有修改更改生效:
 
 ```bash
 docker-compose build
 ```
-选择你可以指定哪个容器重建(而不是重建所有的容器):
 
+选择你可以指定哪个容器重建(而不是重建所有的容器):
 
 ```bash
 docker-compose build {container-name}
@@ -408,25 +343,11 @@ docker-compose build {container-name}
 
 如果你想重建整个容器，你可能需要使用 `--no-cache` 选项  (`docker-compose build --no-cache {container-name}`).
 
-
-
-
-
-<br>
 <a name="Add-Docker-Images"></a>
 ### 增加更多软件 (Docker 镜像)
 
 为了增加镜像（软件）, 编辑 `docker-compose.yml` 添加容器细节， 你需要熟悉 [docker compose 文件语法](https://docs.docker.com/compose/compose-file/).
 
-
-
-
-
-
-
-
-
-<br>
 <a name="View-the-Log-files"></a>
 ### 查看日志文件
 Nginx的日志在 `logs/nginx` 目录
@@ -437,19 +358,12 @@ Nginx的日志在 `logs/nginx` 目录
 docker logs {container-name}
 ```
 
-
-
-
-
-<br>
 <a name="Laravel"></a>
 ### [Laravel]
 
-
-
-
 <a name="Install-Laravel"></a>
 ### 从 Docker 镜像安装 Laravel
+
 1 - 首先你需要进入 Workspace 容器.
 
 2 - 安装 Laravel.
@@ -466,8 +380,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*"
 
 
 3 - 编辑 `docker-compose.yml` 映射新的应用目录:
-系统默认LaraDock假定Laravel应用在LaraDock的父级目录中
-By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
+系统默认 Laradock 假定 Laravel 应用在 laradock 的父级目录中
 
 更新 Laravel 应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
 
@@ -477,17 +390,18 @@ By default LaraDock assumes the Laravel application is living in the parent dire
         volumes:
             - ../my-cool-app/:/var/www
 ```
+
 4 - 进入目录下继续工作..
 
 ```bash
 cd my-cool-app
 ```
 
-5 - 回到LaraDock安装步骤,看看如何编辑`env`的文件。
+5 - 回到 Laradock 安装步骤,看看如何编辑 `.env` 的文件。
 
-<br>
 <a name="Run-Artisan-Commands"></a>
 ### 运行 Artisan 命令
+
 你可以从 Workspace 容器运行 artisan 命令和其他终端命令
 
 1 - 确认 Workspace 容器已经运行.
@@ -510,25 +424,22 @@ docker-compose exec workspace bash
 
 增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件.
 
-
 4 - 运行任何你想的 :)
 
 ```bash
 php artisan
 ```
 ```bash
-Composer update
+composer update
 ```
 ```bash
 phpunit
 ```
 
-<br>
 <a name="Use-Redis"></a>
 ### 使用 Redis
 1 - 首先务必用 `docker-compose up` 命令运行 (`redis`) 容器.
 
-
 ```bash
 docker-compose up -d redis
 ```
@@ -538,6 +449,7 @@ docker-compose up -d redis
 ```env
 REDIS_HOST=redis
 ```
+
 如果在你的 `.env` 文件没有找到 `REDIS_HOST` 变量。打开数据库配置文件 `config/database.php` 然后用 `redis` 替换默认 IP `127.0.0.1`，例如：
 
 
@@ -559,7 +471,7 @@ CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 ```
 
-4 - 最好务必通过Compose安装 `predis/predis` 包 `(~1.0)`:
+4 - 最好务必通过 Composer 安装 `predis/predis` 包 `(~1.0)`:
 
 ```bash
 composer require predis/predis:^1.0
@@ -568,27 +480,18 @@ composer require predis/predis:^1.0
 5 - 你可以用以下代码在 Laravel 中手动测试：
 
 ```php
-\Cache::store('redis')->put('LaraDock', 'Awesome', 10);
+\Cache::store('redis')->put('Laradock', 'Awesome', 10);
 ```
 
-
-
-
-
-<br>
 <a name="Use-Mongo"></a>
 ### 使用 Mongo
 
 1 - 首先在 Workspace 和 PHP-FPM 容器中安装 `mongo`:
-<br>
-a) 打开 `docker-compose.yml` 文件
-<br>
-b) 在Workspace容器中找到`INSTALL_MONGO`选项：
 
-<br>
+    a) 打开 `docker-compose.yml` 文件
+    b) 在 Workspace 容器中找到 `INSTALL_MONGO` 选项：
     c) 设置为 `true`
-<br>
-d) 在PHP-FPM容器中找到`INSTALL_MONGO` <br>
+    d) 在 PHP-FPM 容器中找到 `INSTALL_MONGO`
     e) 设置为 `true`
 
 相关配置项如下:
@@ -608,9 +511,11 @@ e) 设置为 `true`
     ...
 ```
 
-2 - 重建`Workspace、PHP-FPM`容器 `docker-compose build workspace php-fpm`
-
+2 - 重建 `Workspace、PHP-FPM` 容器
 
+```bash
+docker-compose build workspace php-fpm
+```
 
 3 - 使用 `docker-compose up` 命令运行 MongoDB 容器 (`mongo`)
 
@@ -618,7 +523,6 @@ e) 设置为 `true`
 docker-compose up -d mongo
 ```
 
-
 4 - 在 `config/database.php` 文件添加 MongoDB 的配置项:
 
 ```php
@@ -654,6 +558,7 @@ docker-compose up -d mongo
 ```bash
 composer require jenssegers/mongodb
 ```
+
 更多细节内容 [点击这儿](https://github.com/jenssegers/laravel-mongodb#installation).
 
 7 - 测试:
@@ -662,37 +567,24 @@ composer require jenssegers/mongodb
 - 进入 Workspace 容器.
 - 迁移数据库 `php artisan migrate`.
 
-
-
-
-
-
-<br>
 <a name="PHP"></a>
 ### [PHP]
 
-
-
-
-
-
 <a name="Install-PHP-Extensions"></a>
 ### 安装 PHP 拓展
+
 安装 PHP 扩展之前,你必须决定你是否需要 `FPM` 或 `CLI`,因为他们安装在不同的容器上,如果你需要两者,则必须编辑两个容器。
 
 PHP-FPM 拓展务必安装在 `php-fpm/Dockerfile-XX`. *(用你 PHP 版本号替换 XX)*.
-<br>
+
 PHP-CLI 拓展应该安装到 `workspace/Dockerfile`.
 
-
-<br>
 <a name="Change-the-PHP-FPM-Version"></a>
 ### 修改 PHP-FPM 版本
 默认运行 **PHP-FPM 7.0** 版本.
 
 >PHP-FPM 负责服务你的应用代码,如果你是计划运行您的应用程序在不同 PHP-FPM 版本上，则不需要更改 PHP-CLI 版本。
 
-
 #### A) 切换版本 PHP `7.0` 到 PHP `5.6`
 
 1 - 打开 `docker-compose.yml`。
@@ -720,9 +612,9 @@ docker-compose build php
 #### B) 切换版本 PHP `7.0` 或 `5.6` 到 PHP `5.5`
 我们已不在本地支持 PHP5.5，但是你按照以下步骤获取：
 
-1 - 克隆 `https://github.com/LaraDock/php-fpm`.
+1 - 克隆 `https://github.com/laradock/php-fpm`.
 
-3 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
+2 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
 
 3 - 编辑文件 `FROM php:5.6-fpm` 为 `FROM php:5.5-fpm`.
 
@@ -733,17 +625,6 @@ docker-compose build php
 6 - 将 `php-fpm` 指向你的 `Dockerfile-55` 文件.
 
 
-
-
-
-
-
-
-
-
-
-
-<br>
 <a name="Change-the-PHP-CLI-Version"></a>
 ### 修改 PHP-CLI 版本
 默认运行 **PHP-CLI 7.0** 版本
@@ -752,22 +633,15 @@ docker-compose build php
 PHP-CLI 安装在 Workspace 容器，改变 PHP-CLI 版本你需要编辑 `workspace/Dockerfile`.
 现在你必须手动修改 PHP-FPM 的 `Dockerfile` 或者创建一个新的。 (可以考虑贡献功能).
 
-
-
-
-<br>
 <a name="Install-xDebug"></a>
 ### 安装 xDebug
 
 1 - 首先在 Workspace 和 PHP-FPM 容器安装 `xDebug`:
-<br>
+
     a) 打开 `docker-compose.yml` 文件
-<br>
     b) 在 Workspace 容器中找到 `INSTALL_XDEBUG` 选项
-<br>
     c) 改为 `true`
-<br>
-d) 在PHP-FPM容器中找到 `INSTALL_XDEBUG ` 选项<br>
+    d) 在 PHP-FPM 容器中找到 `INSTALL_XDEBUG ` 选项
     e) 改为 `true`
 
 例如:
@@ -789,14 +663,9 @@ e) 改为 `true`
 
 2 - 重建容器 `docker-compose build workspace php-fpm`
 
-
-
-<br>
 <a name="Misc"></a>
 ### [Misc]
 
-
-<br>
 <a name="Use-custom-Domain"></a>
 ### 使用自定义域名 (替换 Docker 的 IP)
 
@@ -811,14 +680,10 @@ e) 改为 `true`
 
 你可以在 nginx 配置文件自定义服务器名称,如下:
 
-
 ```conf
 server_name laravel.dev;
 ```
 
-
-
-<br>
 <a name="Enable-Global-Composer-Build-Install"></a>
 ### 安装全局 Composer 命令
 
@@ -842,14 +707,11 @@ server_name laravel.dev;
 
 4 - 重建 Workspace 容器 `docker-compose build workspace`
 
-
-
-
-<br>
 <a name="Install-Prestissimo"></a>
 ### 安装 Prestissimo
 
 [Prestissimo](https://github.com/hirak/prestissimo) 是一个平行安装功能的 composer 插件。
+
 1 - 在安装期间，使全局 Composer Install 正在运行:
 
     点击这个 [启用全局 Composer 构建安装](#Enable-Global-Composer-Build-Install) 然后继续步骤1、2.
@@ -863,13 +725,11 @@ b - 添加 `"hirak/prestissimo": "^0.3"` 依赖
 c - 重建 Workspace 容器 `docker-compose build workspace`
 
 
-
-
-<br>
 <a name="Install-Node"></a>
 ### 安装 Node + NVM
 
 在 Workspace 容器安装 NVM 和 NodeJS
+
 1 - 打开 `docker-compose.yml` 文件
 
 2 - 在 Workspace 容器找到 `INSTALL_NODE` 选项设为 `true`
@@ -887,9 +747,6 @@ c - 重建Workspace容器 `docker-compose build workspace`
 
 3 - 重建容器 `docker-compose build workspace`
 
-
-
-<br>
 <a name="debugging"></a>
 ### Debugging
 
@@ -911,41 +768,35 @@ sudo chmod -R 777 storage bootstrap/cache
 
 确保你想运行的服务端口(80, 3306, etc.)不是已经被其他程序使用，例如 `apache`/`httpd` 服务或其他安装的开发工具
 
-
-<br>
 <a name="upgrading-laradock"></a>
-### LaraDock 升级
+### Laradock 升级
 
 
-从Docker Toolbox (VirtualBox)移动到Docker Native (for Mac/Windows)，需要从 LaraDock v3.* 升级到 v4.*:
+从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows)，需要从 Laradock v3.* 升级到 v4.*:
 
 1. 停止 Docker 虚拟机 `docker-machine stop {default}`
 2. 安装 Docker [Mac](https://docs.docker.com/docker-for-mac/) 或 [Windows](https://docs.docker.com/docker-for-windows/).
-3. 升级 LaraDock 到 `v4.*.*` (`git pull origin master`)
-4. 像之前一样使用LaraDock: `docker-compose up -d nginx mysql`.
+3. 升级 Laradock 到 `v4.*.*` (`git pull origin master`)
+4. 像之前一样使用 Laradock: `docker-compose up -d nginx mysql`.
 
 **说明:** 如果你面临任何上面的问题的最后一步:重建你所有的容器
-`docker-compose build --no-cache`
+```bash
+docker-compose build --no-cache
+```
 "警告：容器数据可能会丢失!"
 
 
-
-
-
-
-
-<br>
 ## 贡献
 这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个 bug 修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎，欢迎毫不不犹豫地贡献吧:)
 
-#### 阅读我们的 [贡献说明](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md)
+#### 阅读我们的 [贡献说明](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md)
 
 <a name="Help"></a>
 ## 帮助 & 问题
 
-从聊天室 [Gitter](https://gitter.im/LaraDock/laradock) 社区获取帮助和支持.
+从聊天室 [Gitter](https://gitter.im/Laradock/laradock) 社区获取帮助和支持.
 
-你也可以打开Github上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/LaraDock/laradock).
+你也可以打开 Github 上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/Laradock/laradock).
 
 Docker 或 Laravel 的特别帮助，你可以在 [Codementor.io](https://www.codementor.io/mahmoudz) 上直接和项目创始人在线沟通
 
@@ -957,8 +808,8 @@ Docker或Laravel的特别帮助，你可以在[Codementor.io](https://www.codeme
 
 **优秀的人:**
 
-- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
-- [Supporters](https://github.com/LaraDock/laradock/issues?utf8=%E2%9C%93&q=)
+- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
+- [Supporters](https://github.com/laradock/laradock/issues?utf8=%E2%9C%93&q=)
 
 
 ## 许可证

_guides/digital_ocean.md

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

_guides/phpstorm.md

@@ -1,302 +0,0 @@
-# PHPStorm Debugging Guide
-
-- [Intro](#Intro)
-- [Installation](#Installation)
-    - [Customize laradock/docker-compose.yml](#CustomizeDockerCompose) 
-        - [Clean House](#InstallCleanHouse) 
-        - [LaraDock Dial Tone](#InstallLaraDockDialTone) 
-        - [hosts](#AddToHosts) 
-        - [Firewall](#FireWall) 
-        - [Enable xDebug on php-fpm](#enablePhpXdebug)
-    - [PHPStorm Settings](#InstallPHPStorm)
-        - [Configs](#InstallPHPStormConfigs)
-- [Usage](#Usage)
-    - [Laravel](#UsageLaravel) 
-        - [Run ExampleTest](#UsagePHPStormRunExampleTest) 
-        - [Debug ExampleTest](#UsagePHPStormDebugExampleTest) 
-        - [Debug Web Site](#UsagePHPStormDebugSite) 
-- [SSH into workspace](#SSHintoWorkspace) 
-    - [KiTTY](#InstallKiTTY) 
-    
-<a name="Intro"></a>
-## Intro
-
-Wiring up [Laravel](https://laravel.com/), [LaraDock](https://github.com/LaraDock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`, 
-you should be able to adjust accordingly. This guide was written based on Docker for Windows Native.
-
-<a name="Installation"></a>
-## Installation
-
-- This guide assumes the following:
-    - you have already installed and are familiar with Laravel, LaraDock and PHPStorm. 
-    - you have installed Laravel as a parent of `laradock`. This guide assumes `/c/_dk/laravel`. 
-
-<a name="AddToHosts"></a>
-## hosts
-- Add `laravel` to your hosts file located on Windows 10 at `C:\Windows\System32\drivers\etc\hosts`. It should be set to the IP of your running container. Mine is: `10.0.75.2`
-On Windows you can find it by opening Windows `Hyper-V Manager`.
-    - ![Windows Hyper-V Manager](photos/PHPStorm/Settings/WindowsHyperVManager.png)
-        
-- [Hosts File Editor](https://github.com/scottlerch/HostsFileEditor) makes it easy to change your hosts file.
-    - Set `laravel` to your docker host IP. See [Example](photos/SimpleHostsEditor/AddHost_laravel.png).
-
-
-<a name="FireWall"></a>
-## Firewall
-Your PHPStorm will need to be able to receive a connection from PHP xdebug either your running workspace or php-fpm containers on port 9000. This means that your Windows Firewall should either enable connections from the Application PHPStorm OR the port. 
-
-- It is important to note that if the Application PHPStorm is NOT enabled in the firewall, you will not be able to recreate a rule to override that.
-- Also be aware that if you are installing/upgrade different versions of PHPStorm, you MAY have orphaned references to PHPStorm in your Firewall! You may decide to remove orphaned references however in either case, make sure that they are set to receive public TCP traffic.
-
-### Edit laradock/docker-compose.yml
-Set the following variables:
-```
-### Workspace Utilities Container ###########################
-
-    workspace:
-        build:
-            context: ./workspace
-            args:
-                - INSTALL_XDEBUG=true
-                - INSTALL_WORKSPACE_SSH=true
-                ...
-                
-                
-### PHP-FPM Container #######################################
-
-    php-fpm:
-        build:
-            context: ./php-fpm
-            args:
-                - INSTALL_XDEBUG=true
-                ...
-                
-```
-
-### Edit xdebug.ini files
-- `laradock/workspace/xdebug.ini`
-- `laradock/php-fpm/xdebug.ini`
-
-Set the following variables:
-```
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-xdebug.remote_connect_back=1
-xdebug.cli_color=1
-```
-
-
-<a name="InstallCleanHouse"></a>
-### Need to clean house first?
-Make sure you are starting with a clean state. For example, do you have other LaraDock containers and images?
-Here are a few things I use to clean things up.
-
-- Delete all containers using `grep laradock_` on the names, see: [Remove all containers based on docker image name](https://linuxconfig.org/remove-all-containners-based-on-docker-image-name). 
-`docker ps -a | awk '{ print $1,$2 }' | grep laradock_ | awk '{print $1}' | xargs -I {} docker rm {}`
-
-- Delete all images containing `laradock`.
-`docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}`
-**Note:** This will only delete images that were built with `LaraDock`, **NOT** `laradock/*` which are pulled down by `LaraDock` such as `laradock/workspace`, etc.
-**Note:** Some may fail with: 
-`Error response from daemon: conflict: unable to delete 3f38eaed93df (cannot be forced) - image has dependent child images`
-
-- I added this to my `.bashrc` to remove orphaned images.
-    ```
-    dclean() {
-        processes=`docker ps -q -f status=exited`
-        if [ -n "$processes" ]; thend
-          docker rm $processes
-        fi
-    
-        images=`docker images -q -f dangling=true`
-        if [ -n "$images" ]; then
-          docker rmi $images
-        fi
-    }
-    ```
-
-- If you frequently switch configurations for LaraDock, you may find that adding the following and added to your `.bashrc` or equivalent useful:
-```
-# remove laravel* containers
-# remove laravel_* images
-dcleanlaradockfunction()
-{
-	echo 'Removing ALL containers associated with laradock'
-	docker ps -a | awk '{ print $1,$2 }' | grep laradock | awk '{print $1}' | xargs -I {} docker rm {}
-
-	# remove ALL images associated with laradock_
-	# does NOT delete laradock/* which are hub images
-	echo 'Removing ALL images associated with laradock_'
-	docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}
-
-	echo 'Listing all laradock docker hub images...'
-	docker images | grep laradock
-
-	echo 'dcleanlaradock completed'
-}
-# associate the above function with an alias
-# so can recall/lookup by typing 'alias'
-alias dcleanlaradock=dcleanlaradockfunction
-```
-
-<a name="InstallLaraDockDialTone"></a>
-#### Let's get a dial-tone with Laravel
-
-```
-# barebones at this point
-docker-compose up -d nginx mysql
-
-# run 
-docker-compose ps
-
-# Should see:
-          Name                        Command             State                     Ports
------------------------------------------------------------------------------------------------------------
-laradock_mysql_1            docker-entrypoint.sh mysqld   Up       0.0.0.0:3306->3306/tcp
-laradock_nginx_1            nginx                         Up       0.0.0.0:443->443/tcp, 0.0.0.0:80->80/tcp
-laradock_php-fpm_1          php-fpm                       Up       9000/tcp
-laradock_volumes_data_1     true                          Exit 0
-laradock_volumes_source_1   true                          Exit 0
-laradock_workspace_1        /sbin/my_init                 Up       0.0.0.0:2222->22/tcp
-
-
-```
-
-<a name="enablePhpXdebug"></a>
-#### Enable xDebug on php-fpm
-In a host terminal sitting in the laradock folder, run: `./xdebugPhpFpm status`
-You should see something like the following:
-```
-xDebug status
-laradock_php-fpm_1
-PHP 7.0.9 (cli) (built: Aug 10 2016 19:45:48) ( NTS )
-Copyright (c) 1997-2016 The PHP Group
-Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
-    with Xdebug v2.4.1, Copyright (c) 2002-2016, by Derick Rethans
-```
-Other commands include `./xdebugPhpFpm start | stop`.
-
-If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will already be running when
-`php-fpm` is started and listening for debug info on port 9000.
-
-
-<a name="InstallPHPStormConfigs"></a>
-#### PHPStorm Settings
-- Here are some settings that are known to work:
-    - `Settings/BuildDeploymentConnection`
-        - ![Settings/BuildDeploymentConnection](photos/PHPStorm/Settings/BuildDeploymentConnection.png)
-    
-    - `Settings/BuildDeploymentConnectionMappings`
-        - ![Settings/BuildDeploymentConnectionMappings](photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png)
-    
-    - `Settings/BuildDeploymentDebugger`
-        - ![Settings/BuildDeploymentDebugger](photos/PHPStorm/Settings/BuildDeploymentDebugger.png)
-    
-    - `Settings/EditRunConfigurationRemoteWebDebug`
-        - ![Settings/EditRunConfigurationRemoteWebDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
-    
-    - `Settings/EditRunConfigurationRemoteExampleTestDebug`
-        - ![Settings/EditRunConfigurationRemoteExampleTestDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
-    
-    - `Settings/LangsPHPDebug`
-        - ![Settings/LangsPHPDebug](photos/PHPStorm/Settings/LangsPHPDebug.png)
-    
-    - `Settings/LangsPHPInterpreters`
-        - ![Settings/LangsPHPInterpreters](photos/PHPStorm/Settings/LangsPHPInterpreters.png)
-    
-    - `Settings/LangsPHPPHPUnit`
-        - ![Settings/LangsPHPPHPUnit](photos/PHPStorm/Settings/LangsPHPPHPUnit.png)
-    
-    - `Settings/LangsPHPServers`
-        - ![Settings/LangsPHPServers](photos/PHPStorm/Settings/LangsPHPServers.png)
-    
-    - `RemoteHost`
-        To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
-        - ![RemoteHost](photos/PHPStorm/RemoteHost.png)
-        
-    - `RemoteWebDebug`
-        - ![DebugRemoteOn](photos/PHPStorm/DebugRemoteOn.png)
-
-    - `EditRunConfigurationRemoteWebDebug`
-        Go to: `Menu/Run/Edit Configurations`.
-        - ![EditRunConfigurationRemoteWebDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png)
-
-    - `EditRunConfigurationRemoteExampleTestDebug`
-        Go to: `Menu/Run/Edit Configurations`.
-        - ![EditRunConfigurationRemoteExampleTestDebug](photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png)
-
-    - `WindowsFirewallAllowedApps`
-        Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
-        - ![WindowsFirewallAllowedApps.png](photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png)
-
-    - `hosts`
-        Edit: `C:\Windows\System32\drivers\etc\hosts`.
-        - ![WindowsFirewallAllowedApps.png](photos/PHPStorm/Settings/hosts.png)
-
-        - [Enable xDebug on php-fpm](#enablePhpXdebug)
-
-
-
-<a name="Usage"></a>
-## Usage
-
-<a name="UsagePHPStormRunExampleTest"></a>
-### Run ExampleTest
-- right-click on `tests/ExampleTest.php`
-    - Select: `Run 'ExampleTest.php'` or `Ctrl+Shift+F10`.
-    - Should pass!! You just ran a remote test via SSH!
-
-<a name="UsagePHPStormDebugExampleTest"></a>
-### Debug ExampleTest
-- Open to edit: `tests/ExampleTest.php`
-- Add a BreakPoint on line 16: `$this->visit('/')`
-- right-click on `tests/ExampleTest.php`
-    - Select: `Debug 'ExampleTest.php'`.
-    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
-    - ![Remote Test Debugging Success](photos/PHPStorm/RemoteTestDebuggingSuccess.png)
-
-
-<a name="UsagePHPStormDebugSite"></a>
-### Debug WebSite
-- In case xDebug is disabled, from the `laradock` folder run: 
-`./xdebugPhpFpm start`.
-    - To switch xdebug off, run: 
-`./xdebugPhpFpm stop`
-    
-- Start Remote Debugging
-    - ![DebugRemoteOn](photos/PHPStorm/DebugRemoteOn.png)
-    
-- Open to edit: `bootstrap/app.php`
-- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
-- Reload [Laravel Site](http://laravel/)
-    - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
-    - ![Remote Debugging Success](photos/PHPStorm/RemoteDebuggingSuccess.png)
-
-
-<a name="SSHintoWorkspace"></a>
-#### Let's shell into workspace
-Assuming that you are in laradock folder, type:
-`ssh -i workspace/insecure_id_rsa -p2222 root@laravel`
-**Cha Ching!!!!**
-- `workspace/insecure_id_rsa.ppk` may become corrupted. In which case:
-    - fire up `puttygen`
-    - import `workspace/insecure_id_rsa`
-    - save private key to `workspace/insecure_id_rsa.ppk`
-
-<a name="InstallKiTTY"></a>
-
-##### KiTTY
-[Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
-
-- Here are some settings that are working for me:
-    - ![Session](photos/KiTTY/Session.png)
-    - ![Terminal](photos/KiTTY/Terminal.png)
-    - ![Window](photos/KiTTY/Window.png)
-    - ![WindowAppearance](photos/KiTTY/WindowAppearance.png)
-    - ![Connection](photos/KiTTY/Connection.png)
-    - ![ConnectionData](photos/KiTTY/ConnectionData.png)
-    - ![ConnectionSSH](photos/KiTTY/ConnectionSSH.png)
-    - ![ConnectionSSHAuth](photos/KiTTY/ConnectionSSHAuth.png)
-    - ![TerminalShell](photos/KiTTY/TerminalShell.png)
-
-

adminer/Dockerfile

@@ -0,0 +1,12 @@
+FROM adminer:4.3.0
+
+# Version 4.3.1 contains PostgreSQL login errors. See docs.
+# See https://sourceforge.net/p/adminer/bugs-and-features/548/
+
+MAINTAINER Patrick Artounian <partounian@gmail.com>
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose Adminer on port 8080 (Adminer's default)
+EXPOSE 8080

apache2/Dockerfile

@@ -6,11 +6,13 @@ ARG PHP_SOCKET=php-fpm:9000
 
 ENV WEB_PHP_SOCKET=$PHP_SOCKET
 
-ENV WEB_DOCUMENT_ROOT=/var/www/public
+ENV WEB_DOCUMENT_ROOT=/var/www/
 
 EXPOSE 80 443
 
-WORKDIR /var/www/public
+WORKDIR /var/www/
+
+ADD vhost.conf /etc/apache2/sites-enabled/vhost.conf
 
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 

apache2/sites/.gitignore

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

apache2/sites/default.apache.conf

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

apache2/sites/sample.conf.example

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

apache2/vhost.conf

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

beanstalkd-console/Dockerfile

@@ -14,4 +14,4 @@ RUN apt-get remove --purge -y curl && \
 
 EXPOSE 2080
 
-CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source'

caddy/Caddyfile

@@ -1,9 +1,13 @@
 # Docs: https://caddyserver.com/docs/caddyfile
 0.0.0.0:80
-root /var/www/public
+root /var/www
 fastcgi / php-fpm:9000 php {
     index index.php
 }
+
+# To handle .html extensions with laravel change ext to
+# ext / .html
+
 rewrite {
     r .*
     ext /
@@ -16,3 +20,9 @@ errors /var/log/caddy/error.log
 # Uncomment to enable TLS (HTTPS)
 # Change the first list to listen on port 443 when enabling TLS
 #tls self_signed
+
+# To use Lets encrpt tls with a DNS provider uncomment these
+# lines and change the provider as required
+#tls {
+#  dns cloudflare
+#}

caddy/Dockerfile

@@ -2,23 +2,23 @@ FROM alpine:3.4
 
 MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
 
-ENV caddy_version=0.9.3
+ENV caddy_version=0.10.0
 
 LABEL caddy_version="$caddy_version" architecture="amd64"
 
 RUN apk update \
     && apk upgrade \
-    && apk add tar curl
+    && apk add tar curl git
 
 RUN curl --silent --show-error --fail --location \
         --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-        "https://github.com/mholt/caddy/releases/download/v$caddy_version/caddy_linux_amd64.tar.gz" \
-        | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
-    && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
+        "https://caddyserver.com/download/linux/amd64?plugins=http.cgi,http.cors,http.expires,http.filemanager,http.git,http.ipfilter,http.realip,tls.dns.cloudflare,tls.dns.digitalocean,tls.dns.dnspod,tls.dns.dyn,tls.dns.googlecloud,tls.dns.linode,tls.dns.namecheap,tls.dns.ovh,tls.dns.route53,tls.dns.vultr" \
+        | tar --no-same-owner -C /usr/bin/ -xz caddy \
+    && mv /usr/bin/caddy /usr/bin/caddy \
     && chmod 0755 /usr/bin/caddy
 
 EXPOSE 80 443 2015
 
-WORKDIR /var/www/public
+WORKDIR /var/www
 
 CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]

certbot/Dockerfile

@@ -0,0 +1,10 @@
+FROM phusion/baseimage:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+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

@@ -7,8 +7,7 @@ services:
     applications:
       image: tianon/true
       volumes:
-            - ../:/var/www
-#            - ../sample/:/var/www/sample
+        - ${APPLICATION}:/var/www
 
 ### Workspace Utilities Container ###########################
 
@@ -16,30 +15,39 @@ services:
       build:
         context: ./workspace
         args:
-                - INSTALL_XDEBUG=false
-                - INSTALL_MONGO=false
-                - INSTALL_NODE=false
-                - INSTALL_YARN=false
-                - INSTALL_DRUSH=false
-                - INSTALL_AEROSPIKE_EXTENSION=false
-                - INSTALL_V8JS_EXTENSION=false
-                - COMPOSER_GLOBAL_INSTALL=false
-                - INSTALL_WORKSPACE_SSH=false
-                - INSTALL_LARAVEL_ENVOY=false
-                - INSTALL_LINUXBREW=false
-                - PUID=1000
-                - PGID=1000
-                - NODE_VERSION=stable
-                - YARN_VERSION=latest
-                - TZ=UTC
+          - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
+          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
+          - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
+          - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
+          - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
+          - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
+          - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
+          - INSTALL_AEROSPIKE_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION}
+          - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_V8JS_EXTENSION}
+          - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
+          - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
+          - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+          - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER}
+          - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW}
+          - INSTALL_MC=${WORKSPACE_INSTALL_MC}
+          - PUID=${WORKSPACE_PUID}
+          - PGID=${WORKSPACE_PGID}
+          - NODE_VERSION=${WORKSPACE_NODE_VERSION}
+          - YARN_VERSION=${WORKSPACE_YARN_VERSION}
+          - TZ=${WORKSPACE_TIMEZONE}
+          - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
+          - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
       extra_hosts:
-            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
-            - "dockerhost:10.0.75.1"
+        - "dockerhost:${DOCKER_HOST_IP}"
       ports:
-           - "2222:22"
+        - "${WORKSPACE_SSH_PORT}:22"
       tty: true
+      networks:
+        - frontend
+        - backend
 
 ### PHP-FPM Container #######################################
 
@@ -47,28 +55,48 @@ services:
       build:
         context: ./php-fpm
         args:
-                - INSTALL_XDEBUG=false
-                - INSTALL_SOAP=false
-                - INSTALL_MONGO=false
-                - INSTALL_ZIP_ARCHIVE=false
-                - INSTALL_BCMATH=false
-                - INSTALL_MEMCACHED=false
-                - INSTALL_OPCACHE=false
-                - INSTALL_AEROSPIKE_EXTENSION=false
-                - CODEIGNITER=false
-            dockerfile: Dockerfile-70
+          - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
+          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
+          - INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
+          - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
+          - INSTALL_ZIP_ARCHIVE=${PHP_FPM_INSTALL_ZIP_ARCHIVE}
+          - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
+          - INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
+          - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
+          - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
+          - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
+          - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
+          - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
+          - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
+          - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
+          - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
+      volumes:
+        - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
       expose:
         - "9000"
-        links:
+      depends_on:
         - workspace
       extra_hosts:
-            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
-            - "dockerhost:10.0.75.1"
+        - "dockerhost:${DOCKER_HOST_IP}"
       environment:
-            # IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
-            - PHP_IDE_CONFIG=serverName=laravel
+        - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
+      networks:
+        - backend
+
+### PHP Worker Container #####################################
+
+    php-worker:
+      build:
+        context: ./php-worker
+      volumes_from:
+        - applications
+      depends_on:
+        - workspace
+      networks:
+        - backend
 
 ### Nginx Server Container ##################################
 
@@ -80,13 +108,28 @@ services:
       volumes_from:
         - applications
       volumes:
-            - ./logs/nginx/:/var/log/nginx
-            - ./nginx/sites/:/etc/nginx/sites-available
+        - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
+        - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
       ports:
-            - "80:80"
-            - "443:443"
-        links:
+        - "${NGINX_HOST_HTTP_PORT}:80"
+        - "${NGINX_HOST_HTTPS_PORT}:443"
+      depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
+
+### Blackfire Container #################################
+
+    blackfire:
+      image: blackfire/blackfire
+      environment:
+        - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
+        - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
+      depends_on:
+        - php-fpm
+      networks:
+        - backend
 
 ### Apache Server Container #################################
 
@@ -94,16 +137,20 @@ services:
       build:
         context: ./apache2
         args:
-                - PHP_SOCKET=php-fpm:9000
+          - PHP_SOCKET=${PHP_SOCKET}
       volumes_from:
         - applications
       volumes:
-            - ./logs/apache2:/var/log/apache2
+        - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
+        - ./apache2/sites:/etc/apache2/sites-available
       ports:
-            - "80:80"
-            - "443:443"
-        links:
+        - "${APACHE_HOST_HTTP_PORT}:80"
+        - "${APACHE_HOST_HTTPS_PORT}:443"
+      depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### HHVM Container ##########################################
 
@@ -113,63 +160,121 @@ services:
         - applications
       expose:
         - "9000"
-        links:
+      depends_on:
         - workspace
+      networks:
+        - frontend
+        - backend
+
+### Minio Container #########################################
+
+    minio:
+      build: ./minio
+      volumes:
+        - minio:/export
+      ports:
+        - "${MINIO_PORT}:9000"
+      environment:
+        - MINIO_ACCESS_KEY=access
+        - MINIO_SECRET_KEY=secretkey
+      networks:
+        - frontend
 
 ### MySQL Container #########################################
 
     mysql:
       build:
         context: ./mysql
-            args:
-                - MYSQL_DATABASE=homestead
-                - MYSQL_USER=homestead
-                - MYSQL_PASSWORD=secret
-                - MYSQL_ROOT_PASSWORD=root
+      environment:
+        - MYSQL_DATABASE=${MYSQL_DATABASE}
+        - MYSQL_USER=${MYSQL_USER}
+        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       volumes:
-            - mysql:/var/lib/mysql
+        - ${DATA_SAVE_PATH}/mysql:/var/lib/mysql
       ports:
-            - "3306:3306"
+        - "${MYSQL_PORT}:3306"
+      networks:
+        - backend
+
+### Percona Container #########################################
+
+    percona:
+      build:
+        context: ./percona
+      environment:
+        - MYSQL_DATABASE=${PERCONA_DATABASE}
+        - MYSQL_USER=${PERCONA_USER}
+        - MYSQL_PASSWORD=${PERCONA_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${PERCONA_ROOT_PASSWORD}
+      volumes:
+        - percona:/var/lib/mysql
+      ports:
+        - "${PERCONA_PORT}:3306"
+      networks:
+        - backend
+
+### MSSQL Container #########################################
+
+    mssql:
+      build:
+        context: ./mssql
+      environment:
+        - MSSQL_DATABASE=${MSSQL_DATABASE}
+        - SA_PASSWORD=${MSSQL_PASSWORD}
+        - ACCEPT_EULA=Y
+      volumes:
+        - ${DATA_SAVE_PATH}/mssql:/var/opt/mssql
+      ports:
+        - "${MSSQL_PORT}:1433"
+      networks:
+        - backend
 
 ### MariaDB Container #######################################
 
     mariadb:
       build: ./mariadb
       volumes:
-            - mariadb:/var/lib/mysql
+        - ${DATA_SAVE_PATH}/mariadb:/var/lib/mysql
       ports:
-            - "3306:3306"
+        - "${MARIADB_PORT}:3306"
       environment:
-            MYSQL_DATABASE: homestead
-            MYSQL_USER: homestead
-            MYSQL_PASSWORD: secret
-            MYSQL_ROOT_PASSWORD: root
+        - MYSQL_DATABASE=${MARIADB_DATABASE}
+        - MYSQL_USER=${MARIADB_USER}
+        - MYSQL_PASSWORD=${MARIADB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
+      networks:
+        - backend
 
 ### PostgreSQL Container ####################################
 
     postgres:
       build: ./postgres
       volumes:
-            - postgres:/var/lib/postgresql/data
+        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
       ports:
-            - "5432:5432"
+        - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: homestead
-            POSTGRES_USER: homestead
-            POSTGRES_PASSWORD: secret
+        - POSTGRES_DB=${POSTGRES_DB}
+        - POSTGRES_USER=${POSTGRES_USER}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      networks:
+        - backend
 
 ### PostgreSQL PostGis Container ############################
 
     postgres-postgis:
       build: ./postgres-postgis
       volumes:
-            - postgres:/var/lib/postgresql/data
+        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
       ports:
-            - "5432:5432"
+        - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: homestead
-            POSTGRES_USER: homestead
-            POSTGRES_PASSWORD: secret
+        - POSTGRES_DB=${POSTGRES_DB}
+        - POSTGRES_USER=${POSTGRES_USER}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      networks:
+        - backend
 
 ### Neo4j Container #########################################
 
@@ -179,9 +284,11 @@ services:
         - "7474:7474"
         - "1337:1337"
       environment:
-            - NEO4J_AUTH=homestead:secret
+        - NEO4J_AUTH=default:secret
       volumes:
-            - neo4j:/var/lib/neo4j/data
+        - ${DATA_SAVE_PATH}/neo4j:/var/lib/neo4j/data
+      networks:
+        - backend
 
 ### MongoDB Container #######################################
 
@@ -190,7 +297,9 @@ services:
       ports:
         - "27017:27017"
       volumes:
-            - mongo:/data/db
+        - ${DATA_SAVE_PATH}/mongo:/data/db
+      networks:
+        - backend
 
 ### RethinkDB Container #######################################
 
@@ -199,16 +308,20 @@ services:
       ports:
         - "8090:8080"
       volumes:
-            - rethinkdb:/data/rethinkdb_data
+        - ${DATA_SAVE_PATH}/rethinkdb:/data/rethinkdb_data
+      networks:
+        - backend
 
 ### Redis Container #########################################
 
     redis:
       build: ./redis
       volumes:
-            - redis:/data
+        - ${DATA_SAVE_PATH}/redis:/data
       ports:
         - "6379:6379"
+      networks:
+        - backend
 
 ### Aerospike c Container ###################################
 
@@ -217,49 +330,56 @@ services:
       volumes_from:
         - workspace
       volumes:
-            - aerospike:/opt/aerospike/data
+        - ${DATA_SAVE_PATH}/aerospike:/opt/aerospike/data
       ports:
         - "3000:3000"
         - "3001:3001"
         - "3002:3002"
         - "3003:3003"
-
+      networks:
+        - backend
 
 ### Memcached Container #####################################
 
     memcached:
       build: ./memcached
       volumes:
-            - memcached:/var/lib/memcached
+        - ${DATA_SAVE_PATH}/memcached:/var/lib/memcached
       ports:
-            - "11211:11211"
-        links:
+        - "${MEMCACHED_HOST_PORT}:11211"
+      depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### Beanstalkd Container ####################################
 
     beanstalkd:
       build: ./beanstalkd
       ports:
-            - "11300:11300"
+        - "${BEANSTALKD_HOST_PORT}:11300"
       privileged: true
-        links:
+      depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### RabbitMQ Container ######################################
 
     rabbitmq:
       build: ./rabbitmq
       ports:
-            - "5672:5672"
-            - "15671:15671"
-            - "8080:15672"
+        - "${RABBITMQ_NODE_HOST_PORT}:5672"
+        - "${RABBITMQ_MANAGEMENT_HTTP_HOST_PORT}:15672"
+        - "${RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT}:15671"
       privileged: true
       environment:
-            RABBITMQ_DEFAULT_USER: guest
-            RABBITMQ_DEFAULT_PASS: guest
-        links:
+        - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
+        - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
+      depends_on:
         - php-fpm
+      networks:
+        - backend
 
 ### Beanstalkd Console Container ############################
 
@@ -267,8 +387,10 @@ services:
       build: ./beanstalkd-console
       ports:
         - "2080:2080"
-        links:
+      depends_on:
         - beanstalkd
+      networks:
+        - backend
 
 ### Caddy Server Container ##################################
 
@@ -283,25 +405,41 @@ services:
       volumes:
         - ./caddy/Caddyfile:/etc/Caddyfile
         - ./logs/caddy:/var/log/caddy
-        links:
+        - caddy:/root/.caddy
+      depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### phpMyAdmin Container ####################################
 
     phpmyadmin:
       build: ./phpmyadmin
       environment:
-            PMA_ARBITRARY: 1
-            MYSQL_USER: homestead
-            MYSQL_PASSWORD: secret
-            MYSQL_ROOT_PASSWORD: root
+        - PMA_ARBITRARY=1
+        - MYSQL_USER=${PMA_USER}
+        - MYSQL_PASSWORD=${PMA_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${PMA_ROOT_PASSWORD}
       ports:
-            - "8080:80"
-        links:
-            # for mysql container
-            - "mysql:db"
-            # for mariadb container
-            # - "mariadb:db"
+        - "${PMA_PORT}:80"
+      depends_on:
+        - "${PMA_DB_ENGINE}"
+      networks:
+        - frontend
+        - backend
+
+### Adminer Container ####################################
+
+    adminer:
+      build: ./adminer
+      ports:
+        - "${ADM_PORT}:8080"
+      depends_on:
+        - php-fpm
+      networks:
+        - frontend
+        - backend
 
 ### pgAdmin Container #######################################
 
@@ -309,8 +447,11 @@ services:
       build: ./pgadmin
       ports:
         - "5050:5050"
-        links:
+      depends_on:
         - postgres
+      networks:
+        - frontend
+        - backend
 
 ### ElasticSearch Container #################################
 
@@ -318,25 +459,131 @@ 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:
+        - "${ELASTICSEARCH_HOST_HTTP_PORT}:9200"
+        - "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"
+      depends_on:
         - php-fpm
+      networks:
+        - frontend
+        - backend
 
-### Selenium Container #########################################
+### 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"
+      networks:
+        - frontend
+
+### Mailhog Container #########################################
+
+    mailhog:
+      build: ./mailhog
+      ports:
+        - "1025:1025"
+        - "8025:8025"
+      networks:
+        - frontend
+
+### Selenium Container ########################################
 
     selenium:
       build: ./selenium
       ports:
-            - "4444:4444"
+        - "${SELENIUM_PORT}:4444"
+      volumes:
+        - /dev/shm:/dev/shm
+      networks:
+        - frontend
 
-### Volumes Setup ###########################################
+### Varnish Proxy 1 ##########################################
+
+    proxy:
+      build: ./varnish
+      expose:
+        - ${VARNISH_PORT}
+      environment:
+        - VARNISH_CONFIG=${VARNISH_CONFIG}
+        - CACHE_SIZE=${VARNISH_PROXY1_CACHE_SIZE}
+        - VARNISHD_PARAMS=${VARNISHD_PARAMS}
+        - VARNISH_PORT=${VARNISH_PORT}
+        - BACKEND_HOST=${VARNISH_PROXY1_BACKEND_HOST}
+        - BACKEND_PORT=${VARNISH_BACKEND_PORT}
+        - VARNISH_SERVER=${VARNISH_PROXY1_SERVER}
+      links:
+        - workspace
+      networks:
+        - frontend
+
+### Varnish Proxy 2 ##########################################
+
+    proxy2:
+      build: ./varnish
+      expose:
+        - ${VARNISH_PORT}
+      environment:
+        - VARNISH_CONFIG=${VARNISH_CONFIG}
+        - CACHE_SIZE=${VARNISH_PROXY2_CACHE_SIZE}
+        - VARNISHD_PARAMS=${VARNISHD_PARAMS}
+        - VARNISH_PORT=${VARNISH_PORT}
+        - BACKEND_HOST=${VARNISH_PROXY2_BACKEND_HOST}
+        - BACKEND_PORT=${VARNISH_BACKEND_PORT}
+        - VARNISH_SERVER=${VARNISH_PROXY2_SERVER}
+      links:
+        - workspace
+      networks:
+        - frontend
+
+### Balancer Haproxy ##########################################
+
+    balancer:
+      build: ./haproxy
+      ports:
+        - "${HAPROXY_HOST_HTTP_PORT}:8085"
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+      links:
+        - proxy
+        - proxy2
+
+### Jenkins ###################################################
+    jenkins:
+      build: ./jenkins
+      environment:
+        JAVA_OPTS: "-Djava.awt.headless=true"
+      ports:
+        - "${JENKINS_HOST_SLAVE_AGENT_PORT}:50000"
+        - "${JENKINS_HOST_HTTP_PORT}:8080"
+      privileged: true
+      volumes:
+        - ${JENKINS_HOME}:/var/jenkins_home
+        - /var/run/docker.sock:/var/run/docker.sock
+
+### Networks Setup ############################################
+
+networks:
+  frontend:
+    driver: "bridge"
+  backend:
+    driver: "bridge"
+
+### Volumes Setup #############################################
 
 volumes:
   mysql:
     driver: "local"
+  percona:
+    driver: "local"
+  mssql:
+    driver: "local"
   postgres:
     driver: "local"
   memcached:
@@ -349,10 +596,14 @@ volumes:
     driver: "local"
   mongo:
     driver: "local"
+  minio:
+    driver: "local"
   rethinkdb:
     driver: "local"
   phpmyadmin:
     driver: "local"
+  adminer:
+    driver: "local"
   aerospike:
     driver: "local"
   caddy:
@@ -361,5 +612,3 @@ volumes:
     driver: "local"
   elasticsearch-plugins:
     driver: "local"
-    sessions:    ## nothing is connected to this (- ./data/sessions:/sessions)
-        driver: "local"

env-example

@@ -0,0 +1,242 @@
+############################
+# General Setup
+############################
+
+### Application Path
+# Point to your application code, will be available at `/var/www`.
+
+APPLICATION=../public/
+
+### Data Path:
+# For all storage systems.
+
+DATA_SAVE_PATH=/tmp
+
+### PHP version
+# Applies to the Workspace and PHP-FPM containers (Does not apply to HHVM)
+# Accepted values: 71 - 70 - 56
+
+PHP_VERSION=71
+
+### PHP interpreter
+# Accepted values: hhvm - php-fpm
+
+PHP_INTERPRETER=php-fpm
+
+############################
+# Containers Customization
+############################
+
+### WORKSPACE ##########################################################################################################
+
+WORKSPACE_INSTALL_XDEBUG=false
+WORKSPACE_INSTALL_SOAP=false
+WORKSPACE_INSTALL_MONGO=false
+WORKSPACE_INSTALL_NODE=false
+WORKSPACE_INSTALL_YARN=false
+WORKSPACE_INSTALL_DRUSH=false
+WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false
+WORKSPACE_INSTALL_V8JS_EXTENSION=false
+WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
+WORKSPACE_INSTALL_WORKSPACE_SSH=false
+WORKSPACE_INSTALL_LARAVEL_ENVOY=false
+WORKSPACE_INSTALL_DEPLOYER=false
+WORKSPACE_INSTALL_LINUXBREW=false
+WORKSPACE_INSTALL_MC=false
+WORKSPACE_PUID=1000
+WORKSPACE_PGID=1000
+WORKSPACE_NODE_VERSION=stable
+WORKSPACE_YARN_VERSION=latest
+WORKSPACE_TIMEZONE=UTC
+WORKSPACE_SSH_PORT=2222
+
+### PHP_FPM ############################################################################################################
+
+PHP_FPM_INSTALL_XDEBUG=false
+PHP_FPM_INSTALL_MONGO=false
+PHP_FPM_INSTALL_SOAP=false
+PHP_FPM_INSTALL_ZIP_ARCHIVE=false
+PHP_FPM_INSTALL_BCMATH=false
+PHP_FPM_INSTALL_PHPREDIS=false
+PHP_FPM_INSTALL_MEMCACHED=false
+PHP_FPM_INSTALL_OPCACHE=false
+PHP_FPM_INSTALL_EXIF=false
+PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
+PHP_FPM_INSTALL_MYSQLI=false
+PHP_FPM_INSTALL_TOKENIZER=false
+PHP_FPM_INSTALL_INTL=false
+PHP_FPM_INSTALL_GHOSTSCRIPT=false
+
+### NGINX ##############################################################################################################
+
+NGINX_HOST_HTTP_PORT=80
+NGINX_HOST_HTTPS_PORT=443
+NGINX_HOST_LOG_PATH=./logs/nginx/
+NGINX_SITES_PATH=./nginx/sites/
+
+### APACHE #############################################################################################################
+
+APACHE_HOST_HTTP_PORT=80
+APACHE_HOST_HTTPS_PORT=443
+APACHE2_PHP_SOCKET=php-fpm:9000
+APACHE_HOST_LOG_PATH=./logs/apache2
+PHP_SOCKET=php-fpm:9000
+
+### MYSQL ##############################################################################################################
+
+MYSQL_DATABASE=default
+MYSQL_USER=default
+MYSQL_PASSWORD=secret
+MYSQL_PORT=3306
+MYSQL_ROOT_PASSWORD=root
+
+### Percona ############################################################################################################
+
+PERCONA_DATABASE=homestead
+PERCONA_USER=homestead
+PERCONA_PASSWORD=secret
+PERCONA_PORT=3306
+PERCONA_ROOT_PASSWORD=root
+
+### MSSQL ##############################################################################################################
+
+MSSQL_DATABASE=homestead
+MSSQL_PASSWORD=yourStrong(!)Password
+MSSQL_PORT=1433
+
+### MARIADB ############################################################################################################
+
+MARIADB_DATABASE=default
+MARIADB_USER=default
+MARIADB_PASSWORD=secret
+MARIADB_PORT=3306
+MARIADB_ROOT_PASSWORD=root
+
+### POSTGRES ###########################################################################################################
+
+POSTGRES_DB=default
+POSTGRES_USER=default
+POSTGRES_PASSWORD=secret
+POSTGRES_PORT=5432
+
+### RABBITMQ ###########################################################################################################
+
+RABBITMQ_NODE_HOST_PORT=5672
+RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
+RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
+RABBITMQ_DEFAULT_USER=guest
+RABBITMQ_DEFAULT_PASS=guest
+
+### ELASTICSEARCH ######################################################################################################
+
+ELASTICSEARCH_HOST_HTTP_PORT=9200
+ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
+
+### MEMCACHED ##########################################################################################################
+
+MEMCACHED_HOST_PORT=11211
+
+### BEANSTALKD CONSOLE #################################################################################################
+
+BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console
+BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console
+BEANSTALKD_CONSOLE_HOST_PORT=2080
+
+### BEANSTALKD #########################################################################################################
+
+BEANSTALKD_HOST_PORT=11300
+
+### SELENIUM ###########################################################################################################
+
+SELENIUM_PORT=4444
+
+### MINIO ##############################################################################################################
+
+MINIO_PORT=9000
+
+### ADMINER ############################################################################################################
+
+ADM_PORT=8080
+
+### PHP MY ADMIN #######################################################################################################
+
+# Accepted values: mariadb - mysql
+
+PMA_DB_ENGINE=mysql
+
+# Credentials/Port:
+
+PMA_USER=default
+PMA_PASSWORD=secret
+PMA_ROOT_PASSWORD=secret
+PMA_PORT=8080
+
+### VARNISH ############################################################################################################
+
+VARNISH_CONFIG=/etc/varnish/default.vcl
+VARNISH_PORT=8080
+VARNISH_BACKEND_PORT=8888
+VARNISHD_PARAMS=-p default_ttl=3600 -p default_grace=3600
+
+### Varnish ############################################################################################################
+
+# Proxy 1
+
+VARNISH_PROXY1_CACHE_SIZE=128m
+VARNISH_PROXY1_BACKEND_HOST=workspace
+VARNISH_PROXY1_SERVER=SERVER1
+
+# Proxy 2
+
+VARNISH_PROXY2_CACHE_SIZE=128m
+VARNISH_PROXY2_BACKEND_HOST=workspace
+VARNISH_PROXY2_SERVER=SERVER2
+
+### HAPROXY ############################################################################################################
+
+HAPROXY_HOST_HTTP_PORT=8085
+
+### JENKINS ############################################################################################################
+
+JENKINS_HOST_HTTP_PORT=8090
+JENKINS_HOST_SLAVE_AGENT_PORT=50000
+JENKINS_HOME=./jenkins/jenkins_home
+
+### BLACKFIRE ##########################################################################################################
+
+# Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time.
+# visit https://blackfire.io/docs/24-days/06-installation#install-probe-debian for more info.
+
+INSTALL_BLACKFIRE=false
+BLACKFIRE_CLIENT_ID=<client_id>
+BLACKFIRE_CLIENT_TOKEN=<client_token>
+BLACKFIRE_SERVER_ID=<server_id>
+BLACKFIRE_SERVER_TOKEN=<server_token>
+
+
+##### TO BE CONTINUE .................................
+
+# ......... Missing: neo4j mongo rethinkdb redis aerospike pgadmin...
+# .........
+# .........
+
+
+
+############################
+# Miscellaneous
+############################
+
+# Replace with your Docker Host IP (will be appended to /etc/hosts)
+
+DOCKER_HOST_IP=10.0.75.1
+
+
+# The Remote Interpreter entry matching name `laradock`
+
+PHP_IDE_CONFIG=serverName=laradock
+
+
+# Fix for windows users to make sure the application path works.
+
+COMPOSE_CONVERT_WINDOWS_PATHS=1
+

haproxy/Dockerfile

@@ -0,0 +1,5 @@
+FROM dockercloud/haproxy:latest
+
+MAINTAINER ZeroC0D3 Team<zeroc0d3.team@gmail.com>
+
+EXPOSE 80

hhvm/Dockerfile

@@ -1,5 +1,7 @@
 FROM ubuntu:14.04
 
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
 
 RUN apt-get update -y \

hhvm/server.ini

@@ -12,7 +12,7 @@ hhvm.log.level = Error
 hhvm.log.header = true
 hhvm.log.access[default][file] = /var/log/hhvm/access.log
 hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
-hhvm.server.source_root=/var/www/public
+hhvm.server.source_root=/var/www
 hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
 
 ; Uncomment to log to files instead of STDOUT

jenkins/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+# Issues and Contributing
+
+Please note that only issues related to this Docker image will be addressed here.
+
+* If you have Docker related issues, please ask in the [Docker user mailing list](https://groups.google.com/forum/#!forum/docker-user).
+* If you have Jenkins related issues, please ask in the [Jenkins mailing lists](https://jenkins-ci.org/content/mailing-lists).
+* If you are not sure, then this is probably not the place to create an issue and you should use any of the previously mentioned mailing lists.
+
+If after going through the previous checklist you still think you should create an issue here please provide:
+
+
+### Docker commands that you execute
+
+### Actual result
+
+### Expected outcome
+
+### Have you tried a non-dockerized Jenkins and get the expected outcome?
+
+### Output of `docker version`
+
+### Other relevant information
+

jenkins/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "tests/test_helper/bats-support"]
+	path = tests/test_helper/bats-support
+	url = https://github.com/ztombol/bats-support
+[submodule "tests/test_helper/bats-assert"]
+	path = tests/test_helper/bats-assert
+	url = https://github.com/ztombol/bats-assert

jenkins/CONTRIBUTING.md

@@ -0,0 +1,16 @@
+# Issues and Contributing
+
+Please note that only issues related to this Docker image will be addressed here.
+
+* If you have Docker related issues, please ask in the [Docker user mailing list](https://groups.google.com/forum/#!forum/docker-user).
+* If you have Jenkins related issues, please ask in the [Jenkins mailing lists](https://jenkins-ci.org/content/mailing-lists).
+* If you are not sure, then this is probably not the place to create an issue and you should use any of the previously mentioned mailing lists.
+
+If after going through the previous checklist you still think you should create an issue here please provide:
+
+* Docker commands that you execute
+* Actual result
+* Expected outcome
+* Have you tried a non-dockerized Jenkins and get the expected outcome?
+* Output of `docker version`
+* Other relevant information

jenkins/Dockerfile

@@ -0,0 +1,108 @@
+FROM openjdk:8-jdk
+
+RUN apt-get update && apt-get install -y git curl && rm -rf /var/lib/apt/lists/*
+
+ENV JENKINS_HOME /var/jenkins_home
+ENV JENKINS_SLAVE_AGENT_PORT 50000
+
+ARG user=jenkins
+ARG group=jenkins
+ARG uid=1000
+ARG gid=1000
+
+# Jenkins is run with user `jenkins`, uid = 1000
+# If you bind mount a volume from the host or a data container, 
+# ensure you use the same uid
+RUN groupadd -g ${gid} ${group} \
+    && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
+
+# Jenkins home directory is a volume, so configuration and build history 
+# can be persisted and survive image upgrades
+VOLUME /var/jenkins_home
+
+# `/usr/share/jenkins/ref/` contains all reference configuration we want 
+# to set on a fresh new installation. Use it to bundle additional plugins 
+# or config file with your custom jenkins Docker image.
+RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
+
+ENV TINI_VERSION 0.13.2
+ENV TINI_SHA afbf8de8a63ce8e4f18cb3f34dfdbbd354af68a1
+
+# Use tini as subreaper in Docker container to adopt zombie processes 
+RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
+  && echo "$TINI_SHA  /bin/tini" | sha1sum -c -
+
+COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
+
+# jenkins version being bundled in this docker image
+ARG JENKINS_VERSION
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.3}
+
+# jenkins.war checksum, download will be validated using it
+ARG JENKINS_SHA=a25b9a314ca9e76f9673da7309e1882e32674223
+
+# Can be used to customize where jenkins.war get downloaded from
+ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
+
+# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum 
+# see https://github.com/docker/docker/issues/8331
+RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \
+  && echo "${JENKINS_SHA}  /usr/share/jenkins/jenkins.war" | sha1sum -c -
+
+ENV JENKINS_UC https://updates.jenkins.io
+RUN chown -R ${user} "$JENKINS_HOME" /usr/share/jenkins/ref
+
+
+# Add jenkins to the correct group
+# see http://stackoverflow.com/questions/42164653/docker-in-docker-permissions-error
+# use "getent group docker | awk -F: '{printf "%d\n", $3}'" command on host to find correct value for gid or simply use 'id'
+ARG DOCKER_GID=998
+
+RUN groupadd -g ${DOCKER_GID} docker \
+  && curl -sSL https://get.docker.com/ | sh \
+  && apt-get -q autoremove \
+  && apt-get -q clean -y \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*.bin
+
+# Install Docker-in-Docker from git@github.com:jpetazzo/dind.git
+# RUN apt-get update -qq && apt-get install -qqy apt-transport-https ca-certificates curl lxc iptables
+# Install Docker from Docker Inc. repositories.
+RUN apt-get install -y curl && curl -sSL https://get.docker.com/ | sh
+RUN usermod -aG docker jenkins
+
+# Install Docker-Compose
+RUN curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN chmod +x /usr/local/bin/docker-compose
+
+
+# for main web interface:
+EXPOSE 8080
+
+# will be used by attached slave agents:
+EXPOSE 50000
+
+ENV COPY_REFERENCE_FILE_LOG $JENKINS_HOME/copy_reference_file.log
+
+USER ${user}
+
+COPY jenkins-support /usr/local/bin/jenkins-support
+COPY jenkins.sh /usr/local/bin/jenkins.sh
+ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
+
+# from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
+COPY plugins.sh /usr/local/bin/plugins.sh
+COPY install-plugins.sh /usr/local/bin/install-plugins.sh
+
+# Only need below if we are starting from empty jenkins_home
+## Copy the RSA keys
+#RUN mkdir -p /var/jenkins_home/.ssh
+#RUN chown jenkins:jenkins /var/jenkins_home/.ssh
+#COPY keys/id_rsa /var/jenkins_home/.ssh/id_rsa.pub
+#COPY keys/id_rsa /var/jenkins_home/.ssh/id_rsa
+#COPY keys/known_hosts /var/jenkins_home/.ssh/known_hosts
+#
+#USER root
+#RUN chmod 600 /var/jenkins_home/.ssh/id_rsa
+#RUN chmod 644 /var/jenkins_home/.ssh/id_rsa.pub
+## ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+## ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts

jenkins/Jenkinsfile

@@ -0,0 +1,38 @@
+#!/usr/bin/env groovy
+
+properties([
+    buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '5')),
+    pipelineTriggers([cron('@daily')]),
+])
+
+node('docker') {
+    deleteDir()
+
+    stage('Checkout') {
+        checkout scm
+    }
+
+    if (!infra.isTrusted()) {
+        /* Outside of the trusted.ci environment, we're building and testing
+         * the Dockerful in this repository, but not publishing to docker hub
+         */
+        stage('Build') {
+            docker.build('jenkins')
+        }
+
+        stage('Test') {
+            sh """
+            git submodule update --init --recursive
+            git clone https://github.com/sstephenson/bats.git
+            bats/bin/bats tests
+            """
+        }
+    } else {
+        /* In our trusted.ci environment we only want to be publishing our
+         * containers from artifacts
+         */
+        stage('Publish') {
+            sh './publish.sh'
+        }
+    }
+}