Merge pull request #2470 from laradock/upgrade-php-fpm

upgrade php-fpm base image version
Merge pull request #2396 from ludo237/master
2020-01-16 19:26:00 +08:00 · 2020-01-16 15:06:11 +08:00 · 2020-01-16 14:57:19 +08:00 · 2020-01-14 16:10:42 +01:00 · 2020-01-14 16:09:18 +01:00 · 2020-01-14 16:07:07 +01:00
41 changed files with 3332 additions and 1222 deletions
--- a/.devcontainer/devcontainer.example.json
+++ b/.devcontainer/devcontainer.example.json
@@ -0,0 +1,14 @@
+{
+  "name": "Laradock",
+  "dockerComposeFile": "../docker-compose.yml",
+  "remoteUser": "laradock",
+  "runServices": [
+    "nginx",
+    "postgres",
+    "pgadmin"
+  ],
+  "service": "workspace",
+  "workspaceFolder": "/var/www",
+  "shutdownAction": "stopCompose",
+  "postCreateCommand": "uname -a"
+}
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,98 +0,0 @@
-<p align="center">
-    <img src="/.github/home-page-images/laradock-logo.jpg?raw=true" alt="Laradock Logo"/>
-</p>
-
-<p align="center">PHP development environment that runs on Docker</p>
-
-<p align="center">
-   <a href="https://travis-ci.org/laradock/laradock"><img src="https://travis-ci.org/laradock/laradock.svg?branch=master" alt="Build status"></a>
-   <a href="https://github.com/laradock/laradock/stargazers"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/laradock/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/laradock/sponsors/badge.svg" /></a> <img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
-   <a href="https://github.com/laradock/laradock/network"><img src="https://img.shields.io/github/forks/laradock/laradock.svg" alt="GitHub forks"></a>
-   <a href="https://github.com/laradock/laradock/issues"><img src="https://img.shields.io/github/issues/laradock/laradock.svg" alt="GitHub issues"></a>
-   <a href="https://raw.githubusercontent.com/laradock/laradock/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
-    <a href="http://laradock.io/contributing"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="contributions welcome"></a>
-</p>
-
-<h4 align="center" style="color:#7d58c2">Use Docker First - Then Learn About It Later</h4>
-
-<p align="center">
-    <a href="http://zalt.me"><img src="http://forthebadge.com/images/badges/built-by-developers.svg" alt="forthebadge" width="240"></a>
-</p>
-
-
---
-
-<p align="center">
-	<a href="http://laradock.io">
-	   <img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/documentation-button.png" width="300px" alt="Laradock Documentation"/>
-	</a>
-</p>
-
-## Sponsors 
-
-<p align="center">
-    <!-- Golden Sponsors -->
-	<a href="https://edubirdie.com/?ref=Laradock" target="_blank">
-	   <img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/sponsor-1.png?raw=true" width="300px" alt="Writing essays service Edubirdie"/>
-	</a>
-</p>
-                                                                
-<!-- OpenCollective Sponsors -->
-<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
-
-For basic sponsorships go to [Open Collective](https://opencollective.com/laradock#sponsor), for golden sponsorships contact <a href = "mailto: support@laradock.io">support@laradock.io</a>.
-
-*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.* 
-
-## People
-
-#### Maintainers:
- [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
- [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
- [Philippe Trépanier](https://github.com/philtrep) @philtrep
- [Mike Erickson](https://github.com/mikeerickson) @mikeerickson
- [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
- [Thor Erik](https://github.com/thorerik) @thorerik
- [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
- [TJ Miller](https://github.com/sixlive) @sixlive
- [Yu-Lung Shao (Allen)](https://github.com/bestlong) @bestlong
- [Milan Urukalo](https://github.com/urukalo) @urukalo
- [Vince Chu](https://github.com/vwchu) @vwchu
- [Huadong Zuo](https://github.com/zuohuadong) @zuohuadong
- [Lan Phan](https://github.com/lanphan) @lanphan
- [Ahkui](https://github.com/ahkui) @ahkui
- Join us.
-
-#### Awesome Contributors:
-
-<a href="https://github.com/laradock/laradock/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890" /></a>
-
-
-## Donations
-
-> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little. 
-> Thanks in advance.
-
-Donate directly via [Paypal](https://paypal.me/mzmmzz)
-
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mzmmzz) 
-
-or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 
-
-[![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
-
-or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
-
-<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
-
-
-## License
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE)
--- a/.github/home-page-images/join-us.png
+++ b/.github/home-page-images/join-us.png
--- a/.github/home-page-images/sponsor-1.png
+++ b/.github/home-page-images/sponsor-1.png
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,8 @@
 /nginx/ssl/*.key
 /nginx/ssl/*.csr

-.DS_Store
+/.devcontainer/*
+!/.devcontainer/devcontainer.example.json
+!/.devcontainer/docker-compose.extend-example.yml
+
+.DS_Store
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,14 @@ env:
    - PHP_VERSION=7.1 BUILD_SERVICE=workspace
    - PHP_VERSION=7.2 BUILD_SERVICE=workspace
    - PHP_VERSION=7.3 BUILD_SERVICE=workspace
+    - PHP_VERSION=7.4 BUILD_SERVICE=workspace

    - PHP_VERSION=5.6 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.0 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.1 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.2 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.3 BUILD_SERVICE=php-fpm
+    - PHP_VERSION=7.4 BUILD_SERVICE=php-fpm

    - PHP_VERSION=hhvm BUILD_SERVICE=hhvm

@@ -26,12 +28,19 @@ env:
    - PHP_VERSION=7.1 BUILD_SERVICE=php-worker
    - PHP_VERSION=7.2 BUILD_SERVICE=php-worker
    - PHP_VERSION=7.3 BUILD_SERVICE=php-worker
+    - PHP_VERSION=7.4 BUILD_SERVICE=php-worker
+
+    - PHP_VERSION=7.0 BUILD_SERVICE=laravel-horizon
+    - PHP_VERSION=7.1 BUILD_SERVICE=laravel-horizon
+    - PHP_VERSION=7.2 BUILD_SERVICE=laravel-horizon
+    - PHP_VERSION=7.3 BUILD_SERVICE=laravel-horizon
+    - PHP_VERSION=7.4 BUILD_SERVICE=laravel-horizon

    - PHP_VERSION=NA BUILD_SERVICE=solr
    - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"
    - PHP_VERSION=NA BUILD_SERVICE="blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis cassandra"
    - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
-    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 haproxy"
+    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 haproxy gearman"
    - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"
    - PHP_VERSION=NA BUILD_SERVICE="ipython-controller manticore"
    # - PHP_VERSION=NA BUILD_SERVICE="aws"
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "Dockerfile-*": "dockerfile"
+    },
+}
--- a/DOCUMENTATION/config.toml
+++ b/DOCUMENTATION/config.toml
@@ -17,7 +17,7 @@ googleAnalytics = "UA-37514928-9"

 	# Repository
 	provider = ""
-	repo_url = ""
+	repo_url = "https://github.com/laradock/laradock"

 	version = ""
 	logo = "images/logo.png"
@@ -43,7 +43,7 @@ googleAnalytics = "UA-37514928-9"
 [social]
 	twitter = ""
 	github  = "laradock/laradock"
-	email   = ""
+	email   = "support@laradock.io"

 # ------- MENU START -----------------------------------------

@@ -63,29 +63,24 @@ googleAnalytics = "UA-37514928-9"
 	weight = 3

 [[menu.main]]
-	name   = "4. Guides"
-	url    = "guides/"
+	name   = "4. Help & Questions"
+	url    = "help/"
 	weight = 4

 [[menu.main]]
-	name   = "5. Help & Questions"
-	url    = "help/"
+	name   = "5. Related Projects"
+	url    = "related-projects/"
 	weight = 5

 [[menu.main]]
-	name   = "6. Related Projects"
-	url    = "related-projects/"
+	name   = "6. Contributing"
+	url    = "contributing/"
 	weight = 6

 [[menu.main]]
-	name   = "7. Contributing"
-	url    = "contributing/"
-	weight = 7
-
-[[menu.main]]
-	name   = "8. License"
+	name   = "7. License"
 	url    = "license/"
-	weight = 8
+	weight = 7

 # ------- MENU END -----------------------------------------

--- a/DOCUMENTATION/content/contributing/index.md
+++ b/DOCUMENTATION/content/contributing/index.md
@@ -204,4 +204,4 @@ After your pull request is merged, you can safely delete your branch and pull th


 <br>
-#### Happy Coding :)
+## Happy Coding :)
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -76,7 +76,7 @@ docker-compose exec mysql bash
 *Example: enter to MySQL prompt within MySQL container*

 ```bash
-docker-compose exec mysql mysql -u homestead -psecret
+docker-compose exec mysql mysql -udefault -psecret
 ```

 3 - To exit a container, type `exit`.
@@ -272,10 +272,6 @@ docker-compose build workspace
 ```


-
-
-
-
 <br>
 <a name="Install-xDebug"></a>
 ## Install xDebug
@@ -314,6 +310,29 @@ Note: If `.php-fpm/xdebug` doesn't execute and gives `Permission Denied` error t



+<br>
+<a name="Install-pcov"></a>
+## Install pcov
+
+1 - First install `pcov` in the Workspace and the PHP-FPM Containers:
+<br>
+a) open the `.env` file
+<br>
+b) search for the `WORKSPACE_INSTALL_PCOV` argument under the Workspace Container
+<br>
+c) set it to `true`
+<br>
+d) search for the `PHP_FPM_INSTALL_PCOV` argument under the PHP-FPM Container
+<br>
+e) set it to `true`
+
+2 - Re-build the containers `docker-compose build workspace php-fpm`
+
+Note that pcov is only supported on PHP 7.1 or newer. For more information on setting up pcov optimally, check the recommended section
+of the [README](https://github.com/krakjoe/pcov)
+
+
+
 <br>
 <a name="Install-phpdbg"></a>
 ## Install phpdbg
@@ -536,7 +555,7 @@ Note: Should add `--user=laradock` (example `docker-compose exec --user=laradock
 php artisan
 ```
 ```bash
-Composer update
+composer update
 ```
 ```bash
 phpunit
@@ -650,7 +669,7 @@ docker-compose up -d metabase

 1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`.

-2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping)
+2) Go to `http://localhost:8090/` (if you didn't change your default port mapping)

 3) Authenticate from the web app.

@@ -1044,6 +1063,7 @@ _Note: You can customize the port on which beanstalkd console is listening by ch

 <br>
 <a name="Use-Confluence"></a>
+
 ## Use Confluence

 1 - Run the Confluence Container (`confluence`) with the `docker-compose up` command. Example:
@@ -1054,10 +1074,19 @@ docker-compose up -d confluence

 2 - Open your browser and visit the localhost on port **8090**:  `http://localhost:8090`

-**Note:** You can you trial version and then you have to buy a licence to use it.
+**Note:** Confluence is a licensed application - an evaluation licence can be obtained from Atlassian.

 You can set custom confluence version in `CONFLUENCE_VERSION`. [Find more info in section 'Versioning'](https://hub.docker.com/r/atlassian/confluence-server/)

+
+##### Confluence usage with Nginx and SSL.
+
+1. Find an instance configuration file in `nginx/sites/confluence.conf.example` and replace sample domain with yours.
+
+2. Configure ssl keys to your domain.
+
+Keep in mind that Confluence is still accessible on 8090 anyway.
+
 <br>
 <a name="Use-ElasticSearch"></a>
 ## Use ElasticSearch
@@ -1490,6 +1519,13 @@ To add locales to the container:

 4 - Check enabled locales with `docker-compose exec php-fpm locale -a`

+Update the locale setting, default is `POSIX`
+
+1 - Open the `.env` file and set `PHP_FPM_DEFAULT_LOCALE` to `en_US.UTF8` or other locale you want.
+
+2 - Re-build your PHP-FPM Container `docker-compose build php-fpm`.
+
+3 - Check the default locale with `docker-compose exec php-fpm locale`


 <br>
@@ -1575,7 +1611,7 @@ The default username and password for the root MySQL user are `root` and `root `

 1 - Enter the MySQL container: `docker-compose exec mysql bash`.

-2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -uhomestead -psecret`.
+2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -udefault -psecret`.

 3 - See all users: `SELECT User FROM mysql.user;`

@@ -1865,6 +1901,29 @@ To install GNU Parallel in the Workspace container



+<br>
+<a name="Install-Supervisor"></a>
+## Install Supervisor
+
+Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems.
+
+(see http://supervisord.org/index.html)
+
+To install Supervisor in the Workspace container
+
+1 - Open the `.env` file
+
+2 - Set `WORKSPACE_INSTALL_SUPERVISOR` and `WORKSPACE_INSTALL_PYTHON` to `true`.
+
+3 - Create supervisor configuration file (for ex., named `laravel-worker.conf`) for Laravel Queue Worker in `php-worker/supervisord.d/` by simply copy from `laravel-worker.conf.example`
+
+4 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 
+
+
+
+
+
+
 <br>
 <a name="Common-Aliases"></a>
 <br>
@@ -1973,6 +2032,26 @@ YAML PHP extension allows you to easily parse and create YAML structured data. I
 4 - Re-build the container `docker-compose build php-fpm`<br>


+
+
+<br>
+<a name="Install-AST"></a>
+## Install AST PHP extension
+AST exposes the abstract syntax tree generated by PHP 7+. This extension is required by tools such as `Phan`, a static analyzer for PHP.
+
+1 - Open the `.env` file
+
+2 - Search for the `WORKSPACE_INSTALL_AST` argument under the Workspace Container
+
+3 - Set it to `true`
+
+4 - Re-build the container `docker-compose build workspace`
+
+**Note** If you need a specific version of AST then search for the `WORKSPACE_AST_VERSION` argument under the Workspace Container and set it to the desired version and continue step 4.
+
+
+
+
 <br>
 <a name="phpstorm-debugging"></a>
 ## PHPStorm Debugging Guide
@@ -1982,6 +2061,19 @@ Remote debug Laravel web and phpunit tests.



+<br>
+<a name="Setup-gcloud"></a>
+## Setup Google Cloud for docker registry
+
+```
+gcloud auth configure-docker
+```
+
+Login to gcloud for use the registry and auth the permission.
+
+```
+gcloud auth login
+```



--- a/DOCUMENTATION/content/guides/index.md
+++ b/DOCUMENTATION/content/guides/index.md
@@ -1,868 +0,0 @@
---
-title: 4. Guides
-type: index
-weight: 4
---
-
-
-<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
-```
-
-###  Enter the laradock folder and rename env-example to .env.
-```
-$root@server:~/laravel/laradock# cp env-example .env
-```
-
-### 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
-```
-
-### Execute commands
-
-If you want to only execute some command and don't want to enter bash, you can execute `docker-compose run workspace <command>`.
-
-```
-docker-compose run workspace php artisan migrate
-```
-
-### 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# docker-compose down
-$root@server:~/laravel/laradock# docker-compose build nginx
-```
-
-### Re Run Your Containers MYSQL and NGINX
-
-```
-$root@server:~/laravel/laradock/nginx# docker-compose up -d nginx mysql
-```
-
-**View Your Site with HTTP ONLY (http://yourdomain.com)**
-
-### Run Site on SSL with Let's Encrypt Certificate
-
-**Note: You need to Use Caddy here Instead of Nginx**
-
-To go Caddy Folders and Edit CaddyFile
-
-```
-$root@server:~/laravel/laradock# cd caddy
-$root@server:~/laravel/laradock/caddy# vim Caddyfile
-```
-
-Remove 0.0.0.0:80
-
-```
-0.0.0.0:80
-root /var/www/public
-```
-
-and replace with your https://yourdomain.com
-
-```
-https://yourdomain.com
-root /var/www/public
-```
-
-uncomment tls
-
-```
-#tls self-signed
-```
-
-and replace self-signed with your email address
-
-```
-tls serverbreaker@gmai.com
-```
-
-This is needed Prior to Creating Let's Encypt
-
-### Run Your Caddy Container without the -d flag and Generate SSL with Let's Encrypt
-
-```
-$root@server:~/laravel/laradock# 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# docker-compose down
-$root@server:~/laravel/laradock# 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="Laravel-Dusk"></a>
-## Running Laravel Dusk Tests
-
-### Option 1: Without Selenium
-
- [Intro](#option1-dusk-intro)
- [Workspace Setup](#option1-workspace-setup)
- [Application Setup](#option1-application-setup)
- [Choose Chrome Driver Version (Optional)](#option1-choose-chrome-driver-version)
- [Run Dusk Tests](#option1-run-dusk-tests)
-
-#### Intro
-
-This is a guide to run Dusk tests in your `workspace` container with headless
-google-chrome and chromedriver. It has been tested with Laravel 5.4 and 5.5.
-
-#### Workspace Setup
-
-Update your .env with following entries:
-
-```
-...
-# Install Laravel installer bin to setup demo app
-WORKSPACE_INSTALL_LARAVEL_INSTALLER=true
-...
-# Install all the necessary dependencies for running Dusk tests
-WORKSPACE_INSTALL_DUSK_DEPS=true
-...
-```
-
-Then run below to build your workspace.
-
-```
-docker-compose build workspace
-```
-
-#### Application Setup
-
-Run a `workspace` container and you will be inside the container at `/var/www` directory.
-
-```
-docker-compose run workspace bash
-
-/var/www#> _
-```
-
-Create new Laravel application named `dusk-test` and install Laravel Dusk package.
-
-```
-/var/www> laravel new dusk-test
-/var/www> cd dusk-test
-/var/www/dusk-test> composer require --dev laravel/dusk
-/var/www/dusk-test> php artisan dusk:install
-```
-
-Create `.env.dusk.local` by copying from `.env` file.
-
-```
-/var/www/dusk-test> cp .env .env.dusk.local
-```
-
-Update the `APP_URL` entry in `.env.dusk.local` to local Laravel server.
-
-```
-APP_URL=http://localhost:8000
-```
-
-You will need to run chromedriver with `headless` and `no-sandbox` flag. In Laravel Dusk 2.x it is
-already set `headless` so you just need to add `no-sandbox` flag. If you on previous version 1.x,
-you will need to update your `DustTestCase#driver` as shown below. 
-
-
-```
-<?php
-
-...
-
-abstract class DuskTestCase extends BaseTestCase
-{
-    ...
-
-    /**
-    * Update chrome driver with below flags
-    */
-    protected function driver()
-    {
-        $options = (new ChromeOptions)->addArguments([
-            '--disable-gpu',
-            '--headless',
-            '--no-sandbox'
-        ]);
-
-        return RemoteWebDriver::create(
-            'http://localhost:9515', DesiredCapabilities::chrome()->setCapability(
-                ChromeOptions::CAPABILITY, $options
-            )
-        );
-    }
-}
-```
-
-#### Choose Chrome Driver Version (Optional)
-
-You could choose to use either:
-
-1. Chrome Driver shipped with Laravel Dusk. (Default)
-2. Chrome Driver installed in `workspace` container. (Required tweak on DuskTestCase class)
-
-For Laravel 2.x, you need to update `DuskTestCase#prepare` method if you wish to go with option #2.
-
-```
-
-<?php
-
-...
-abstract class DuskTestCase extends BaseTestCase
-{
-    ...
-    public static function prepare()
-    {
-        // Only add this line if you wish to use chrome driver installed in workspace container.
-        // You might want to read the file path from env file.
-        static::useChromedriver('/usr/local/bin/chromedriver');
-
-        static::startChromeDriver();
-    }
-```
-
-For Laravel 1.x, you need to add `DuskTestCase#buildChromeProcess` method if you wish to go with option #2.
-
-```
-<?php
-
-...
-use Symfony\Component\Process\ProcessBuilder;
-
-abstract class DuskTestCase extends BaseTestCase
-{
-    ...
-
-    /**
-    * Only add this method if you wish to use chrome driver installed in workspace container
-    */
-    protected static function buildChromeProcess()
-    {
-        return (new ProcessBuilder())
-            ->setPrefix('chromedriver')
-            ->getProcess()
-            ->setEnv(static::chromeEnvironment());
-    }
-
-    ...
-}
-```
-
-#### Run Dusk Tests
-
-Run local server in `workspace` container and run Dusk tests.
-
-```
-# alias to run Laravel server in the background (php artisan serve --quiet &)
-/var/www/dusk-test> serve
-# alias to run Dusk tests (php artisan dusk)
-/var/www/dusk-test> dusk
-
-PHPUnit 6.4.0 by Sebastian Bergmann and contributors.
-
-.                                                                   1 / 1 (100%)
-
-Time: 837 ms, Memory: 6.00MB
-```
-
-### Option 2: With Selenium
-
- [Intro](#dusk-intro)
- [DNS Setup](#dns-setup)
- [Docker Compose Setup](#docker-compose)
- [Laravel Dusk Setup](#laravel-dusk-setup)
- [Running Laravel Dusk Tests](#running-tests)
-
-#### Intro
-Setting up Laravel Dusk tests to run with Laradock appears be something that
-eludes most Laradock users. This guide is designed to show you how to wire them
-up to work together. This guide is written with macOS and Linux in mind. As such,
-it's only been tested on macOS. Feel free to create pull requests to update the guide
-for Windows-specific instructions.
-
-This guide assumes you know how to use a DNS forwarder such as `dnsmasq` or are comfortable
-with editing the `/etc/hosts` file for one-off DNS changes.
-
-#### DNS Setup
-According to RFC-2606, only four TLDs are reserved for local testing[^1]:
-
- `.test`
- `.example`
- `.invalid`
- `.localhost`
-
-A common TLD used for local development is `.dev`, but newer versions of Google
-Chrome (such as the one bundled with the Selenium Docker image), will fail to
-resolve that DNS as there will appear to be a name collision.
-
-The recommended extension is `.test` for your Laravel web apps because you're
-running tests. Using a DNS forwarder such as `dnsmasq` or by editing the `/etc/hosts`
-file, configure the host to point to `localhost`.
-
-For example, in your `/etc/hosts` file:
-```
-##
-# Host Database
-#
-# localhost is used to configure the loopback interface
-# when the system is booting.  Do not change this entry.
-##
-127.0.0.1       localhost
-255.255.255.255 broadcasthost
-::1             localhost
-127.0.0.1       myapp.test
-```
-
-This will ensure that when navigating to `myapp.test`, it will route the
-request to `127.0.0.1` which will be handled by Nginx in Laradock.
-
-#### Docker Compose setup
-In order to make the Selenium container talk to the Nginx container appropriately,
-the `docker-compose.yml` needs to be edited to accommodate this. Make the following
-changes:
-
-```yaml
-...
-selenium:
-  ...
-  depends_on:
-  - nginx
-  links:
-  - nginx:<your_domain>
-```
-
-This allows network communication between the Nginx and Selenium containers
-and it also ensures that when starting the Selenium container, the Nginx
-container starts up first unless it's already running. This allows
-the Selenium container to make requests to the Nginx container, which is
-necessary for running Dusk tests. These changes also link the `nginx` environment
-variable to the domain you wired up in your hosts file.
-
-#### Laravel Dusk Setup
-
-In order to make Laravel Dusk make the proper request to the Selenium container,
-you have to edit the `DuskTestCase.php` file that's provided on the initial
-installation of Laravel Dusk. The change you have to make deals with the URL the
-Remote Web Driver attempts to use to set up the Selenium session.
-
-One recommendation for this is to add a separate config option in your `.env.dusk.local`
-so it's still possible to run your Dusk tests locally should you want to.
-
-##### .env.dusk.local
-```
-...
-USE_SELENIUM=true
-```
-
-##### DuskTestCase.php
-```php
-abstract class DuskTestCase extends BaseTestCase
-{
-...
-    protected function driver()
-    {
-        if (env('USE_SELENIUM', 'false') == 'true') {
-            return RemoteWebDriver::create(
-                'http://selenium:4444/wd/hub', DesiredCapabilities::chrome()
-            );
-        } else {
-            return RemoteWebDriver::create(
-                'http://localhost:9515', DesiredCapabilities::chrome()
-            );
-        }
-    }
-}
-```
-
-#### Running Laravel Dusk Tests
-
-Now that you have everything set up, to run your Dusk tests, you have to SSH
-into the workspace container as you normally would:
-```docker-compose exec --user=laradock workspace bash```
-
-Once inside, you can change directory to your application and run:
-
-```php artisan dusk```
-
-One way to make this easier from your project is to create a helper script. Here's one such example:
-```bash
-#!/usr/bin/env sh
-
-LARADOCK_HOME="path/to/laradock"
-
-pushd ${LARADOCK_HOME}
-
-docker-compose exec --user=laradock workspace bash -c "cd my-project && php artisan dusk && exit"
-```
-
-This invokes the Dusk command from inside the workspace container but when the script completes
-execution, it returns your session to your project directory.
-
-[^1]: [Don't Use .dev for Development](https://iyware.com/dont-use-dev-for-development/)
-
-
-<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)
-
-### 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.
-
-### 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`.
-
-### 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).
-
-
-### 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
-```
-
-
-#### 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" ]; then
-      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
-```
-
-
-### 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
-```
-
-### 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.
-
-
-### 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)
-
-
-
-### Usage
-
-#### 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!
-
-#### 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)
-
-#### 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)
-
-
-### 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`
-
-#### 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)
-
-<br>
-<br>
-<br>
-<br>
-<br>
-
-<a name="Setup remote debugging (PhpStorm)"></a>
-## Setup remote debugging for PhpStorm on Linux
-
- - Make sure you have followed the steps above in the [Install Xdebug section](#install-xdebug).
-
- - Make sure Xdebug accepts connections and listens on port 9000. (Should be default configuration).
-
-![Debug Configuration](/images/photos/PHPStorm/linux/configuration/debugConfiguration.png "Debug Configuration").
-
- - Create a server with name `laradock` (matches **PHP_IDE_CONFIG** key in environment file) and make sure to map project root path with server correctly.
-
-![Server Configuration](/images/photos/PHPStorm/linux/configuration/serverConfiguration.png "Server Configuration").
-
- - Start listening for debug connections, place a breakpoint and you are good to go !
--- a/DOCUMENTATION/content/help/index.md
+++ b/DOCUMENTATION/content/help/index.md
@@ -6,6 +6,8 @@ weight: 5

 Join the chat room on [Gitter](https://gitter.im/Laradock/laradock) and get help and support from the community.

+[![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
 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).


@@ -41,7 +43,7 @@ Use `http://127.0.0.1` instead of `http://localhost` in your browser.


 <br>
-## I see an error message containing `address already in use` or `port is already allocated`
+## I see an error message containing (address already in use) or (port is already allocated)

 Make sure the ports for the services that you are trying to run (22, 80, 443, 3306, etc.) are not being used already by other programs on the host, such as a built in `apache`/`httpd` service or other development tools you have installed.

@@ -85,7 +87,7 @@ This error sometimes happens because your Laravel application isn't running on t
 * Option B
   1. Change the `DB_HOST` value to the same name as the MySQL docker container. The Laradock docker-compose file currently has this as `mysql`

-## I get stuck when building nginx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz`
+## I get stuck when building nginx on (fetch mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz)

 As stated on [#749](https://github.com/laradock/laradock/issues/749#issuecomment-419652646), Already fixed，just set `CHANGE_SOURCE` to false.

@@ -101,7 +103,7 @@ WORKSPACE_COMPOSER_REPO_PACKAGIST=https://packagist.phpcomposer.com

 <br>

-## I get `Module build failed: Error: write EPIPE` while compiling react application
+## I got (Module build failed: Error: write EPIPE) while compiling react application

 When you run `npm build` or `yarn dev` building a react application using webpack with elixir you may receive a `Error: write EPIPE` while processing .jpg images.

--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -4,44 +4,34 @@ type: index
 weight: 1
 ---

+<b>Laradock is a full PHP development environment based on Docker.</b>

-## Use Docker First - Then Learn About It Later
-
-Laradock is a PHP development environment that runs on Docker.
-
-Supports a variety of useful Docker Images, pre-configured to provide a wonderful PHP development environment.
+Supporting a variety of common services, all pre-configured to provide a full PHP development environment.


-![](https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/laradock-logo.jpg)
+<a name="features"></a>
+## Features

-
-
-
-<a name="sponsors"></a>
-## Sponsors
-
-<p align="center">
-<!-- Golden Sponsors -->
-    <a href="https://edubirdie.com/?ref=Laradock" target="_blank">
-       <img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/sponsor-1.png?raw=true" width="300px" alt="Writing essays service Edubirdie"/>
-    </a>
-</p>
+- Easy switch between PHP versions: 7.4, 7.3, 7.2, 7.1, 5.6...
+- Choose your favorite database engine: MySQL, Postgres, MariaDB...
+- Run your own stack: Memcached, HHVM, RabbitMQ...
+- Each software runs on its own 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.

 <br>

-<!-- OpenCollective Sponsors -->
-<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
+---
+### Use Docker First - Then Learn About It Later</q>
+---

-For basic sponsorships go to [Open Collective](https://opencollective.com/laradock#sponsor), for golden sponsorships contact <a href = "mailto: support@laradock.io">support@laradock.io</a>.
-<br>
-*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.* 

 ## Quick Overview

@@ -82,25 +72,6 @@ That's it! enjoy :)



-<a name="features"></a>
-## Features
-
- Easy switch between PHP versions: 7.3, 7.2, 7.1, 5.6...
- Choose your favorite database engine: MySQL, Postgres, MariaDB...
- Run your own stack: Memcached, HHVM, RabbitMQ...
- Each software runs on its own 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.
-
-
-
 <a name="Supported-Containers"></a>
 ## Supported Software (Docker Images)

@@ -159,6 +130,7 @@ That's it! enjoy :)
    - Eclipse Mosquitto
    - PHP Worker
    - Laravel Horizon
+    - Gearman

 - **Mail Servers:**
    - Mailu 
@@ -233,49 +205,7 @@ You can choose, which tools to install in your workspace container and other con

 *If you can't find your Software in the list, build it yourself and submit 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 [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)
-
-
-
-
+---



@@ -286,24 +216,212 @@ 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)

+---

+Laradock exists thanks to all the people who contribute.

+## Project Maintainers

+<table>
+  <tbody>
+    <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/mahmoudz.png?s=150">
+            <br>
+            <strong>Mahmoud Zalt</strong>
+            <br>
+            <a href="https://github.com/Mahmoudz">@mahmoudz</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/appleboy.png?s=150">
+            <br>
+            <strong>Bo-Yi Wu</strong>
+            <br>
+            <a href="https://github.com/appleboy">@appleboy</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/philtrep.png?s=150">
+            <br>
+            <strong>Philippe Trépanier</strong>
+            <br>
+            <a href="https://github.com/philtrep">@philtrep</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/mikeerickson.png?s=150">
+            <br>
+            <strong>Mike Erickson</strong>
+            <br>
+            <a href="https://github.com/mikeerickson">@mikeerickson</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/zeroc0d3.png?s=150">
+            <br>
+            <strong>Dwi Fahni Denni</strong>
+            <br>
+            <a href="https://github.com/zeroc0d3">@zeroc0d3</a>
+        </td>
+     </tr>
+     <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/thorerik.png?s=150">
+            <br>
+            <strong>Thor Erik</strong>
+            <br>
+            <a href="https://github.com/thorerik">@thorerik</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/winfried-van-loon.png?s=150">
+            <br>
+            <strong>Winfried van Loon</strong>
+            <br>
+            <a href="https://github.com/winfried-van-loon">@winfried-van-loon</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/sixlive.png?s=150">
+            <br>
+            <strong>TJ Miller</strong>
+            <br>
+            <a href="https://github.com/sixlive">@sixlive</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/bestlong.png?s=150">
+            <br>
+            <strong>Yu-Lung Shao (Allen)</strong>
+            <br>
+            <a href="https://github.com/bestlong">@bestlong</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/urukalo.png?s=150">
+            <br>
+            <strong>Milan Urukalo</strong>
+            <br>
+            <a href="https://github.com/urukalo">@urukalo</a>
+        </td>
+     </tr>
+     <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/vwchu.png?s=150">
+            <br>
+            <strong>Vince Chu</strong>
+            <br>
+            <a href="https://github.com/vwchu">@vwchu</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/zuohuadong.png?s=150">
+            <br>
+            <strong>Huadong Zuo</strong>
+            <br>
+            <a href="https://github.com/zuohuadong">@zuohuadong</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/lanphan.png?s=150">
+            <br>
+            <strong>Lan Phan</strong>
+            <br>
+            <a href="https://github.com/lanphan">@lanphan</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/ahkui.png?s=150">
+            <br>
+            <strong>Ahkui</strong>
+            <br>
+            <a href="https://github.com/ahkui">@ahkui</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/join-us.png">
+            <br>
+            <strong>< Join Us ></strong>
+            <br>
+            <a href="https://github.com/laradock">@laradock</a>
+        </td>
+     </tr>
+  </tbody>
+</table>
+
+## Code Contributors
+
+<a href="https://github.com/undefined/undefined/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890&button=false" /></a>
+
+---

 <a name="Donations"></a>
-## Donations
+## Financial Contributors

-> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little. 
-> Thanks in advance.
+Contribute and help us sustain the project.

-Donate directly via [Paypal](https://paypal.me/mzmmzz)
+<b>Option 1:</b> Donate directly to [Paypal](https://paypal.me/mzmmzz).

-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mzmmzz) 
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mzmmzz)

-or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 
+<b>Option 2:</b> Support us via [BeerPay](https://beerpay.io/laradock/laradock).

 [![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)

-or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
+<b>Option 3:</b> Become a backer on [Open Collective](https://opencollective.com/laradock/contribute).

-<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
+<a href="https://opencollective.com/laradock"><img src="https://opencollective.com/laradock/backer.svg?width=890"></a>
+
+
+
+<a name="sponsors"></a>
+## Sponsors
+
+<a href="https://opencollective.com/laradock/sponsor/0/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/1/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/2/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/3/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/10/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/10/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/11/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/11/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/12/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/12/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/13/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/13/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/14/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/14/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/15/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/15/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/16/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/16/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/17/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/17/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/18/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/18/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/19/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/19/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/20/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/20/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/21/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/21/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/22/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/22/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/23/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/23/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/24/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/24/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/25/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/25/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/26/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/26/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/27/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/27/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/28/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/28/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/29/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/29/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/30/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/30/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/31/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/31/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/32/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/32/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/33/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/33/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/34/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/34/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/35/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/35/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/36/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/36/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/37/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/37/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/38/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/38/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/39/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/39/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/40/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/40/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/41/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/41/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/42/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/42/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/43/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/43/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/44/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/44/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/45/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/45/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/46/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/46/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/47/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/47/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/48/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/48/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/49/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/49/avatar.svg?requireActive=false"></a>
+
+Support Laradock with your [organization](https://opencollective.com/laradock/contribute/).
+<br>
+Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.
+<br>
+For more info contact <a href = "mailto: support@laradock.io">support@laradock.io</a>.
+
+<br>
+    
--- a/DOCUMENTATION/static/custom-style.css
+++ b/DOCUMENTATION/static/custom-style.css
@@ -11,3 +11,20 @@
    height: 70px;
    padding: 25px;
 }
+.palette-primary-deep-purple .article h1{
+    color: #7e57c2;
+    font-size: 35px;
+}
+.palette-primary-deep-purple .article h2{
+
+    color: #ce2046;
+    font-size: 25px;
+}
+.palette-primary-deep-purple .article h3{
+    color: #851d54;
+    font-size: 18px;
+}
+.palette-primary-deep-purple .article code{
+    color: #851d54;
+    background: #eeeeeea8;
+}
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html
@@ -24,20 +24,6 @@

 	<article class="article">
 		<div class="wrapper">
-
-            <!-- ------------------------------------------------------------------------- -->
-            <!-- Google Ads -->
-            <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-            <!-- Laradock Horizontal -->
-            <ins class="adsbygoogle"
-                 style="display:inline-block;width:890px;height:100px"
-                 data-ad-client="ca-pub-9826129398689742"
-                 data-ad-slot="2340256024"></ins>
-            <script>
-                (adsbygoogle = window.adsbygoogle || []).push({});
-            </script>
-            <!-- ------------------------------------------------------------------------- -->
-
            <h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>

 			{{ .Content }}
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/index.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/index.html
@@ -1,8 +1,8 @@
 {{ 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 }}
+    {{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+    {{ .Scratch.Set "repo_id" $repo_id }}
 {{ end }}

 <div class="backdrop">
@@ -25,26 +25,32 @@
 	<article class="article">
 		<div class="wrapper">

-            <!-- Wrapper arround google ads for seedanddew -->
-            <div class='snd-ad'>
-                <!-- ------------------------------------------------------------------------- -->
-                <!-- Google Ads -->
-                <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-                <!-- Laradock Horizontal -->
-                <ins class="adsbygoogle"
-                     style="display:inline-block;width:890px;height:100px"
-                     data-ad-client="ca-pub-9826129398689742"
-                     data-ad-slot="2340256024"></ins>
-                <script>
-                    (adsbygoogle = window.adsbygoogle || []).push({});
-                </script>
-                <!-- ------------------------------------------------------------------------- -->
-            </div>
+			<!-- Wrapper around google ads for seedanddew -->
+			<div class='snd-ad'>
+				<!-- ------------------------------------------------------------------------- -->
+				<!-- Google Ads -->
+				<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+				<!-- Laradock Horizontal -->
+				<ins class="adsbygoogle"
+					 style="display:inline-block;width:890px;height:100px"
+					 data-ad-client="ca-pub-9826129398689742"
+					 data-ad-slot="2340256024"></ins>
+				<script>
+					(adsbygoogle = window.adsbygoogle || []).push({});
+				</script>
+				<!-- ------------------------------------------------------------------------- -->
+			</div>
+
+			<br><br><br>
+			<img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/laradock-logo.jpg" alt="laradock logo">

 			{{ range where .Site.Pages "Type" "index" }}
-				<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
+			<br><br><br><br><br><br>
+			<hr>
+			<br>
+			<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>

-				{{ .Content }}
+			{{ .Content }}
 			{{ end }}

 			<aside class="copyright" role="note">
@@ -55,8 +61,8 @@
 				<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>.
+				by
+				<a href="https://zalt.me">Mahmoud Zalt</a>.
 			</aside>

 			<footer class="footer">
--- a/.github/README-zh.md
+++ b/.github/README-zh.md
--- a/README.md
+++ b/README.md
@@ -0,0 +1,238 @@
+<p align="center">
+    <img src="/.github/home-page-images/laradock-logo.jpg?raw=true" alt="Laradock Logo"/>
+</p>
+
+---
+
+<p align="center"><b>Full PHP development environment based on Docker.</b></p>
+
+<p align="center">Supporting a variety of common services, all pre-configured to provide a full PHP development environment.</p>
+
+<p align="center">
+   <a href="http://laradock.io/contributing"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="contributions welcome"></a>
+   <a href="https://github.com/laradock/laradock/network"><img src="https://img.shields.io/github/forks/laradock/laradock.svg" alt="GitHub forks"></a>
+   <a href="https://github.com/laradock/laradock/issues"><img src="https://img.shields.io/github/issues/laradock/laradock.svg" alt="GitHub issues"></a>
+   <a href="https://github.com/laradock/laradock/stargazers"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/laradock/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/laradock/sponsors/badge.svg" /></a> <img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
+   <a href="https://travis-ci.org/laradock/laradock"><img src="https://travis-ci.org/laradock/laradock.svg?branch=master" alt="Build status"></a>
+   <a href="https://raw.githubusercontent.com/laradock/laradock/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
+</p>
+
+<p align="center">
+    <a href="http://zalt.me"><img src="http://forthebadge.com/images/badges/built-by-developers.svg" alt="forthebadge" width="240"></a>
+</p>
+
+
+
+<h4 align="center" style="color:#7d58c2">Use Docker First - Then Learn About It Later</h4>
+
+<p align="center">
+	<a href="http://laradock.io">
+	   <img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/documentation-button.png" width="300px" alt="Laradock Documentation"/>
+	</a>
+</p>
+
+---
+
+## Awesome People
+Laradock exists thanks to all the people who contribute.
+
+### Project Maintainers
+
+<table>
+  <tbody>
+    <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/mahmoudz.png?s=150">
+            <br>
+            <strong>Mahmoud Zalt</strong>
+            <br>
+            <a href="https://github.com/Mahmoudz">@mahmoudz</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/appleboy.png?s=150">
+            <br>
+            <strong>Bo-Yi Wu</strong>
+            <br>
+            <a href="https://github.com/appleboy">@appleboy</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/philtrep.png?s=150">
+            <br>
+            <strong>Philippe Trépanier</strong>
+            <br>
+            <a href="https://github.com/philtrep">@philtrep</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/mikeerickson.png?s=150">
+            <br>
+            <strong>Mike Erickson</strong>
+            <br>
+            <a href="https://github.com/mikeerickson">@mikeerickson</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/zeroc0d3.png?s=150">
+            <br>
+            <strong>Dwi Fahni Denni</strong>
+            <br>
+            <a href="https://github.com/zeroc0d3">@zeroc0d3</a>
+        </td>
+     </tr>
+     <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/thorerik.png?s=150">
+            <br>
+            <strong>Thor Erik</strong>
+            <br>
+            <a href="https://github.com/thorerik">@thorerik</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/winfried-van-loon.png?s=150">
+            <br>
+            <strong>Winfried van Loon</strong>
+            <br>
+            <a href="https://github.com/winfried-van-loon">@winfried-van-loon</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/sixlive.png?s=150">
+            <br>
+            <strong>TJ Miller</strong>
+            <br>
+            <a href="https://github.com/sixlive">@sixlive</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/bestlong.png?s=150">
+            <br>
+            <strong>Yu-Lung Shao (Allen)</strong>
+            <br>
+            <a href="https://github.com/bestlong">@bestlong</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/urukalo.png?s=150">
+            <br>
+            <strong>Milan Urukalo</strong>
+            <br>
+            <a href="https://github.com/urukalo">@urukalo</a>
+        </td>
+     </tr>
+     <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/vwchu.png?s=150">
+            <br>
+            <strong>Vince Chu</strong>
+            <br>
+            <a href="https://github.com/vwchu">@vwchu</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/zuohuadong.png?s=150">
+            <br>
+            <strong>Huadong Zuo</strong>
+            <br>
+            <a href="https://github.com/zuohuadong">@zuohuadong</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/lanphan.png?s=150">
+            <br>
+            <strong>Lan Phan</strong>
+            <br>
+            <a href="https://github.com/lanphan">@lanphan</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/ahkui.png?s=150">
+            <br>
+            <strong>Ahkui</strong>
+            <br>
+            <a href="https://github.com/ahkui">@ahkui</a>
+        </td>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/join-us.png">
+            <br>
+            <strong>< Join Us ></strong>
+            <br>
+            <a href="https://github.com/laradock">@laradock</a>
+        </td>
+     </tr>
+  </tbody>
+</table>
+
+### Code Contributors
+
+<a href="https://github.com/laradock/laradock/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Contribute and help us sustain the project.
+
+<b>Option 1:</b> Donate directly to [Paypal](https://paypal.me/mzmmzz).
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mzmmzz)
+
+<b>Option 2:</b> Support us via [BeerPay](https://beerpay.io/laradock/laradock).
+
+[![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
+
+<b>Option 3:</b> Become a backer on [Open Collective](https://opencollective.com/laradock/contribute).
+
+<a href="https://opencollective.com/laradock"><img src="https://opencollective.com/laradock/backer.svg?width=890"></a>
+
+## Sponsors
+
+<a href="https://opencollective.com/laradock/sponsor/0/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/1/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/2/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/3/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/10/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/10/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/11/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/11/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/12/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/12/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/13/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/13/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/14/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/14/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/15/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/15/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/16/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/16/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/17/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/17/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/18/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/18/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/19/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/19/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/20/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/20/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/21/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/21/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/22/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/22/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/23/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/23/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/24/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/24/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/25/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/25/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/26/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/26/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/27/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/27/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/28/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/28/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/29/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/29/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/30/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/30/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/31/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/31/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/32/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/32/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/33/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/33/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/34/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/34/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/35/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/35/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/36/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/36/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/37/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/37/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/38/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/38/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/39/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/39/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/40/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/40/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/41/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/41/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/42/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/42/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/43/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/43/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/44/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/44/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/45/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/45/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/46/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/46/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/47/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/47/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/48/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/48/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/laradock/sponsor/49/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/49/avatar.svg?requireActive=false"></a>
+
+Support Laradock with your [organization](https://opencollective.com/laradock/contribute/).
+<br>
+Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.
+<br>
+For more info contact <a href = "mailto: support@laradock.io">support@laradock.io</a>.
+
+## License
+
+[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE)
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@@ -1,4 +1,4 @@
-FROM webdevops/apache:ubuntu-16.04
+FROM webdevops/apache:ubuntu-18.04

 LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,10 @@ volumes:
    driver: ${VOLUMES_DRIVER}
  cassandra:
    driver: ${VOLUMES_DRIVER}
+  graylog:
+    driver: ${VOLUMES_DRIVER}
+  dind:
+    driver: ${VOLUMES_DRIVER}

 services:

@@ -55,10 +59,13 @@ services:
      build:
        context: ./workspace
        args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
+          - UBUNTU_SOURCE=${UBUNTU_SOURCE}
          - LARADOCK_PHP_VERSION=${PHP_VERSION}
          - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
          - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
          - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
+          - INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV}
          - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
          - INSTALL_SSH2=${WORKSPACE_INSTALL_SSH2}
@@ -66,12 +73,15 @@ services:
          - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
          - INSTALL_XSL=${WORKSPACE_INSTALL_XSL}
          - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
+          - INSTALL_SMB=${WORKSPACE_INSTALL_SMB}
          - INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP}
          - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
          - INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP}
          - INSTALL_CASSANDRA=${WORKSPACE_INSTALL_CASSANDRA}
+          - INSTALL_GEARMAN=${WORKSPACE_INSTALL_GEARMAN}
          - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
          - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
+          - NVM_NODEJS_ORG_MIRROR=${WORKSPACE_NVM_NODEJS_ORG_MIRROR}
          - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
          - NPM_REGISTRY=${WORKSPACE_NPM_REGISTRY}
          - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
@@ -83,6 +93,7 @@ services:
          - INSTALL_WP_CLI=${WORKSPACE_INSTALL_WP_CLI}
          - INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE}
          - INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE}
+          - INSTALL_OCI8=${WORKSPACE_INSTALL_OCI8}
          - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
          - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
          - COMPOSER_AUTH=${WORKSPACE_COMPOSER_AUTH}
@@ -109,16 +120,23 @@ services:
          - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
          - INSTALL_PING=${WORKSPACE_INSTALL_PING}
          - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
+          - INSTALL_INOTIFY=${WORKSPACE_INSTALL_INOTIFY}
+          - INSTALL_FSWATCH=${WORKSPACE_INSTALL_FSWATCH}
+          - INSTALL_AST=${WORKSPACE_INSTALL_AST}
+          - INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
+          - INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}
          - PUID=${WORKSPACE_PUID}
          - PGID=${WORKSPACE_PGID}
          - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
          - NODE_VERSION=${WORKSPACE_NODE_VERSION}
          - YARN_VERSION=${WORKSPACE_YARN_VERSION}
          - DRUSH_VERSION=${WORKSPACE_DRUSH_VERSION}
+          - AST_VERSION=${WORKSPACE_AST_VERSION}
          - TZ=${WORKSPACE_TIMEZONE}
          - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
          - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
          - INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
+          - INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
          - INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
          - INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
          - http_proxy
@@ -126,6 +144,7 @@ services:
          - no_proxy
      volumes:
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
+        - ./php-worker/supervisord.d:/etc/supervisord.d
      extra_hosts:
        - "dockerhost:${DOCKER_HOST_IP}"
      ports:
@@ -145,18 +164,22 @@ services:
      build:
        context: ./php-fpm
        args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
          - LARADOCK_PHP_VERSION=${PHP_VERSION}
          - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
          - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
+          - INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
          - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
          - INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
          - INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
          - INSTALL_XSL=${PHP_FPM_INSTALL_XSL}
+          - INSTALL_SMB=${PHP_FPM_INSTALL_SMB}
          - INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
          - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
          - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
          - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
+          - INSTALL_GEARMAN=${PHP_FPM_INSTALL_GEARMAN}
          - INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
          - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
          - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
@@ -165,6 +188,7 @@ services:
          - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
          - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
          - INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
+          - INSTALL_OCI8=${PHP_FPM_INSTALL_OCI8}
          - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
          - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
          - INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT}
@@ -181,15 +205,22 @@ services:
          - INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME}
          - INSTALL_IONCUBE=${PHP_FPM_INSTALL_IONCUBE}
          - INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
+          - INSTALL_CACHETOOL=${PHP_FPM_INSTALL_CACHETOOL}
          - INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
          - INSTALL_RDKAFKA=${PHP_FPM_INSTALL_RDKAFKA}
+          - INSTALL_GETTEXT=${PHP_FPM_INSTALL_GETTEXT}
          - INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
          - INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
          - INSTALL_PING=${PHP_FPM_INSTALL_PING}
          - INSTALL_SSHPASS=${PHP_FPM_INSTALL_SSHPASS}
+          - INSTALL_MAILPARSE=${PHP_FPM_INSTALL_MAILPARSE}
+          - INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
          - ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
          - INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
          - INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
+          - PUID=${PHP_FPM_PUID}
+          - PGID=${PHP_FPM_PGID}
+          - LOCALE=${PHP_FPM_DEFAULT_LOCALE}
          - http_proxy
          - https_proxy
          - no_proxy
@@ -216,6 +247,7 @@ services:
      build:
        context: ./php-worker
        args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
          - PHP_VERSION=${PHP_VERSION}
          - PHALCON_VERSION=${PHALCON_VERSION}
          - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
@@ -226,11 +258,13 @@ services:
          - INSTALL_MYSQL_CLIENT=${PHP_WORKER_INSTALL_MYSQL_CLIENT}
          - INSTALL_AMQP=${PHP_WORKER_INSTALL_AMQP}
          - INSTALL_CASSANDRA=${PHP_WORKER_INSTALL_CASSANDRA}
+          - INSTALL_GEARMAN=${PHP_WORKER_INSTALL_GEARMAN}
          - INSTALL_GHOSTSCRIPT=${PHP_WORKER_INSTALL_GHOSTSCRIPT}
          - INSTALL_SWOOLE=${PHP_WORKER_INSTALL_SWOOLE}
          - INSTALL_TAINT=${PHP_WORKER_INSTALL_TAINT}
          - INSTALL_FFMPEG=${PHP_WORKER_INSTALL_FFMPEG}
          - INSTALL_GMP=${PHP_WORKER_INSTALL_GMP}
+          - INSTALL_REDIS=${PHP_WORKER_INSTALL_REDIS}
          - PUID=${PHP_WORKER_PUID}
          - PGID=${PHP_WORKER_PGID}
      volumes:
@@ -247,12 +281,18 @@ services:
      build:
        context: ./laravel-horizon
        args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
          - PHP_VERSION=${PHP_VERSION}
          - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
          - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
          - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
          - INSTALL_SOCKETS=${LARAVEL_HORIZON_INSTALL_SOCKETS}
          - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
+          - INSTALL_PHPREDIS=${LARAVEL_HORIZON_INSTALL_PHPREDIS}
+          - INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
+          - INSTALL_FFMPEG=${LARAVEL_HORIZON_INSTALL_FFMPEG}
+          - PUID=${PHP_WORKER_PUID}
+          - PGID=${PHP_WORKER_PGID}
      volumes:
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
        - ./laravel-horizon/supervisord.d:/etc/supervisord.d
@@ -268,9 +308,9 @@ services:
      build:
        context: ./nginx
        args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
          - PHP_UPSTREAM_CONTAINER=${NGINX_PHP_UPSTREAM_CONTAINER}
          - PHP_UPSTREAM_PORT=${NGINX_PHP_UPSTREAM_PORT}
-          - CHANGE_SOURCE=${CHANGE_SOURCE}
          - http_proxy
          - https_proxy
          - no_proxy
@@ -391,6 +431,7 @@ services:
      build:
        context: ./mssql
      environment:
+        - MSSQL_PID=Express
        - MSSQL_DATABASE=${MSSQL_DATABASE}
        - SA_PASSWORD=${MSSQL_PASSWORD}
        - ACCEPT_EULA=Y
@@ -489,6 +530,7 @@ services:
        - "${MONGODB_PORT}:27017"
      volumes:
        - ${DATA_PATH_HOST}/mongo:/data/db
+        - ${DATA_PATH_HOST}/mongo_config:/data/configdb
      networks:
        - backend

@@ -623,6 +665,39 @@ services:
      networks:
        - backend

+### Gearman ############################################
+    gearman:
+      build: ./gearman
+      ports:
+        - "${GEARMAN_PORT}:4730"
+      privileged: true
+      environment:
+        - GEARMAN_VERSION=${GEARMAN_VERSION}
+        - GEARMAN_VERBOSE=${GEARMAN_VERBOSE}
+        - GEARMAN_QUEUE_TYPE=${GEARMAN_QUEUE_TYPE}
+        - GEARMAN_THREADS=${GEARMAN_THREADS}
+        - GEARMAN_BACKLOG=${GEARMAN_BACKLOG}
+        - GEARMAN_FILE_DESCRIPTORS=${GEARMAN_FILE_DESCRIPTORS}
+        - GEARMAN_JOB_RETRIES=${GEARMAN_JOB_RETRIES}
+        - GEARMAN_ROUND_ROBIN=${GEARMAN_ROUND_ROBIN}
+        - GEARMAN_WORKER_WAKEUP=${GEARMAN_WORKER_WAKEUP}
+        - GEARMAN_KEEPALIVE=${GEARMAN_KEEPALIVE}
+        - GEARMAN_KEEPALIVE_IDLE=${GEARMAN_KEEPALIVE_IDLE}
+        - GEARMAN_KEEPALIVE_INTERVAL=${GEARMAN_KEEPALIVE_INTERVAL}
+        - GEARMAN_KEEPALIVE_COUNT=${GEARMAN_KEEPALIVE_COUNT}
+        - GEARMAN_MYSQL_HOST=${GEARMAN_MYSQL_HOST}
+        - GEARMAN_MYSQL_PORT=${GEARMAN_MYSQL_PORT}
+        - GEARMAN_MYSQL_USER=${GEARMAN_MYSQL_USER}
+        - GEARMAN_MYSQL_PASSWORD=${GEARMAN_MYSQL_PASSWORD}
+        - GEARMAN_MYSQL_PASSWORD_FILE=${GEARMAN_MYSQL_PASSWORD_FILE}
+        - GEARMAN_MYSQL_DB=${GEARMAN_MYSQL_DB}
+        - GEARMAN_MYSQL_TABLE=${GEARMAN_MYSQL_TABLE}
+      hostname: laradock-gearman
+      depends_on:
+        - php-fpm
+      networks:
+        - backend
+
 ### Beanstalkd Console ###################################
    beanstalkd-console:
      build: ./beanstalkd-console
@@ -889,9 +964,9 @@ services:
          - ${GRAYLOG_GELF_TCP_PORT}:12201
          # GELF UDP
          - ${GRAYLOG_GELF_UDP_PORT}:12201/udp
-        user: root
+        user: graylog
        volumes:
-          - ./graylog/config:/usr/share/graylog/data/config
+          - ${DATA_PATH_HOST}/graylog:/usr/share/graylog/data
        networks:
          - backend

@@ -1171,6 +1246,7 @@ services:
      privileged: true
      volumes:
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
+        - ${DATA_PATH_HOST}/dind:/var/lib/docker
      expose:
        - 2375
      networks:
@@ -1531,7 +1607,7 @@ services:
      volumes:
        - ${MANTICORE_CONFIG_PATH}:/etc/sphinxsearch
        - ${DATA_PATH_HOST}/manticore/data:/var/lib/manticore/data
-        - ${DATA_PATH_HOST}/manticore/log:/var/lib/manticore/log
+        - ${DATA_PATH_HOST}/manticore/log:/var/log/manticore
      ports:
        - "${MANTICORE_API_PORT}:9312"
        - "${MANTICORE_SPHINXQL_PORT}:9306"
@@ -1561,6 +1637,7 @@ services:
      networks:
        - backend
        - frontend
+
 ### CONFLUENCE ################################################
    confluence:
      container_name: Confluence
@@ -1575,3 +1652,18 @@ services:
        - postgres
      volumes:
        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
+
+### tomcat ####################################################
+    tomcat:
+      container_name: tomcat
+      image: tomcat:${TOMCAT_VERSION}
+      ports:
+        - "${TOMCAT_HOST_HTTP_PORT}:8080"
+      networks:
+        - frontend
+        - backend
+      volumes:
+        - ${DATA_PATH_HOST}/tomcat/webapps:/usr/local/tomcat/webapps
+        - ${DATA_PATH_HOST}/tomcat/logs:/usr/local/tomcat/logs
+      # restart: always
+
--- a/112
+++ b/112
@@ -37,13 +37,14 @@ COMPOSE_PROJECT_NAME=laradock

 ### PHP Version ###########################################

-# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.3 - 7.2 - 7.1 - 7.0 - 5.6
+# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
+# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 PHP_VERSION=7.3

 ### Phalcon Version ###########################################

 # Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+
-PHALCON_VERSION=3.4.1
+PHALCON_VERSION=3.4.5

 ### PHP Interpreter #######################################

@@ -69,6 +70,8 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1

 # If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true
 CHANGE_SOURCE=false
+# Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file.
+UBUNTU_SOURCE=aliyun

 ### Docker Sync ###########################################

@@ -84,6 +87,7 @@ DOCKER_SYNC_STRATEGY=native_osx
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
 WORKSPACE_COMPOSER_AUTH=false
 WORKSPACE_COMPOSER_REPO_PACKAGIST=
+WORKSPACE_NVM_NODEJS_ORG_MIRROR=
 WORKSPACE_INSTALL_NODE=true
 WORKSPACE_NODE_VERSION=node
 WORKSPACE_NPM_REGISTRY=
@@ -97,22 +101,26 @@ WORKSPACE_INSTALL_PHPREDIS=true
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_SUBVERSION=false
 WORKSPACE_INSTALL_XDEBUG=false
+WORKSPACE_INSTALL_PCOV=false
 WORKSPACE_INSTALL_PHPDBG=false
 WORKSPACE_INSTALL_SSH2=false
 WORKSPACE_INSTALL_LDAP=false
 WORKSPACE_INSTALL_GMP=false
 WORKSPACE_INSTALL_SOAP=false
 WORKSPACE_INSTALL_XSL=false
+WORKSPACE_INSTALL_SMB=false
 WORKSPACE_INSTALL_IMAP=false
 WORKSPACE_INSTALL_MONGO=false
 WORKSPACE_INSTALL_AMQP=false
 WORKSPACE_INSTALL_CASSANDRA=false
+WORKSPACE_INSTALL_GEARMAN=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_DRUSH=false
 WORKSPACE_DRUSH_VERSION=8.1.17
 WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
 WORKSPACE_INSTALL_WP_CLI=false
 WORKSPACE_INSTALL_AEROSPIKE=false
+WORKSPACE_INSTALL_OCI8=false
 WORKSPACE_INSTALL_V8JS=false
 WORKSPACE_INSTALL_LARAVEL_ENVOY=false
 WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
@@ -123,6 +131,7 @@ WORKSPACE_INSTALL_MC=false
 WORKSPACE_INSTALL_SYMFONY=false
 WORKSPACE_INSTALL_PYTHON=false
 WORKSPACE_INSTALL_POWERLINE=false
+WORKSPACE_INSTALL_SUPERVISOR=false
 WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
 WORKSPACE_INSTALL_IMAGEMAGICK=false
 WORKSPACE_INSTALL_TERRAFORM=false
@@ -138,6 +147,8 @@ WORKSPACE_INSTALL_PING=false
 WORKSPACE_INSTALL_SSHPASS=false
 WORKSPACE_INSTALL_INOTIFY=false
 WORKSPACE_INSTALL_FSWATCH=false
+WORKSPACE_INSTALL_YAML=false
+WORKSPACE_INSTALL_MAILPARSE=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_CHROME_DRIVER_VERSION=2.42
@@ -145,6 +156,8 @@ WORKSPACE_TIMEZONE=UTC
 WORKSPACE_SSH_PORT=2222
 WORKSPACE_INSTALL_FFMPEG=false
 WORKSPACE_INSTALL_GNU_PARALLEL=false
+WORKSPACE_INSTALL_AST=true
+WORKSPACE_AST_VERSION=1.0.3

 ### PHP_FPM ###############################################

@@ -157,12 +170,15 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
 PHP_FPM_INSTALL_PHPREDIS=true
 PHP_FPM_INSTALL_MEMCACHED=false
 PHP_FPM_INSTALL_XDEBUG=false
+PHP_FPM_INSTALL_PCOV=false
 PHP_FPM_INSTALL_XHPROF=false
 PHP_FPM_INSTALL_PHPDBG=false
+PHP_FPM_INSTALL_SMB=false
 PHP_FPM_INSTALL_IMAP=false
 PHP_FPM_INSTALL_MONGO=false
 PHP_FPM_INSTALL_AMQP=false
 PHP_FPM_INSTALL_CASSANDRA=false
+PHP_FPM_INSTALL_GEARMAN=false
 PHP_FPM_INSTALL_MSSQL=false
 PHP_FPM_INSTALL_SSH2=false
 PHP_FPM_INSTALL_SOAP=false
@@ -170,6 +186,7 @@ PHP_FPM_INSTALL_XSL=false
 PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE=false
+PHP_FPM_INSTALL_OCI8=false
 PHP_FPM_INSTALL_PGSQL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false
 PHP_FPM_INSTALL_LDAP=false
@@ -183,15 +200,22 @@ PHP_FPM_INSTALL_CALENDAR=false
 PHP_FPM_INSTALL_FAKETIME=false
 PHP_FPM_INSTALL_IONCUBE=false
 PHP_FPM_INSTALL_RDKAFKA=false
+PHP_FPM_INSTALL_GETTEXT=false
 PHP_FPM_FAKETIME=-0
 PHP_FPM_INSTALL_APCU=false
+PHP_FPM_INSTALL_CACHETOOL=false
 PHP_FPM_INSTALL_YAML=false
 PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false
 PHP_FPM_INSTALL_MYSQL_CLIENT=false
 PHP_FPM_INSTALL_PING=false
 PHP_FPM_INSTALL_SSHPASS=false
+PHP_FPM_INSTALL_MAILPARSE=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
+PHP_FPM_DEFAULT_LOCALE=POSIX
+
+PHP_FPM_PUID=1000
+PHP_FPM_PGID=1000

 ### PHP_WORKER ############################################

@@ -208,6 +232,8 @@ PHP_WORKER_INSTALL_TAINT=false
 PHP_WORKER_INSTALL_FFMPEG=false
 PHP_WORKER_INSTALL_GMP=false
 PHP_WORKER_INSTALL_CASSANDRA=false
+PHP_WORKER_INSTALL_GEARMAN=false
+PHP_WORKER_INSTALL_REDIS=false

 PHP_WORKER_PUID=1000
 PHP_WORKER_PGID=1000
@@ -225,6 +251,9 @@ NGINX_SSL_PATH=./nginx/ssl/
 ### LARAVEL_HORIZON ################################################

 LARAVEL_HORIZON_INSTALL_SOCKETS=false
+LARAVEL_HORIZON_INSTALL_PHPREDIS=true
+LARAVEL_HORIZON_INSTALL_MONGO=false
+LARAVEL_HORIZON_INSTALL_FFMPEG=false

 ### APACHE ################################################

@@ -270,8 +299,8 @@ PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d

 ### MSSQL #################################################

-MSSQL_DATABASE=homestead
-MSSQL_PASSWORD=yourStrong(!)Password
+MSSQL_DATABASE=master
+MSSQL_PASSWORD="yourStrong(!)Password"
 MSSQL_PORT=1433

 ### MARIADB ###############################################
@@ -359,7 +388,7 @@ MAILDEV_SMTP_PORT=25
 VARNISH_CONFIG=/etc/varnish/default.vcl
 VARNISH_PORT=8080
 VARNISH_BACKEND_PORT=8888
-VARNISHD_PARAMS=-p default_ttl=3600 -p default_grace=3600
+VARNISHD_PARAMS="-p default_ttl=3600 -p default_grace=3600"

 ### Varnish ###############################################

@@ -411,10 +440,10 @@ GRAYLOG_GELF_UDP_PORT=12201

 # 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>
+BLACKFIRE_CLIENT_ID="<client_id>"
+BLACKFIRE_CLIENT_TOKEN="<client_token>"
+BLACKFIRE_SERVER_ID="<server_id>"
+BLACKFIRE_SERVER_TOKEN="<server_token>"

 ### AEROSPIKE #############################################

@@ -523,7 +552,7 @@ FACE_DETECTOR_CASCADE_FILE=haarcascade_frontalface_alt.xml
 OPTIMIZERS=[]
 JPEGTRAN_PATH=/usr/bin/jpegtran
 PROGRESSIVE_JPEG=True
-FILTERS=["thumbor.filters.brightness", "thumbor.filters.contrast", "thumbor.filters.rgb", "thumbor.filters.round_corner", "thumbor.filters.quality", "thumbor.filters.noise", "thumbor.filters.watermark", "thumbor.filters.equalize", "thumbor.filters.fill", "thumbor.filters.sharpen", "thumbor.filters.strip_icc", "thumbor.filters.frame", "thumbor.filters.grayscale", "thumbor.filters.rotate", "thumbor.filters.format", "thumbor.filters.max_bytes", "thumbor.filters.convolution", "thumbor.filters.blur", "thumbor.filters.extract_focal", "thumbor.filters.no_upscale"]
+FILTERS="[thumbor.filters.brightness, thumbor.filters.contrast, thumbor.filters.rgb, thumbor.filters.round_corner, thumbor.filters.quality, thumbor.filters.noise, thumbor.filters.watermark, thumbor.filters.equalize, thumbor.filters.fill, thumbor.filters.sharpen, thumbor.filters.strip_icc, thumbor.filters.frame, thumbor.filters.grayscale, thumbor.filters.rotate, thumbor.filters.format, thumbor.filters.max_bytes, thumbor.filters.convolution, thumbor.filters.blur, thumbor.filters.extract_focal, thumbor.filters.no_upscale]"
 RESULT_STORAGE_EXPIRATION_SECONDS=0
 RESULT_STORAGE_FILE_STORAGE_ROOT_PATH=/data/result_storage
 RESULT_STORAGE_STORES_UNSAFE=False
@@ -575,7 +604,7 @@ GITLAB_POSTGRES_DB=laradock_gitlab

 ### GITLAB-RUNNER ###############################################
 GITLAB_CI_SERVER_URL=http://localhost:8989
-GITLAB_RUNNER_REGISTRATION_TOKEN=<my-registration-token>
+GITLAB_RUNNER_REGISTRATION_TOKEN="<my-registration-token>"
 GITLAB_REGISTER_NON_INTERACTIVE=true

 ### JUPYTERHUB ###############################################
@@ -636,8 +665,8 @@ DOCKER_WEBUI_PORT=8754

 ### MAILU ###############################################
 MAILU_VERSION=latest
-MAILU_RECAPTCHA_PUBLIC_KEY=<YOUR_RECAPTCHA_PUBLIC_KEY>
-MAILU_RECAPTCHA_PRIVATE_KEY=<YOUR_RECAPTCHA_PRIVATE_KEY>
+MAILU_RECAPTCHA_PUBLIC_KEY="<YOUR_RECAPTCHA_PUBLIC_KEY>"
+MAILU_RECAPTCHA_PRIVATE_KEY="<YOUR_RECAPTCHA_PRIVATE_KEY>"
 # Main mail domain
 MAILU_HTTP_PORT=6080
 MAILU_HTTPS_PORT=60443
@@ -653,7 +682,7 @@ MAILU_SECRET_KEY=ChangeMeChangeMe
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail)
 MAILU_TLS_FLAVOR=cert
 # Authentication rate limit (per source IP address)
-MAILU_AUTH_RATELIMIT=10/minute;1000/hour
+MAILU_AUTH_RATELIMIT="10/minute;1000/hour"
 # Opt-out of statistics, replace with "True" to opt out
 MAILU_DISABLE_STATISTICS=False
 # Message size limit in bytes
@@ -675,14 +704,14 @@ MAILU_DMARC_RUF=admin
 # Welcome email, enable and set a topic and body if you wish to send welcome
 # emails to all users.
 MAILU_WELCOME=True
-MAILU_WELCOME_SUBJECT=Welcome to your new email account
-MAILU_WELCOME_BODY=Welcome to your new email account, if you can read this, then it is configured properly!
+MAILU_WELCOME_SUBJECT="Welcome to your new email account"
+MAILU_WELCOME_BODY="Welcome to your new email account, if you can read this, then it is configured properly!"
 # Path to the admin interface if enabled
 MAILU_WEB_ADMIN=/admin
 # Path to the webmail if enabled
 MAILU_WEB_WEBMAIL=/webmail
 # Website name
-MAILU_SITENAME=Example Mail
+MAILU_SITENAME="Example Mail"
 # Linked Website URL
 MAILU_WEBSITE=http://mail.example.com
 # Default password scheme used for newly created accounts and changed passwords
@@ -739,6 +768,10 @@ SONARQUBE_POSTGRES_DB=sonar
 SONARQUBE_POSTGRES_USER=sonar
 SONARQUBE_POSTGRES_PASSWORD=sonarPass

+### TOMCAT ################################################
+TOMCAT_VERSION=8.5.43
+TOMCAT_HOST_HTTP_PORT=8080
+
 ### CASSANDRA ################################################

 # Cassandra Version, supported tags can be found at https://hub.docker.com/r/bitnami/cassandra/
@@ -771,3 +804,48 @@ CASSANDRA_ENABLE_RPC=true
 CASSANDRA_DATACENTER=dc1
 # Rack name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: rack1.
 CASSANDRA_RACK=rack1
+
+### GEARMAN ##################################################
+
+# Gearman version to use. See available tags at https://hub.docker.com/r/artefactual/gearmand
+GEARMAN_VERSION=latest
+# Port to use (Default: 6379)
+GEARMAN_PORT=6379
+# Logging Level (Default: INFO)
+GEARMAN_VERBOSE=INFO
+# Persistent queue type to use (Default: builtin)
+GEARMAN_QUEUE_TYPE=builtin
+# Number of I/O threads to use (Default: 4)
+GEARMAN_THREADS=4
+# Number of backlog connections for listen (Default: 32)
+GEARMAN_BACKLOG=32
+# Number of file descriptors to allow for the process (Default is max allowed for user)
+GEARMAN_FILE_DESCRIPTORS=
+# Number of attempts to run the job before the job server removes it. (Default: no limit = 0)
+GEARMAN_JOB_RETRIES=0
+# Assign work in round-robin order per worker connection (Default: 0)
+GEARMAN_ROUND_ROBIN=0
+# Number of workers to wakeup for each job received (Default: 0)
+GEARMAN_WORKER_WAKEUP=0
+# Enable keepalive on sockets (Default: 0)
+GEARMAN_KEEPALIVE=0
+# The duration between two keepalive transmissions in idle condition (Default: 30)
+GEARMAN_KEEPALIVE_IDLE=30
+# The duration between two successive keepalive retransmissions, if acknowledgement to the previous keepalive transmission is not received	(Default: 10)
+GEARMAN_KEEPALIVE_INTERVAL=10
+# The number of retransmissions to be carried out before declaring that remote end is not available (Default: 5)
+GEARMAN_KEEPALIVE_COUNT=5
+# Mysql server host (Default: localhost)
+GEARMAN_MYSQL_HOST=localhost
+# Mysql server port (Default: 3306)
+GEARMAN_MYSQL_PORT=3306
+# Mysql server user (Default: root)
+GEARMAN_MYSQL_USER=root
+# Mysql password
+GEARMAN_MYSQL_PASSWORD=	
+# Path to file with mysql password(Docker secrets)
+GEARMAN_MYSQL_PASSWORD_FILE=
+# Database to use by Gearman (Default: Gearmand)
+GEARMAN_MYSQL_DB=Gearmand
+# Table to use by Gearman (Default: gearman_queue)
+GEARMAN_MYSQL_TABLE=gearman_queue
--- a/gearman/Dockerfile
+++ b/gearman/Dockerfile
@@ -0,0 +1,5 @@
+ARG GEARMAN_VERSION=latest
+FROM artefactual/gearmand:${GEARMAN_VERSION}
+
+LABEL maintainer="Stefan Neuhaus <https://www.github.com/stefnats>"
+
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/kibana/kibana:6.6.0
+FROM docker.elastic.co/kibana/kibana:7.1.1

 EXPOSE 5601
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -9,6 +9,14 @@ FROM php:${PHP_VERSION}-alpine

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi
+
 RUN apk --update add wget \
  curl \
  git \
@@ -21,11 +29,21 @@ RUN apk --update add wget \
  cyrus-sasl-dev \
  libgsasl-dev \
  supervisor \
+  oniguruma-dev \
  procps

 RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
 RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 mongodb && docker-php-ext-enable memcached mongodb

+# Add a non-root user to help install ffmpeg:
+ARG PUID=1000
+ENV PUID ${PUID}
+ARG PGID=1000
+ENV PGID ${PGID}
+
+RUN addgroup -g ${PGID} laradock && \
+    adduser -D -G laradock -u ${PUID} laradock
+
 #Install BCMath package:
 ARG INSTALL_BCMATH=false
 RUN if [ ${INSTALL_BCMATH} = true ]; then \
@@ -51,6 +69,21 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
  apk --update add cassandra-cpp-driver \
  ;fi

+# Install PhpRedis package:
+ARG INSTALL_PHPREDIS=false
+RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
+    # Install Php Redis Extension
+    printf "\n" | pecl install -o -f redis \
+    &&  rm -rf /tmp/pear \
+    &&  docker-php-ext-enable redis \
+;fi
+
+ARG INSTALL_FFMPEG=false
+RUN if [ ${INSTALL_FFMPEG} = true ]; then \
+   # Add ffmpeg to horizon
+    apk add ffmpeg \
+;fi
+
 WORKDIR /usr/src
 RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
  git clone https://github.com/datastax/php-driver.git \
@@ -65,6 +98,12 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
  && docker-php-ext-enable cassandra \
 ;fi

+# Install MongoDB drivers:
+ARG INSTALL_MONGO=false
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+  pecl install mongodb \
+  && docker-php-ext-enable mongodb \
+  ;fi


 ###########################################################################
@@ -78,7 +117,7 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
  curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"; \
  else \
-  curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz"; \
+  curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/v3.1.3.tar.gz"; \
  fi \
  && mkdir -p memcached \
  && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
--- a/laravel-horizon/supervisord.d/laravel-horizon.conf.example
+++ b/laravel-horizon/supervisord.d/laravel-horizon.conf.example
@@ -1,5 +1,6 @@
 [program:laravel-horizon]
 process_name=%(program_name)s_%(process_num)02d
+user=laradock
 command=php /var/www/artisan horizon
 autostart=true
 autorestart=true
--- a/manticore/config/sphinx.conf
+++ b/manticore/config/sphinx.conf
@@ -11,12 +11,12 @@ searchd {
    listen = 9312
    listen = 9308:http
    listen = 9306:mysql41
-    log = /var/lib/manticore/log/searchd.log
+    log = /var/log/manticore/searchd.log
    # you can also send query_log to /dev/stdout to be shown in docker logs
-    query_log = /var/lib/manticore/log/query.log
+    query_log = /var/log/manticore/query.log
    read_timeout = 5
    max_children = 30
-    pid_file = /var/run/searchd.pid
+    pid_file = /var/run/manticore/searchd.pid
    seamless_rotate = 1
    preopen_indexes = 1
    unlink_old = 1
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -12,6 +12,8 @@ ENV TZ ${TZ}
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && chown -R mysql:root /var/lib/mysql/
 COPY my.cnf /etc/mysql/conf.d/my.cnf

+RUN chmod -R 644 /etc/mysql/conf.d/my.cnf
+
 CMD ["mysqld"]

 EXPOSE 3306
--- a/mssql/Dockerfile
+++ b/mssql/Dockerfile
@@ -1,17 +1,6 @@
-FROM microsoft/mssql-server-linux
-
-LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
-
-# Create config directory
-# an set it as WORKDIR
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# Bundle app source
-COPY . /usr/src/app
-
-RUN chmod +x /usr/src/app/create_table.sh
+FROM mcr.microsoft.com/mssql/server:2017-latest-ubuntu

+ENV MSSQL_PID=Express
 ENV MSSQL_DATABASE=$MSSQL_DATABASE
 ENV ACCEPT_EULA=Y
 ENV SA_PASSWORD=$MSSQL_PASSWORD
@@ -19,5 +8,3 @@ ENV SA_PASSWORD=$MSSQL_PASSWORD
 VOLUME /var/opt/mssql

 EXPOSE 1433
-
-CMD /bin/bash ./entrypoint.sh
--- a/mssql/create_table.sh
+++ b/mssql/create_table.sh
@@ -1,5 +0,0 @@
-#wait for the SQL Server to come up
-sleep 45
-
-#run the setup script to create the DB and the schema in the DB
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -i setup.sql
--- a/mssql/entrypoint.sh
+++ b/mssql/entrypoint.sh
@@ -1,2 +0,0 @@
-#start SQL Server, start the script to create the DB and import the data, start the app
-/opt/mssql/bin/sqlservr & /usr/src/app/create_table.sh & tail -f /dev/null
--- a/mssql/setup.sql
+++ b/mssql/setup.sql
@@ -1,4 +0,0 @@
-CREATE DATABASE $(MSSQL_DATABASE);
-GO
-USE $(MSSQL_DATABASE);
-GO
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -13,6 +13,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &

 COPY my.cnf /etc/mysql/conf.d/my.cnf

+RUN chmod 0444 /etc/mysql/conf.d/my.cnf
+
 CMD ["mysqld"]

 EXPOSE 3306
--- a/nginx/sites/confluence.conf.example
+++ b/nginx/sites/confluence.conf.example
@@ -0,0 +1,43 @@
+server {
+    listen 80;
+    listen [::]:80;
+    server_name www.confluence-domain.com;
+    rewrite ^(.*) https://confluence-domain.com$1/ permanent;
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name confluence-domain.com;
+    rewrite ^(.*) https://confluence-domain.com/ permanent;
+}
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    ssl_certificate /etc/nginx/ssl/confluence-domain.com.crt;
+    ssl_certificate_key /etc/nginx/ssl/confluence-domain.com.key;
+
+    server_name confluence-domain.com;
+
+    location / {
+            client_max_body_size 100m;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Server $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://confluence-domain.com:8090/;
+    }
+
+    location /synchrony {
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://confluence-domain.com:8090/synchrony-proxy;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    error_log /var/log/nginx/bookchangerru_error.log;
+    access_log /var/log/nginx/bookchangerru_access.log;
+}
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -14,7 +14,7 @@

 ARG LARADOCK_PHP_VERSION

-FROM laradock/php-fpm:2.5-${LARADOCK_PHP_VERSION}
+FROM laradock/php-fpm:2.7-${LARADOCK_PHP_VERSION}

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

@@ -23,6 +23,16 @@ ARG LARADOCK_PHP_VERSION
 # Set Environment Variables
 ENV DEBIAN_FRONTEND noninteractive

+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from deb.debian.org to aliyun source
+    sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \
+;fi
+
 # always run apt update when start and after add new source list, then clean up at end.
 RUN set -xe; \
    apt-get update -yqq && \
@@ -41,7 +51,11 @@ RUN set -xe; \
      #
      # next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
      libzip-dev zip unzip && \
-      docker-php-ext-configure zip --with-libzip && \
+      if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
+        docker-php-ext-configure zip; \
+      else \
+        docker-php-ext-configure zip --with-libzip; \
+      fi && \
      # Install the zip extension
      docker-php-ext-install zip && \
      php -m | grep -q 'zip'
@@ -163,6 +177,24 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /usr/local/e
    sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /usr/local/etc/php/conf.d/xdebug.ini && \
    sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /usr/local/etc/php/conf.d/xdebug.ini

+###########################################################################
+# pcov:
+###########################################################################
+
+USER root
+
+ARG INSTALL_PCOV=false
+
+RUN if [ ${INSTALL_PCOV} = true ]; then \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
+    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
+      pecl install pcov && \
+      docker-php-ext-enable pcov \
+    ;fi \
+  ;fi \
+;fi
+
+
 ###########################################################################
 # Phpdbg:
 ###########################################################################
@@ -196,9 +228,13 @@ ARG INSTALL_PHPREDIS=false

 RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
    # Install Php Redis Extension
-    printf "\n" | pecl install -o -f redis \
-    &&  rm -rf /tmp/pear \
-    &&  docker-php-ext-enable redis \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+      pecl install -o -f redis-4.3.0; \
+    else \
+      pecl install -o -f redis; \
+    fi \
+    && rm -rf /tmp/pear \
+    && docker-php-ext-enable redis \
 ;fi

 ###########################################################################
@@ -260,9 +296,9 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_XHPROF=false

 RUN if [ ${INSTALL_XHPROF} = true ]; then \
-    # Install the php xhprof extension 
+    # Install the php xhprof extension
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = 7 ]; then \
-      curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v4.1.7.tar.gz"; \
+      curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v5.0.1.tar.gz"; \
    else \ 
      curl -L -o /tmp/xhprof.tar.gz "https://codeload.github.com/phacility/xhprof/tar.gz/master"; \
    fi \
@@ -309,6 +345,30 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
    docker-php-ext-install sockets \
 ;fi

+###########################################################################
+# GEARMAN:
+###########################################################################
+
+ARG INSTALL_GEARMAN=false
+
+RUN if [ ${INSTALL_GEARMAN} = true ]; then \
+    apt-get update && \
+    apt-get -y install libgearman-dev && \
+    cd /tmp && \
+    curl -L https://github.com/wcgallego/pecl-gearman/archive/gearman-2.0.5.zip -O && \
+    unzip gearman-2.0.5.zip && \
+    mv pecl-gearman-gearman-2.0.5 pecl-gearman && \
+    cd /tmp/pecl-gearman && \
+    phpize && \
+    ./configure && \
+    make -j$(nproc) && \
+    make install && \
+    cd / && \
+    rm /tmp/gearman-2.0.5.zip && \
+    rm -r /tmp/pecl-gearman && \
+    docker-php-ext-enable gearman \
+;fi
+
 ###########################################################################
 # pcntl
 ###########################################################################
@@ -354,21 +414,10 @@ ARG INSTALL_MEMCACHED=false
 RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
    # Install the php memcached extension
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-      curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"; \
+      pecl install memcached-2.2.0; \
    else \
-      curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz"; \
+      pecl install memcached-3.1.3; \
    fi \
-    && mkdir -p memcached \
-    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
-    && ( \
-        cd memcached \
-        && phpize \
-        && ./configure \
-        && make -j$(nproc) \
-        && make install \
-    ) \
-    && rm -r memcached \
-    && rm /tmp/memcached.tar.gz \
    && docker-php-ext-enable memcached \
 ;fi

@@ -423,6 +472,51 @@ RUN set -xe; \
    && docker-php-ext-enable aerospike \
 ;fi

+###########################################################################
+# PHP OCI8:
+###########################################################################
+
+ARG INSTALL_OCI8=false
+
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
+ENV OCI_HOME="/opt/oracle/instantclient_12_1"
+ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
+ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
+ENV OCI_VERSION=12
+
+RUN if [ ${INSTALL_OCI8} = true ]; then \
+    # Install wget
+    apt-get update && apt-get install --no-install-recommends -y wget \
+    # Install Oracle Instantclient
+    && mkdir /opt/oracle \
+        && cd /opt/oracle \
+        && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
+        && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
+        && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+        && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+        && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
+        && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
+        && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
+        && rm -rf /opt/oracle/*.zip \
+    # Install PHP extensions deps
+    && apt-get update \
+        && apt-get install --no-install-recommends -y \
+            libaio-dev \
+            freetds-dev && \
+    # Install PHP extensions
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \
+    else \
+      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
+    fi \
+        && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_12_1,12.1 \
+        && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \
+        && docker-php-ext-install \
+                pdo_oci \
+        && docker-php-ext-enable \
+                oci8 \
+  ;fi
+
 ###########################################################################
 # IonCube Loader:
 ###########################################################################
@@ -568,6 +662,16 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
    docker-php-ext-enable imagick \
 ;fi

+###########################################################################
+# SMB:
+###########################################################################
+
+ARG INSTALL_SMB=false
+
+RUN if [ ${INSTALL_SMB} = true ]; then \
+    apt-get install -y smbclient php-smbclient coreutils \
+;fi
+
 ###########################################################################
 # IMAP:
 ###########################################################################
@@ -659,6 +763,17 @@ RUN if [ ${INSTALL_RDKAFKA} = true ]; then \
    docker-php-ext-enable rdkafka \
 ;fi

+###########################################################################
+# GETTEXT:
+###########################################################################
+
+ARG INSTALL_GETTEXT=false
+
+RUN if [ ${INSTALL_GETTEXT} = true ]; then \
+    apt-get install -y zlib1g-dev libicu-dev g++ libpq-dev libssl-dev gettext && \
+    docker-php-ext-install gettext \
+;fi
+
 ###########################################################################
 # Install additional locales:
 ###########################################################################
@@ -685,7 +800,11 @@ ARG INSTALL_MYSQL_CLIENT=false

 RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
    apt-get update -yqq && \
-    apt-get -y install mysql-client \
+    if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
+      apt-get -y install default-mysql-client \
+    ;else \
+      apt-get -y install mysql-client \
+    ;fi \
 ;fi

 ###########################################################################
@@ -727,6 +846,35 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
    apt-get -y install ffmpeg \
 ;fi

+###########################################################################
+# Mailparse extension:
+###########################################################################
+
+ARG INSTALL_MAILPARSE=false
+
+RUN if [ ${INSTALL_MAILPARSE} = true ]; then \
+    # Install mailparse extension
+    printf "\n" | pecl install -o -f mailparse \
+    &&  rm -rf /tmp/pear \
+    &&  docker-php-ext-enable mailparse \
+;fi
+
+###########################################################################
+# CacheTool:
+###########################################################################
+
+ARG INSTALL_CACHETOOL=false
+
+RUN if [ ${INSTALL_CACHETOOL} = true ]; then \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -ge 1 ]; then \
+            curl -sO http://gordalina.github.io/cachetool/downloads/cachetool.phar; \
+    else \
+        curl http://gordalina.github.io/cachetool/downloads/cachetool-3.2.1.phar -o cachetool.phar; \
+    fi && \
+    chmod +x cachetool.phar && \
+    mv cachetool.phar /usr/local/bin/cachetool \
+;fi
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################
@@ -749,7 +897,14 @@ RUN apt-get clean && \
    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
    rm /var/log/lastlog /var/log/faillog

-RUN usermod -u 1000 www-data
+# Configure non-root user.
+ARG PUID=1000
+ENV PUID ${PUID}
+ARG PGID=1000
+ENV PGID ${PGID}
+
+RUN groupmod -o -g ${PGID} www-data && \
+    usermod -o -u ${PUID} -g www-data www-data

 # Adding the faketime library to the preload file needs to be done last
 # otherwise it will preload it for all commands that follow in this file
@@ -757,6 +912,10 @@ RUN if [ ${INSTALL_FAKETIME} = true ]; then \
    echo "/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1" > /etc/ld.so.preload \
 ;fi

+# Configure locale.
+ARG LOCALE=POSIX
+ENV LC_ALL ${LOCALE}
+
 WORKDIR /var/www

 CMD ["php-fpm"]
--- a/php-fpm/php7.4.ini
+++ b/php-fpm/php7.4.ini
--- a/php-fpm/xhprof.ini
+++ b/php-fpm/xhprof.ini
@@ -1,6 +1,6 @@
 [xhprof]
 ; extension=xhprof.so
-extension=tideways.so
+extension=tideways_xhprof.so
 xhprof.output_dir=/var/www/xhprof
 ; no need to autoload, control in the program
 tideways.auto_prepend_library=0
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -9,6 +9,14 @@ FROM php:${PHP_VERSION}-alpine

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi
+
 RUN apk --update add wget \
  curl \
  git \
@@ -21,6 +29,7 @@ RUN apk --update add wget \
  autoconf \
  cyrus-sasl-dev \
  libgsasl-dev \
+  oniguruma-dev \
  supervisor

 RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
@@ -66,7 +75,11 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
 # Install MySQL Client:
 ARG INSTALL_MYSQL_CLIENT=false
 RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
-    apk --update add mysql-client \
+    if [ ${PHP_VERSION} = "7.3" ]; then \
+      apk --update add default-mysql-client \
+    ;else \
+      apk --update add mysql-client \
+    ;fi \
 ;fi

 # Install FFMPEG:
@@ -85,6 +98,17 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
    docker-php-ext-install sockets \
 ;fi

+# Install Gearman:
+ARG INSTALL_GEARMAN=false
+
+RUN if [ ${INSTALL_GEARMAN} = true ]; then \
+    sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/main" /etc/apk/repositories && \
+    sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/community" /etc/apk/repositories && \
+    sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/testing" /etc/apk/repositories && \
+    apk --update add php7-gearman && \
+    sh -c 'echo "extension=/usr/lib/php7/modules/gearman.so" > /usr/local/etc/php/conf.d/gearman.ini' \
+;fi
+
 # Install Cassandra drivers:
 ARG INSTALL_CASSANDRA=false
 RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
@@ -119,6 +143,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
    && rm -rf /tmp/cphalcon* \
 ;fi

+ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
    apk --update add ghostscript \
 ;fi
@@ -130,10 +155,14 @@ RUN if [ ${INSTALL_GMP} = true ]; then \
   && docker-php-ext-install gmp \
 ;fi

-
-RUN rm /var/cache/apk/* \
-    && mkdir -p /var/www
-
+# Install Redis package:
+ARG INSTALL_REDIS=false
+RUN if [ ${INSTALL_REDIS} = true ]; then \
+    # Install Redis Extension
+    printf "\n" | pecl install -o -f redis \
+    &&  rm -rf /tmp/pear \
+    &&  docker-php-ext-enable redis \
+;fi

 ###########################################################################
 # Swoole EXTENSION
@@ -205,4 +234,8 @@ RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
 #--------------------------------------------------------------------------
 #

+# Clean up
+RUN rm /var/cache/apk/* \
+    && mkdir -p /var/www
+
 WORKDIR /etc/supervisor/conf.d/
--- a/phpmyadmin/Dockerfile
+++ b/phpmyadmin/Dockerfile
@@ -5,5 +5,10 @@ LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>"
 # Add volume for sessions to allow session persistence
 VOLUME /sessions

+RUN echo '' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo '[PHP]' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo 'post_max_size = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo 'upload_max_filesize = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini
+
 # We expose phpMyAdmin on port 80
 EXPOSE 80
--- a/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
+++ b/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
@@ -33,7 +33,7 @@
 # EOSQL
 # 
 ### default database and user for confluence ##############################################
-if [ "$POSTGRES_CONFLUENCE_INIT" == 'true' ]; then
+if [ "$CONFLUENCE_POSTGRES_INIT" == 'true' ]; then
 	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
 		CREATE USER $POSTGRES_CONFLUENCE_USER WITH PASSWORD '$POSTGRES_CONFLUENCE_PASSWORD';
 		CREATE DATABASE $POSTGRES_CONFLUENCE_DB;
@@ -41,4 +41,4 @@ if [ "$POSTGRES_CONFLUENCE_INIT" == 'true' ]; then
 		ALTER ROLE $POSTGRES_CONFLUENCE_USER CREATEROLE SUPERUSER;
 	EOSQL
 	echo
-fi
+fi
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -14,7 +14,7 @@

 ARG LARADOCK_PHP_VERSION

-FROM laradock/workspace:2.5-${LARADOCK_PHP_VERSION}
+FROM laradock/workspace:2.6.1-${LARADOCK_PHP_VERSION}

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

@@ -23,6 +23,16 @@ ARG LARADOCK_PHP_VERSION
 # Set Environment Variables
 ENV DEBIAN_FRONTEND noninteractive

+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from deb.debian.org to aliyun source
+    sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \
+;fi
+
 # Start as root
 USER root

@@ -36,6 +46,15 @@ ENV PUID ${PUID}
 ARG PGID=1000
 ENV PGID ${PGID}

+ARG CHANGE_SOURCE=false
+ARG UBUNTU_SOURCE
+COPY ./sources.sh /tmp/sources.sh
+
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    /bin/sh -c /tmp/sources.sh && \
+    rm -rf /tmp/sources.sh \
+;fi
+
 # always run apt update when start and after add new source list, then clean up at end.
 RUN set -xe; \
    apt-get update -yqq && \
@@ -279,6 +298,16 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
    apt-get install -y php${LARADOCK_PHP_VERSION}-ldap \
 ;fi

+###########################################################################
+# SMB:
+###########################################################################
+
+ARG INSTALL_SMB=false
+
+RUN if [ ${INSTALL_SMB} = true ]; then \
+    apt-get install -y smbclient php-smbclient coreutils \
+;fi
+
 ###########################################################################
 # IMAP:
 ###########################################################################
@@ -323,6 +352,25 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${L
    sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
    sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini

+###########################################################################
+# pcov:
+###########################################################################
+
+USER root
+
+ARG INSTALL_PCOV=false
+
+RUN if [ ${INSTALL_PCOV} = true ]; then \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
+    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
+      pecl install pcov && \
+      echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
+      echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
+    ;fi \
+  ;fi \
+;fi
+
+
 ###########################################################################
 # Phpdbg:
 ###########################################################################
@@ -436,6 +484,18 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
    ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/cassandra.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-cassandra.ini \
 ;fi

+###########################################################################
+# Gearman:
+###########################################################################
+
+ARG INSTALL_GEARMAN=false
+
+RUN if [ ${INSTALL_GEARMAN} = true ]; then \
+    add-apt-repository -y ppa:ondrej/pkg-gearman && \
+    apt-get update && \
+    apt-get install php-gearman -y  \
+;fi
+
 ###########################################################################
 # PHP REDIS EXTENSION
 ###########################################################################
@@ -508,6 +568,21 @@ RUN if [ ${INSTALL_INOTIFY} = true ]; then \
    ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \
 ;fi

+###########################################################################
+# AST EXTENSION
+###########################################################################
+
+ARG INSTALL_AST=false
+ARG AST_VERSION=1.0.3
+ENV AST_VERSION ${AST_VERSION}
+
+RUN if [ ${INSTALL_AST} = true ]; then \
+    # Install AST extension
+    printf "\n" | pecl -q install ast-${AST_VERSION} && \
+    echo "extension=ast.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ast.ini && \
+    phpenmod -v ${LARADOCK_PHP_VERSION} -s cli ast \
+;fi
+
 ###########################################################################
 # fswatch
 ###########################################################################
@@ -568,6 +643,8 @@ ARG INSTALL_NPM_ANGULAR_CLI=false
 ARG NPM_REGISTRY
 ENV NPM_REGISTRY ${NPM_REGISTRY}
 ENV NVM_DIR /home/laradock/.nvm
+ARG NVM_NODEJS_ORG_MIRROR
+ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR}

 RUN if [ ${INSTALL_NODE} = true ]; then \
    # Install nvm (A Node Version Manager)
@@ -708,6 +785,47 @@ RUN set -xe; \
    && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \
  ;fi

+###########################################################################
+# PHP OCI8:
+###########################################################################
+
+USER root
+ARG INSTALL_OCI8=false
+
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
+ENV OCI_HOME="/opt/oracle/instantclient_12_1"
+ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
+ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
+ENV OCI_VERSION=12
+
+RUN if [ ${INSTALL_OCI8} = true ]; then \
+  # Install wget
+  apt-get update && apt-get install --no-install-recommends -y wget \
+  # Install Oracle Instantclient
+  && mkdir /opt/oracle \
+      && cd /opt/oracle \
+      && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
+      && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
+      && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+      && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+      && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
+      && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
+      && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
+      && rm -rf /opt/oracle/*.zip \
+  # Install PHP extensions deps
+  && apt-get update \
+      && apt-get install --no-install-recommends -y \
+          libaio-dev && \
+  # Install PHP extensions
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \
+  else \
+    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
+  fi \
+  && echo "extension=oci8.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
+  && php -m | grep -q 'oci8' \
+;fi
+
 ###########################################################################
 # PHP V8JS:
 ###########################################################################
@@ -765,13 +883,6 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \
    composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \
 ;fi

-ARG INSTALL_LARAVEL_INSTALLER=false
-
-RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
-    # Install the Laravel Installer
-	composer global require "laravel/installer" \
-;fi
-
 ###########################################################################
 # Deployer:
 ###########################################################################
@@ -945,6 +1056,20 @@ RUN if [ ${INSTALL_POWERLINE} = true ]; then \
  ;fi \
 ;fi

+###########################################################################
+# SUPERVISOR:
+###########################################################################
+ARG INSTALL_SUPERVISOR=false
+
+RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \
+    if [ ${INSTALL_PYTHON} = true ]; then \
+    python -m pip install --upgrade supervisor && \
+    echo_supervisord_conf > /etc/supervisord.conf && \
+    sed -i 's/\;\[include\]/\[include\]/g' /etc/supervisord.conf && \
+    sed -i 's/\;files\s.*/files = supervisord.d\/*.conf/g' /etc/supervisord.conf \
+  ;fi \
+;fi
+
 USER laradock

 ###########################################################################
@@ -1075,6 +1200,25 @@ RUN if [ ${INSTALL_SSHPASS} = true ]; then \
    apt-get -y install sshpass \
 ;fi

+###########################################################################
+# YAML: extension for PHP-CLI
+###########################################################################
+
+USER root
+
+ARG INSTALL_YAML=false
+
+RUN if [ ${INSTALL_YAML} = true ]; then \
+    apt-get install libyaml-dev -y ; \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+        pecl install -a yaml-1.3.2; \
+    else \
+        pecl install yaml; \
+    fi && \
+    echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini && \
+    ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \
+;fi
+
 ###########################################################################
 # FFMpeg:
 ###########################################################################
@@ -1087,6 +1231,16 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
  apt-get -y install ffmpeg \
 ;fi

+###########################################################################
+# Mailparse extension:
+###########################################################################
+
+ARG INSTALL_MAILPARSE=false
+
+RUN if [ ${INSTALL_MAILPARSE} = true ]; then \
+    apt-get install -yqq php-mailparse \
+;fi
+
 ###########################################################################
 # GNU Parallel:
 ###########################################################################
--- a/workspace/sources.sh
+++ b/workspace/sources.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+set -xe;
+
+if type "tee" 2>/dev/null && [ -n "${UBUNTU_SOURCE}" ]; then
+    SOURCE_PATH="/etc/apt/sources.list"
+    cp ${SOURCE_PATH} ${SOURCE_PATH}.bak && rm -rf ${SOURCE_PATH}
+    case "${UBUNTU_SOURCE}" in
+        "aliyun")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "zju")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+EOF
+;;
+        "tsinghua")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        "163")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "ustc")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        *)
+            echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter"
+            exit 1;;
+    esac
+fi