Merge pull request #2953 from laradock/enchant

feat(support enchant extension): php-fpm

.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"
+}

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mahmoud@zalt.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

.github/CONTRIBUTING.md

@@ -1,3 +0,0 @@
-### First off, thanks for taking the time to contribute!
-
-For the contribution guide [click here](http://laradock.io/contributing/).

.github/FUNDING.yml

@@ -0,0 +1,6 @@
+# DO NOT CHANGE THIS FILE PLEASE.
+
+github: Mahmoudz
+open_collective: laradock
+custom: ['paypal.me/mzmmzz']
+patreon: zalt

.github/ISSUE_TEMPLATE.md

@@ -1,23 +0,0 @@
-### Info:
-- Docker version (`$ docker --version`): 
-- Laradock commit (`$ git rev-parse HEAD`): 
-- System info (Mac, PC, Linux): 
-- System info disto/version: 
-
-### Issue:
-<!--- What seems to be wrong? -->
-_____
-
-### Expected behavior:
-<!--- What should happen instead? -->
-_____
-
-### Reproduce:
-<!--- How can we reproduce the error? -->
-_____
-
-### Relevant Code:
-
-```
-// place a code sample here
-```

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,50 @@
+---
+name: "Bug report"
+about: "Report a general issue, encountered while using Laradock."
+labels: "Type: Bug"
+---
+
+### Description:
+<!-- A clear and concise description of what the bug is. -->
+
+### Expected Behavior:
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Context information:
+
+**Output of `git rev-parse HEAD`**
+
+```
+{paste here}
+```
+
+**Output of `docker version`**
+
+```
+{paste here}
+```
+
+**Output of `docker-compose version`**
+
+```
+{paste here}
+```
+
+**System info: Mac, Windows or Linux. Include which disto/version**
+
+```
+{paste here}
+```
+
+### Steps to reproduce the issue:
+<!--- How can we reproduce the issue? -->
+
+1.
+2.
+3.
+
+### Stacktrace & Additional info:
+
+```
+{paste here}
+```

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support question
+    url: https://gitter.im/LaraDock/laradock
+    about: 'This repository is only for reporting bugs. If you need help, get in touch with us via Gitter.'

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: "Feature request"
+about: "Suggest an idea for this project."
+labels: "Type: Feature Request"
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,18 @@
-<!--- Thank you for contributing to Laradock -->
+## Description
+<!--- Describe your changes in detail -->
+<!--- If it fixes an open issue, please link to the issue here. -->
 
-##### I completed the 3 steps below:
+## Motivation and Context
+<!--- What problem does it solve, or what feature does it add? -->
 
+## Types of Changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [] Bug fix (non-breaking change which fixes an issue).
+- [] New feature (non-breaking change which adds functionality).
+- [] Breaking change (fix or feature that would cause existing functionality to not work as expected).
+
+## Definition of Done Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 - [] I've read the [Contribution Guide](http://laradock.io/contributing).
 - [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
 - [] I enjoyed my time contributing and making developer's life easier :)

.github/README.md

@@ -1,97 +0,0 @@
-<p align="center">
-    <img src="https://s19.postimg.org/jblfytw9f/laradock-logo.jpg" alt="Laradock Logo"/>
-</p>
-
-<p align="center">A Docker PHP development environment that facilitates running PHP Apps 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 And Learn About It Later</h4>
-
-<p align="center">
-    <a href="https://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://s19.postimg.org/ecnn9vdw3/Screen_Shot_2017-08-01_at_5.08.54_AM.png" width=300px" alt="Laradock Docs"/>
-	</a>
-</p>
-
-
-## Sponsors
-
-Support this project by becoming a sponsor. 
-
-Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
-
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
-</a>
-
-
-<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>
-<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
-
-
-## Contributors
-
-#### Core contributors:
-- [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
-- [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
-- [Philippe Trépanier](https://github.com/philtrep) @philtrep
-- [Mike Erickson](https://github.com/mikeerickson) @mikeerickson
-- [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
-- [Thor Erik](https://github.com/thorerik) @thorerik
-- [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
-- [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
-- Join us, by submitting 20 useful PR's.
-
-#### Awesome contributors:
-
-<a href="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://www.paypal.me/mzalt)
-
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 
-
-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>
-
-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)
-
-
-## License
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE)

.github/SUPPORT.md

@@ -0,0 +1,3 @@
+# Support Questions
+
+For help, please visit our official chatting room on [Gitter](https://gitter.im/Laradock/laradock).

.github/stale.yml

@@ -0,0 +1,21 @@
+# Configuration for Github probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 21
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - 'Type: Feature Request'
+# Label to use when marking an issue as stale
+staleLabel: Stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hi 👋 this issue has been automatically marked as `stale` 📌 because it has not had recent activity 😴.
+  It will be closed if no further activity occurs. Thank you for your contributions ❤️.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  Hi again 👋 we would like to inform you that this issue has been automatically `closed` 🔒 because it had not recent activity during the `stale` period.
+  We really really appreciate your contributions, and looking forward for more in the future 🎈.
+# Limit to only `issues` or `pulls`
+only: issues

.github/workflows/main-ci.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches: '**'
+    tags: '**'
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
+
+jobs:
+  build-php:
+    # Don't trigger on schedule event when in a fork
+    if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'laradock/laradock')
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php_version: ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0"]
+        service: [php-fpm, php-worker, workspace, laravel-horizon]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the Docker image
+      env:
+        PHP_VERSION: ${{ matrix.php_version }}
+      run: |
+        set -eux
+        cp .env.example .env
+        sed -i -- 's/=false/=true/g' .env
+        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+        sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
+        sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env
+        sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env
+        sed -i -- 's/AEROSPIKE=true/AEROSPIKE=false/g' .env
+        sed -i -- 's/PHALCON=true/PHALCON=false/g' .env
+        sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
+        sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
+        sed -i -- 's/OCI8=true/OCI8=false/g' .env
+        sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env
+        sed -i -- 's/V8JS=true/V8JS=false/g' .env
+        docker-compose build ${{ matrix.service }}
+        docker-compose up -d --no-deps -- ${{ matrix.service }}
+        docker-compose exec -T -- ${{ matrix.service }} php -m
+        docker-compose down
+
+  build-other:
+    # Don't trigger on schedule event when in a fork
+    if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'laradock/laradock')
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        service: ['nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo']
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the Docker image
+      run: |
+        cp .env.example .env
+        sed -i -- 's/=false/=true/g' .env
+        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+        docker-compose build ${{ matrix.service }}

.gitignore

@@ -3,4 +3,25 @@
 /data
 .env
 /.project
-.docker-sync
+.docker-sync
+/jenkins/jenkins_home
+
+/logstash/pipeline/*.conf
+/logstash/config/pipelines.yml
+
+/nginx/ssl/*.crt
+/nginx/ssl/*.key
+/nginx/ssl/*.csr
+
+/apache2/ssl/*.crt
+/apache2/ssl/*.key
+/apache2/ssl/*.csr
+/apache2/ssl/*.org
+
+/.devcontainer/*
+!/.devcontainer/devcontainer.example.json
+!/.devcontainer/docker-compose.extend-example.yml
+
+docker-compose.custom.yml
+
+.DS_Store

.gitpod.yml

@@ -0,0 +1,2 @@
+image: gitpod/workspace-full
+

.travis.yml

@@ -7,37 +7,31 @@ env:
   matrix:
     - HUGO_VERSION=0.20.2
 
-    - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
+    - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
 
-    - PHP_VERSION=56 BUILD_SERVICE=workspace
-    - PHP_VERSION=70 BUILD_SERVICE=workspace
-    - PHP_VERSION=71 BUILD_SERVICE=workspace
+    # - PHP_VERSION=5.6 BUILD_SERVICE=php-worker
+    - PHP_VERSION=7.0 BUILD_SERVICE=php-worker
+    - 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=8.0 BUILD_SERVICE=php-worker
 
-    - PHP_VERSION=56 BUILD_SERVICE=php-fpm
-    - PHP_VERSION=70 BUILD_SERVICE=php-fpm
-    - PHP_VERSION=71 BUILD_SERVICE=php-fpm
+    - 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=8.0 BUILD_SERVICE=laravel-horizon
 
-    - PHP_VERSION=56 BUILD_SERVICE="php-worker hhvm"
-    - PHP_VERSION=70 BUILD_SERVICE="php-worker hhvm"
-    - PHP_VERSION=71 BUILD_SERVICE="php-worker hhvm"
-
-    - PHP_VERSION=56 BUILD_SERVICE=mssql
-    - PHP_VERSION=70 BUILD_SERVICE=mssql
-    - PHP_VERSION=71 BUILD_SERVICE=mssql
-
-    - PHP_VERSION=56 BUILD_SERVICE=rethinkdb
-    - PHP_VERSION=70 BUILD_SERVICE=rethinkdb
-    - PHP_VERSION=71 BUILD_SERVICE=rethinkdb
-
-    - PHP_VERSION=56 BUILD_SERVICE=aerospike
-    - PHP_VERSION=70 BUILD_SERVICE=aerospike
-    - PHP_VERSION=71 BUILD_SERVICE=aerospike
-
-    - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - 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 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"
 
 # Installing a newer Docker version
 before_install:

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "editorconfig.editorconfig",
+        "mikestead.dotenv"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        ".env.example": "dotenv",
+        "Dockerfile-*": "dockerfile"
+    }
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Laradock Code of Conduct
+
+We follow the [Contributor Covenant](https://www.contributor-covenant.org/version/1/4/code-of-conduct) Code of Conduct.

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Thank you for your consideration
+
+Checkout out our [contribution guide](http://laradock.io/contributing).

DOCUMENTATION/config.toml

@@ -1,4 +1,4 @@
-baseurl = "http://laradock.io/"
+baseurl = "https://laradock.io/"
 languageCode = "en-us"
 publishDir = "../docs"
 title = "Laradock"
@@ -17,16 +17,16 @@ googleAnalytics = "UA-37514928-9"
 
 	# Repository
 	provider = ""
-	repo_url = ""
+	repo_url = "https://github.com/laradock/laradock"
 
 	version = ""
-	logo = "images/logo.png"
-	favicon = ""
+	logo = "images/favicons/ms-icon-310x310.png"
+	favicon = "images/favicons/favicon.ico"
 
 	permalink = "#"
 
 	# Custom assets
-	custom_css = []
+	custom_css = ["custom-style.css"]
 	custom_js  = []
 
 	# Syntax highlighting theme
@@ -43,7 +43,7 @@ googleAnalytics = "UA-37514928-9"
 [social]
 	twitter = ""
 	github  = "laradock/laradock"
-	email   = ""
+	email   = "support@laradock.io"
 
 # ------- MENU START -----------------------------------------
 
@@ -62,30 +62,20 @@ googleAnalytics = "UA-37514928-9"
 	url    = "documentation/"
 	weight = 3
 
-[[menu.main]]
-	name   = "Guides"
-	url    = "guides/"
-	weight = 4
-
 [[menu.main]]
 	name   = "Help & Questions"
 	url    = "help/"
-	weight = 5
+	weight = 4
 
 [[menu.main]]
 	name   = "Related Projects"
 	url    = "related-projects/"
-	weight = 6
+	weight = 5
 
 [[menu.main]]
-	name   = "Contributing"
+	name   = "Contributions"
 	url    = "contributing/"
-	weight = 7
-
-[[menu.main]]
-	name   = "License"
-	url    = "license/"
-	weight = 8
+	weight = 6
 
 # ------- MENU END -----------------------------------------
 

DOCUMENTATION/content/contributing/index.md

@@ -1,9 +1,11 @@
 ---
-title: Contributing
+title: Contributions
 type: index
-weight: 7
+weight: 6
 ---
 
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/laradock/laradock)
+
 
 ## Have a Question
 
@@ -51,12 +53,20 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 ### Host the documentation locally
 
+**Option 1: Use Hugo Docker Image:**
+
+1. Update the `DOCUMENTATION/content`.
+2. Go to `DOCUMENTATION/`.
+3. Run `docker run --rm -it -v $PWD:/src -p 1313:1313 -u hugo jguyomard/hugo-builder hugo server -w --bind=0.0.0.0`
+4. Visit [http://localhost:1313/](http://localhost:1313/)
+
+**Option 2: Install Hugo Locally:**
+
 1. Install [Hugo](https://gohugo.io/) on your machine.
-2. Edit the `DOCUMENTATION/content`.
+2. Update the `DOCUMENTATION/content`.
 3. Delete the `/docs` folder from the root.
-4. After you finish the editing, go to `DOCUMENTATION/` and run the `hugo` command to generate the HTML docs (inside a new `/docs` folder).
-
-
+4. Go to `DOCUMENTATION/`.
+5. Run the `hugo` command to generate the HTML docs inside a new `/docs` folder.
 
 
 ## Support new Software (Add new Container)
@@ -71,9 +81,9 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 * Make sure you follow the same code/comments style.
 
-* Add the environment variables to the `env-example` if you have any.
+* Add the environment variables to the `.env.example` if you have any.
 
-* **MOST IMPORTANTLY** updated the `Documentation`, add as much information.
+* **MOST IMPORTANTLY** update the `Documentation`, add as much information.
 
 * Submit a Pull Request, to the `master` branch.
 
@@ -100,7 +110,7 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 * Search for the image in the [Docker Hub](https://hub.docker.com/search/) and find the source..
 
-*Most of the image in Laradock are offical images, these projects live in other repositories and maintainer by other orgnizations.*
+*Most of the image in Laradock are official images, these projects live in other repositories and maintainer by other organizations.*
 
 **Note:** Laradock has two base images for (`Workspace` and `php-fpm`, mainly made to speed up the build time on your machine.
 
@@ -204,4 +214,4 @@ After your pull request is merged, you can safely delete your branch and pull th
 
 
 <br>
-#### Happy Coding :)
+## Happy Coding :)

DOCUMENTATION/content/getting-started/index.md

@@ -7,10 +7,7 @@ weight: 2
 ## Requirements
 
 - [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/) `>= 1.12`
-
-
-
+- [Docker](https://www.docker.com/products/docker/) [ >= 17.12 ]
 
 
 
@@ -41,21 +38,21 @@ git submodule add https://github.com/Laradock/laradock.git
 
 Note: If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `.
 
-*To keep track of your Laradock changes, between your projects and also keep Laradock updated [check these docs](/documentation/#keep-track-of-your-laradock-changes)*
+*To keep track of your Laradock changes, between your projects and also keep Laradock updated [check these docs](/documentation/#track-your-laradock-changes)*
 
 
-Your folder structure should look like this:
+2 - Make sure your folder structure should look like this:
 
 ```
-+ project-a
-  + laradock-a
-+ project-b
-  + laradock-b
+* project-a
+*   laradock-a
+* project-b
+*   laradock-b
 ```
 
 *(It's important to rename the laradock folders to unique name in each project, if you want to run laradock per project).*
 
-> **Now jump to the [Usage](#Usage) section.**
+3 - Go to the [Usage](#Usage) section.
 
 <a name="A2"></a>
 ### A.2) Don't have a PHP project yet:
@@ -69,8 +66,8 @@ git clone https://github.com/laradock/laradock.git
 Your folder structure should look like this:
 
 ```
-+ laradock
-+ project-z
+* laradock
+* project-z
 ```
 
 2 - Edit your web server sites configuration.
@@ -78,23 +75,23 @@ Your folder structure should look like this:
 We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
 
 ```
-cp env-example .env
+cp .env.example .env
 ```
 
-At the top, change the `APPLICATION` variable to your project path.
+At the top, change the `APP_CODE_PATH_HOST` variable to your project path.
 
 ```
-APPLICATION=../project-z/
+APP_CODE_PATH_HOST=../project-z/
 ```
 
 Make sure to replace `project-z` with your project folder name.
 
-> **Now jump to the [Usage](#Usage) section.**
+3 - Go to the [Usage](#Usage) section.
 
 
 <a name="B"></a>
 ### B) Setup for Multiple Projects:
-> (Follow these steps if you want a single Docker environment for all your project)
+> (Follow these steps if you want a single Docker environment for all your projects)
 
 1 - Clone this repository anywhere on your machine (similar to [Steps A.2. from above](#A2)):
 
@@ -105,14 +102,16 @@ git clone https://github.com/laradock/laradock.git
 Your folder structure should look like this:
 
 ```
-+ laradock
-+ project-1
-+ project-2
+* laradock
+* project-1
+* project-2
 ```
 
-2 - Go to `nginx/sites` and create config files to point to different project directory when visiting different domains.
+2 - Go to your web server and create config files to point to different project directory when visiting different domains:
 
-Laradock by default includes `app.conf.example`, `laravel.conf.example` and `symfony.conf.example`  as working samples.
+For **Nginx** go to `nginx/sites`, for **Apache2** `apache2/sites`. 
+
+Laradock by default includes some sample files for you to copy `app.conf.example`, `laravel.conf.example` and `symfony.conf.example`.
 
 3 - change the default names `*.conf`:
 
@@ -121,12 +120,14 @@ You can rename the config files, project folders and domains as you like, just m
 4 - Add the domains to the **hosts** files.
 
 ```
-127.0.0.1  project-1.dev
-127.0.0.1  project-2.dev
+127.0.0.1  project-1.test
+127.0.0.1  project-2.test
 ...
 ```
 
-> **Now jump to the [Usage](#Usage) section.**
+If you use Chrome 63 or above for development, don't use `.dev`. [Why?](https://laravel-news.com/chrome-63-now-forces-dev-domains-https). Instead use `.localhost`, `.invalid`, `.test`, or `.example`.
+
+4 - Go to the [Usage](#Usage) section.
 
 
 
@@ -142,7 +143,7 @@ You can rename the config files, project folders and domains as you like, just m
 If you are using **Docker Toolbox** (VM), do one of the following:
 
 - Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
-- Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/Laradock-ToolBox) branch. *(outdated)*
+- Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/LaraDock-ToolBox) branch. *(outdated)*
 
 <br>
 
@@ -150,21 +151,23 @@ We recommend using a Docker version which is newer than 1.13.
 
 <br>
 
->**Warning:** If you used an older version of Laradock it's highly recommended to rebuild the containers you need to use [see how you rebuild a container](#Build-Re-build-Containers) in order to prevent as much errors as possible.
+>**Warning:** If you used an older version of Laradock it's highly recommended to rebuild the containers you need to use [see how you rebuild a container](/documentation/#Build-Re-build-Containers) in order to prevent as much errors as possible.
 
 <br>
 
-1 - Enter the laradock folder and copy `env-example` to `.env`
+1 - Enter the laradock folder and copy `.env.example` to `.env`
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
-You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
+You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are being used.
 
 Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.
 
-2 - Build the enviroment and run it using `docker-compose`
+By default the containers that will be created have the current directory name as suffix (e.g. `laradock_workspace_1`). This can cause mixture of data inside the container volumes if you use laradock in multiple projects. In this case, either read the guide for [multiple projects](#B) or change the variable `COMPOSE_PROJECT_NAME` to something unique like your project name.
+
+2 - Build the environment and run it using `docker-compose`
 
 In this example we'll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:
 
@@ -172,10 +175,10 @@ In this example we'll see how to run NGINX (web server) and MySQL (database engi
 docker-compose up -d nginx mysql
 ```
 
-**Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`.
+**Note**: All the web server containers `nginx`, `apache` ..etc depends on `php-fpm`, which means if you run any of them, they will automatically launch the `php-fpm` container for you, so no need to explicitly specify it in the `up` command. If you have to do so, you may need to run them as follows: `docker-compose up -d nginx php-fpm mysql`.
 
 
-You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images).
+You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images).
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 
@@ -202,7 +205,7 @@ docker-compose exec --user=laradock workspace bash
 *You can change the PUID (User id) and PGID (group id) variables from the `.env` file)*
 
 <br>
-4 - Update your project configurations to use the database host
+4 - Update your project configuration to use the database host
 
 Open your PHP project's `.env` file or whichever configuration file you are reading from, and set the database host `DB_HOST` to `mysql`:
 
@@ -210,7 +213,20 @@ Open your PHP project's `.env` file or whichever configuration file you are read
 DB_HOST=mysql
 ```
 
+You need to use the Laradock's default DB credentials which can be found in the `.env` file (ex: `MYSQL_USER=`). 
+Or you can change them and rebuild the container.  
+
 *If you want to install Laravel as PHP project, see [How to Install Laravel in a Docker Container](#Install-Laravel).*
 
 <br>
-5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.dev/` and `http://project-2.dev/`.
+5 - Open your browser and visit your localhost address. 
+
+Make sure you add use the right port number as provided by your running server.
+
+[http://localhost](http://localhost)
+
+If you followed the multiple projects setup, you can visit `http://project-1.test/` and `http://project-2.test/`.
+
+
+
+ 

DOCUMENTATION/content/guides/index.md

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

DOCUMENTATION/content/help/index.md

@@ -1,9 +1,129 @@
 ---
 title: Help & Questions
 type: index
-weight: 5
+weight: 4
 ---
 
 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).
+
+
+<br>
+<a name="Common-Problems"></a>
+# Common Problems
+
+*Here's a list of the common problems you might face, and the possible solutions.*
+
+
+<br>
+## I see a blank (white) page instead of the Laravel 'Welcome' page!
+
+Run the following command from the Laravel root directory:
+
+```bash
+sudo chmod -R 777 storage bootstrap/cache
+```
+
+
+
+
+
+
+<br>
+## I see "Welcome to nginx" instead of the Laravel App!
+
+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)
+
+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.
+
+
+
+
+
+
+<br>
+## I get NGINX error 404 Not Found on Windows.
+
+1. Go to docker Settings on your Windows machine.
+2. Click on the `Shared Drives` tab and check the drive that contains your project files.
+3. Enter your windows username and password.
+4. Go to the `reset` tab and click restart docker.
+
+
+
+
+
+
+<br>
+## The time in my services does not match the current time
+
+1. Make sure you've [changed the timezone](#Change-the-timezone).
+2. Stop and rebuild the containers (`docker-compose up -d --build <services>`)
+
+
+
+
+
+
+<br>
+## I get MySQL connection refused
+
+This error sometimes happens because your Laravel application isn't running on the container localhost IP (Which is 127.0.0.1). Steps to fix it:
+
+* Option A
+  1. Check your running Laravel application IP by dumping `Request::ip()` variable using `dd(Request::ip())` anywhere on your application. The result is the IP of your Laravel container.
+  2. Change the `DB_HOST` variable on env with the IP that you received from previous step.
+* 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 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.
+
+## Custom composer repo packagist url and npm registry url
+
+In China, the origin source of composer and npm is very slow. You can add `WORKSPACE_NPM_REGISTRY` and `WORKSPACE_COMPOSER_REPO_PACKAGIST` config in `.env` to use your custom source.
+
+Example:
+```bash
+WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org
+WORKSPACE_COMPOSER_REPO_PACKAGIST=https://packagist.phpcomposer.com
+```
+
+<br>
+
+## 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 an `Error: write EPIPE` while processing .jpg images.
+
+This is caused of an outdated library for processing **.jpg files** in ubuntu 16.04.
+
+To fix the problem you can follow those steps
+
+1 - Open the `.env`.
+
+2 - Search for `WORKSPACE_INSTALL_LIBPNG` or add the key, if missing.
+
+3 - Set the value to true:
+
+```dotenv
+WORKSPACE_INSTALL_LIBPNG=true
+```
+
+4 - Finally rebuild the workspace image
+
+```bash
+docker-compose build workspace
+```
+

DOCUMENTATION/content/introduction/index.md

@@ -4,21 +4,41 @@ type: index
 weight: 1
 ---
 
+<b>Laradock</b> is a full PHP development environment for Docker.
+
+It supports a variety of common services, all pre-configured to provide a ready PHP development environment.
+
+<br>
+
+---
+### Use Docker First - Learn About It Later!</q>
+---
+
+<a name="features"></a>
+## Features
+
+- 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 edits to the `Dockerfile`.
+- All Images extend 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`).
+- The Latest version of the Docker Compose file (`docker-compose`).
+- Everything is visible and editable.
+- Fast Images Builds.
 
 
 
-A full PHP development environment for Docker.
-
-Includes pre-packaged Docker Images, all pre-configured to provide a wonderful PHP development environment.
-
-Laradock is well known in the Laravel community, as the project started with single focus on running Laravel projects on Docker. Later and due to the large adoption from the PHP community, it started supporting other PHP projects like Symfony, CodeIgniter, WordPress, Drupal...
 
 
-![](https://s19.postimg.org/jblfytw9f/laradock-logo.jpg)
 
 ## Quick Overview
 
-Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `Beanstalkd`:
+Let's see how easy it is to setup our demo stack `PHP`, `NGINX`, `MySQL`, `Redis` and `Composer`:
 
 1 - Clone Laradock inside your PHP project:
 
@@ -26,16 +46,16 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis`
 git clone https://github.com/Laradock/laradock.git
 ```
 
-2 - Enter the laradock folder and rename `env-example` to `.env`.
+2 - Enter the laradock folder and rename `.env.example` to `.env`.
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 3 - Run your containers:
 
 ```shell
-docker-compose up -d nginx mysql redis beanstalkd
+docker-compose up -d nginx mysql phpmyadmin redis workspace 
 ```
 
 4 - Open your project's `.env` file and set the following:
@@ -55,55 +75,133 @@ That's it! enjoy :)
 
 
 
-<a name="features"></a>
-## Features
-
-- Easy switch between PHP versions: 7.1, 7.0, 5.6...
-- Choose your favorite database engine: MySQL, Postgres, MariaDB...
-- Run your own combination of software: Memcached, HHVM, Beanstalkd...
-- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
-- Easy to customize any container, with simple edit to the `Dockerfile`.
-- All Images extends from an official base Image. (Trusted base Images).
-- Pre-configured NGINX to host any code at your root directory.
-- Can use Laradock per project, or single Laradock for all projects.
-- Easy to install/remove software's in Containers using environment variables.
-- Clean and well structured Dockerfiles (`Dockerfile`).
-- Latest version of the Docker Compose file (`docker-compose`).
-- Everything is visible and editable.
-- Fast Images Builds.
-- More to come every week..
-
-
-
-
 <a name="Supported-Containers"></a>
-## Supported Software (Images)
+## Supported Services
 
-In adhering to the separation of concerns principle as promoted by Docker, Laradock runs each software on its own Container.
-You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
+> Laradock, adheres to the 'separation of concerns' principle, thus it runs each software on its own Docker Container.
+> You can turn On/Off as many instances as you want without worrying about the configurations.
+
+> To run a chosen container from the list below, run `docker-compose up -d {container-name}`. 
+> The container name `{container-name}` is the same as its folder name. Example to run the "PHP FPM" container, use the name "php-fpm".
+
+- **Web Servers:**
+    - NGINX 
+    - Apache2 
+    - Caddy 
+
+- **Load Balancers:**
+    - HAProxy
+    - Traefik
 
-- **Database Engines:**
-MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres-PostGIS.
-- **Database Management:**
-PhpMyAdmin - Adminer - PgAdmin
-- **Cache Engines:**
-Redis - Memcached - Aerospike
-- **PHP Servers:**
-NGINX - Apache2 - Caddy
 - **PHP Compilers:**
-PHP FPM - HHVM
-- **Message Queueing:**
-Beanstalkd - RabbitMQ - PHP Worker
-- **Queueing Management:**
-Beanstalkd Console - RabbitMQ Console
-- **Random Tools:**
-HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Grafana - Mailhog - MailDev - Minio - Varnish - Swoole - Laravel Echo...
+    - PHP FPM 
+    - HHVM
 
-Laradock introduces the **Workspace** Image, as a development environment.
-It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose.
+- **Database Management Systems:**
+    - MySQL
+    - PostgreSQL
+        - PostGIS
+    - MariaDB
+    - Percona
+    - MSSQL 
+    - MongoDB
+        - MongoDB Web UI
+    - Neo4j
+    - CouchDB
+    - RethinkDB 
+    - Cassandra
 
-**Workspace Image Tools**
-PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn - SOAP - Drush...
+
+- **Database Management Apps:**
+    - PhpMyAdmin 
+    - Adminer 
+    - PgAdmin
+
+- **Cache Engines:**
+    - Redis 
+        - Redis Web UI
+        - Redis Cluster
+    - Memcached 
+    - Aerospike 
+    - Varnish
+
+- **Message Brokers:**
+    - RabbitMQ
+        - RabbitMQ Admin Console 
+    - Beanstalkd
+        - Beanstalkd Admin Console 
+    - Eclipse Mosquitto
+    - PHP Worker
+    - Laravel Horizon
+    - Gearman
+    - Amazon Simple Queue Service
+
+- **Mail Servers:**
+    - Mailu 
+    - MailCatcher
+    - Mailhog 
+    - MailDev
+
+- **Log Management:**
+    - GrayLog 
+
+- **Testing:**
+    - Selenium 
+
+- **Monitoring:**
+    - Grafana
+    - NetData 
+
+- **Search Engines:** 
+    - ElasticSearch
+    - Apache Solr
+    - Manticore Search
+
+- **IDE's**  
+    - ICE Coder
+    - Theia
+    - Web IDE
+
+- **Miscellaneous:**
+    - Workspace *(Laradock container that includes a rich set of pre-configured useful tools)*
+         - `PHP CLI` 
+         - `Composer` 
+         - `Git`
+         - `Vim` 
+         - `xDebug`
+         - `Linuxbrew` 
+         - `Node`
+         - `V8JS` 
+         - `Gulp` 
+         - `SQLite` 
+         - `Laravel Envoy` 
+         - `Deployer` 
+         - `Yarn` 
+         - `SOAP` 
+         - `Drush` 
+         - `Wordpress CLI`
+    - Apache ZooKeeper *(Centralized service for distributed systems to a hierarchical key-value store)*
+    - Kibana *(Visualize your Elasticsearch data and navigate the Elastic Stack)*
+    - Dejavu *(Edit your Elasticsearch data)*
+    - LogStash *(Server-side data processing pipeline that ingests data from a multitude of sources simultaneously)*
+    - Jenkins *(automation server, that provides plugins to support building, deploying and automating any project)*
+    - Certbot *(Automatically enable HTTPS on your website)*
+    - Swoole *(Production-Grade Async programming Framework for PHP)* 
+    - SonarQube *(continuous inspection of code quality to perform automatic reviews with static analysis of code to detect bugs and more)* 
+    - Gitlab *(A single application for the entire software development lifecycle)*
+    - PostGIS *(Database extender for PostgreSQL. It adds support for geographic objects allowing location queries to be run in SQL)*
+    - Blackfire *(Empowers all PHP developers and IT/Ops to continuously verify and improve their app's performance)*
+    - Laravel Echo *(Bring the power of WebSockets to your Laravel applications)*
+    - Mercure *(Server-sent events)*
+    - Phalcon *(A PHP web framework based on the model–view–controller pattern)*
+    - Minio *(Cloud storage server released under Apache License v2, compatible with Amazon S3)*
+    - AWS EB CLI *(CLI that helps you deploy and manage your AWS Elastic Beanstalk applications and environments)*
+    - Thumbor *(Photo thumbnail service)*
+    - IPython *(Provides a rich architecture for interactive computing)*
+    - Jupyter Hub *(Jupyter notebook for multiple users)*
+    - Portainer *(Build and manage your Docker environments with ease)*
+    - Docker Registry *(The Docker Registry implementation for storing and distributing Docker images)*
+    - Docker Web UI *(A browser-based solution for browsing and modifying a private Docker registry)*
 
 You can choose, which tools to install in your workspace container and other containers, from the `.env` file.
 
@@ -112,76 +210,300 @@ 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 :)
+*If you can't find your Software in the list, build it yourself and submit it. Contributions are welcomed :)*
 
+---
+
+
+
+
+
+
+
+
+
+
+## Join Us
+
+[![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+[![Gitpod](https://img.shields.io/badge/Gitpod-ready--to--code-blue)](https://gitpod.io/#https://github.com/laradock/laradock)
+
+---
+
+
+## Awesome People
+
+Laradock is an MIT-licensed open source project with its ongoing development made possible entirely by the support of all these smart and generous people, from code contributors to financial contributors. 💜
+
+
+### 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
+
+[![Laradock Contributors][contributors-src]][contributors-href]
+
+### Financial Contributors
+
+[![Open Collective backers][backers-src]][backers-href]
+
+You can support us using any of the methods below:
+
+<b>1:</b> [Open Collective](https://opencollective.com/laradock)
+<br>
+<b>2:</b> [Paypal](https://paypal.me/mzmmzz)
+<br>
+<b>3:</b> [Github Sponsors](https://github.com/sponsors/Mahmoudz)
+<br>
+<b>4:</b> [Patreon](https://www.patreon.com/zalt)
+
+---
 
 
 ## Sponsors
 
+Sponsoring is an act of giving in a different fashion. 🌱
 
 
+### Gold Sponsors
+
+<p align="center">
+
+<a href="https://casinopilotti.com/"        target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti" ></a>
+<a href="https://www.bestonlinecasino.com/" target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a>
+<a href="http://apiato.io/"                 target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/apiato.png"               height="75px"    alt="Apiato Build PHP API's faster"></a>
 
 
-Support this project by becoming a sponsor. 
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/0/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/1/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/2/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/3/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/4/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/5/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/6/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/7/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/8/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/9/avatar.svg?button=false&isActive=true" height="75px"></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, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/10/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/11/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/12/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/13/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/14/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/15/avatar.svg?button=false&isActive=true" height="75px"></a>
 
-<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>
-<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
+</p>
 
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
-</a>
+### Silver Sponsors
+
+<p align="center">
+
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/1/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/2/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/3/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/4/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/5/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/6/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/7/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/8/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/9/avatar.svg?button=false&isActive=true" height="65px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/10/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/11/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/12/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/13/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/14/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/15/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/16/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/16/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/17/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/17/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/18/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/18/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/19/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/19/avatar.svg?button=false&isActive=true" height="65px"></a>
+
+</p>
+
+### Bronze Sponsors
+
+<p align="center">
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/0/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/1/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/2/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/3/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/4/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/5/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/6/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/7/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/8/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/9/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/10/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/11/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/12/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/13/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/14/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/15/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/16/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/16/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/17/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/17/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/18/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/18/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/19/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/19/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/20/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/20/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/21/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/21/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/22/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/22/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/23/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/23/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/24/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/24/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/25/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/25/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/26/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/26/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/27/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/27/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/28/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/28/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/29/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/29/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+</p>
 
 
+You can sponsor us using any of the methods below:
+
+<b>1:</b> Sponsor via [Open Collective](https://opencollective.com/laradock/).
+<br>
+<b>2:</b> Email us at <a href = "mailto: support@laradock.io">support@laradock.io</a>.
+
+*Sponsors logos are displayed on the [github repository](https://github.com/laradock/laradock/) page and the [documentation website](http://laradock.io/) home page.*
+
+## License
+
+[MIT](https://github.com/laradock/laradock/blob/master/LICENSE) © Mahmoud Zalt
 
 
-<a name="what-is-docker"></a>
-## What is Docker?
+[comment]: # (Open Collective Tiers)
 
-[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.
+[contributors-src]: https://opencollective.com/laradock/contributors.svg?width=890&button=false&isActive=true
+[contributors-href]: https://github.com/laradock/laradock/graphs/contributors
+[backers-src]: https://opencollective.com/laradock/tiers/awesome-backers.svg?width=890&button=false&isActive=true
+[backers-href]: https://opencollective.com/laradock#contributors
 
-
-
-
-
-<a name="why-docker-not-vagrant"></a>
-## Why Docker not Vagrant!?
-
-[Vagrant](https://www.vagrantup.com) creates Virtual Machines in minutes while Docker creates Virtual Containers in seconds.
-
-Instead of providing a full Virtual Machines, like you get with Vagrant, Docker provides you **lightweight** Virtual Containers, that share the same kernel and allow to safely execute independent processes.
-
-In addition to the speed, Docker gives tons of features that cannot be achieved with Vagrant.
-
-Most importantly Docker can run on Development and on Production (same environment everywhere). While Vagrant is designed for Development only, (so you have to re-provision your server on Production every time).
-
-
-
-
-
-
-<a name="Demo"></a>
-## Demo Video
-
-What's better than a **Demo Video**:
-
-- Laradock v5.* (should be next!)
-- 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)
+[gold-sponsors-src]: https://opencollective.com/laradock/tiers/gold-sponsors.svg?avatarHeight=80&width=890&button=false&isActive=true
+[gold-sponsors-href]: https://opencollective.com/laradock#contributors
+[silver-sponsors-src]: https://opencollective.com/laradock/tiers/silver-sponsors.svg?avatarHeight=64&width=890&button=false&isActive=true
+[silver-sponsors-href]: https://opencollective.com/laradock#contributors
+[bronze-sponsors-src]: https://opencollective.com/laradock/tiers/bronze-sponsors.svg?avatarHeight=48&width=890&button=false&isActive=true
+[bronze-sponsors-href]: https://opencollective.com/laradock#contributors
 
 
 
@@ -189,31 +511,5 @@ What's better than a **Demo Video**:
 
 
 
-<a name="Chat"></a>
-## Chat with us
+<br>
 
-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)
-
-
-
-
-
-<a name="Donations"></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://www.paypal.me/mzalt)
-
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 
-
-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>
-
-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)

DOCUMENTATION/content/license/index.md

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

DOCUMENTATION/content/related-projects/index.md

@@ -1,18 +1,49 @@
 ---
 title: Related Projects
 type: index
-weight: 6
+weight: 5
 ---
 
-Laradock related projects:
+## Laradock Related Projects
 
-* [Laradock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
-* [Laradock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
-* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
-* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
-These Docker Compose projects have piqued our interest:
-* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
-* [RubyDev-Dock](https://github.com/scudelletti/rubydev-dock) by [Diogo Scudelletti](https://github.com/scudelletti)
-* [NoDock](https://github.com/Osedea/nodock) by [Osedea](https://github.com/Osedea)
 
-If you want your project listed here, please open an issue.
+* [Docker Stacks](https://github.com/sfx101/docker-stacks): A GUI for managing Laradock. (by [Subhadip Naskar](https://github.com/sfx101))
+* [Laradock CLI](https://github.com/lorinlee/laradock-cli): A CLI for managing Laradock. (by [Lorin Lee](https://github.com/lorinlee))
+* [Laradock CLI](https://github.com/loonpwn/laradock-cli): A CLI for managing Laradock. (by [Harlan Wilton](https://github.com/loonpwn))
+* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes): Ansible playbook to setup docker containers for Laravel apps using Laradock. (by [Sifat Rahim](https://github.com/sifat-rahim))
+* [Monitor Laradock](https://github.com/zeroc0d3/monitor-laradock): Laradock Monitoring Tools (using Grafana). (by [Dwi Fahni Denni](https://github.com/zeroc0d3))
+* [Laradock Manager](https://github.com/Lyimmi/laradock-manager): A simple app for managing Laradock containers. Made with wails.app (go & vue.js & vuetify). (by [Zámbó Levente](https://github.com/Lyimmi))
+* [Laradock Env](https://github.com/bagart/laradock_env): A wrapper with commands for managing Laradock. (by [BAG Art](https://github.com/bagart))
+* [Lara Query](https://github.com/TanisukeGoro/laraQuery): Easy Laradock CLI. (by [Okita kamegoro](https://github.com/TanisukeGoro))
+* [Laradock CLI](https://github.com/tonysm/laradock-cli): Laradock CLI helper. (by [Tony Messias](https://github.com/Tonysm))
+* [Laradock Lite](https://github.com/yangliuyu/laradock-lite): A Docker based laravel development environment with minimal dependencies. (by [Liu Yang](https://github.com/yangliuyu))
+* [Laradock Makefile](https://github.com/bazavlukd/laradock-makefile): Makefile with some useful commands for Laradock. (by [Dmitry Bazavluk](https://github.com/bazavlukd))
+* [Laradock Build](https://github.com/dockerframework/laradock-build): Docker builder & running script for Laradock. (by [Docker Framework](https://github.com/dockerframework))
+* [Laravel Laradock PHPStorm](https://github.com/LarryEitel/laravel-laradock-phpstorm): Guide for configuring PHPStorm for remote debugging with Laravel & Laradock. (by [Larry Eitel](https://github.com/LarryEitel))
+* [Laradock Crudbooster](https://github.com/nutellinoit/laradock-crudbooster): Docker compose & Kubernetes solution to build apps with crudbooster & Laradock. (by [Samuele Chiocca](https://github.com/nutellinoit))
+* [Laradock Sample](https://github.com/tadaken3/laradock-sample): Install Laravel with Laradock. (by [Tadaken3](https://github.com/tadaken3))
+* [Stylemix's Laradock](https://github.com/stylemix/laradock): Alternate laradock for multiproject purpose. (by [Stylemix LLC](https://github.com/stylemix))
+
+
+
+
+## Inspired by Laradock
+
+* [Dockery](https://github.com/taufek/dockery): Laradock for Ruby. (by [Taufek Johar](https://github.com/Taufek))
+* [RubyDev Dock](https://github.com/scudelletti/rubydev-dock): Laradock for Ruby. (by [Diogo Scudelletti](https://github.com/scudelletti))
+* [NoDock](https://github.com/Osedea/nodock): Laradock for NodeJS. (by [Osedea](https://github.com/Osedea))
+* [Laradock Multi](https://github.com/bagart/laradock-multi): Laradock for PHP & NodeJS. (by [BAG Art](https://github.com/bagart))
+* [Wordpress Laradock](https://github.com/shov/wordpress-laradock): Laradock for Wordpress. (by [Alexandr Shevchenko](https://github.com/shov))
+* [Yii2 Laradock](https://github.com/ydatech/yii2-laradock): Laradock for Yii2. (by [Yuda Sukmana](https://github.com/ydatech))
+* [MageDock](https://github.com/ojhaujjwal/magedock): Laradock for Magento. (by [Ujjwal Ojha](https://github.com/ojhaujjwal))
+* [Docker Codeigniter](https://github.com/sebastianlzy/docker-codeigniter): Laradock for Codeigniter. (by [Sebastian](https://github.com/sebastianlzy))
+* [Klaradock](https://github.com/poyhsiao/Klaradock): A customized Laradock. (by [Kim Hsiao](https://github.com/poyhsiao))
+* [Laravel Boilerplate](https://github.com/casivaagustin/laravel-boilerplate): A boilerplate with support for JWT. (by [Casiva Agustin](https://github.com/casivaagustin))
+
+
+
+
+
+<br><br>
+
+> Feel free to submit a PR for listing your project here.

DOCUMENTATION/static/ads.txt

@@ -0,0 +1 @@
+google.com, pub-9826129398689742, DIRECT, f08c47fec0942fa0

DOCUMENTATION/static/custom-style.css

@@ -0,0 +1,30 @@
+/* Custom CSS */
+
+.article a {
+    border-bottom: none;
+}
+.project .logo {
+    width: 200px;
+    padding-right: 0;
+}
+.project .banner {
+    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;
+}

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

@@ -36,6 +36,7 @@
 				{{ with .Site.Params.copyright }}
 				© {{ $.Now.Format "2006" }} {{ . }} –
 				{{ end }}
+				<br><br>
 				Documentation built with
 				<a href="https://www.gohugo.io" target="_blank">Hugo</a>
 				using the

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 }}
@@ -46,6 +32,7 @@
 				{{ with .Site.Params.copyright }}
 				&copy; {{ $.Now.Format "2006" }} {{ . }} &ndash;
 				{{ end }}
+				<br><br>
 				Documentation built with
 				<a href="https://www.gohugo.io" target="_blank">Hugo</a>
 				using the

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,35 +25,42 @@
 	<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>
-            <!-- ------------------------------------------------------------------------- -->
+				<!-- ------------------------------------------------------------------------- -->
+				<!-- 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>
+				<!-- ------------------------------------------------------------------------- -->
+
+			<br><br><br>
+			<img src="images/laradock-full-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">
 				{{ with .Site.Params.copyright }}
 				&copy; {{ $.Now.Format "2006" }} {{ . }} &ndash;
 				{{ end }}
+				<br><br>
 				Documentation built with
 				<a href="https://www.gohugo.io" target="_blank">Hugo</a>
 				using the
 				<a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme,
-                by
-                <a href="https://zalt.me">Mahmoud Zalt</a>.
+				by
+				<a href="https://zalt.me">Mahmoud Zalt</a>.
 			</aside>
 
 			<footer class="footer">

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

@@ -5,7 +5,7 @@
         <div class="logo">
           <img src="{{ $.Site.BaseURL }}{{ . }}">
         </div>
-        Laradock
+
       {{ end }}
       <!--<div class="name">-->
         <!--<strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>-->

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

@@ -12,17 +12,23 @@
     <title>{{ .Title }}{{ if not .IsHome }} - {{ .Site.Title }}{{ end }}</title>
     {{ .Hugo.Generator }}
 
-    {{ with .Site.Params.description }}
-    <meta name="description" content="{{ . }}">
-    {{ end }}
+    {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
     <link rel="canonical" href="{{ .Permalink }}">
-    {{ with .Site.Params.author }}
-    <meta name="author" content="{{ . }}">
-    {{ end }}
+    {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
 
     <meta property="og:url" content="{{ .Permalink }}">
+    <meta property="og:type" content="website">
+    {{ with .Site.Title }}<meta property="og:site_name" content="{{ . }}">{{ end }}
+    {{ with .Site.Params.description }}<meta property="og:description" content="{{ . }}">{{ end }}
     {{ with .Site.Title }}<meta property="og:title" content="{{ . }}">{{ end }}
     {{ with .Site.Params.logo }}<meta property="og:image" content="{{ . | absURL }}">{{ end }}
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:site" content="@Mahmoud_Zalt">
+    {{ with .Site.Title }}<meta name="twitter:title" content="{{ . }}">{{ end }}
+    {{ with .Site.Params.description }}<meta name="twitter:description" content="{{ . }}">{{ end }}
+    {{ with .Site.Params.logo }}<meta name="twitter:image" content="{{ . | absURL }}">{{ end }}
+
     {{ with .Site.Title }}<meta name="apple-mobile-web-app-title" content="{{ . }}">{{ end }}
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -30,6 +36,25 @@
     <link rel="shortcut icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
     <link rel="icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
 
+<!--    <link rel="icon" type="image/png" sizes="192x192"  href="images/favicons/android-icon-192x192.png">-->
+<!--    <link rel="icon" type="image/png" sizes="32x32" href="images/favicons/favicon-32x32.png">-->
+<!--    <link rel="icon" type="image/png" sizes="96x96" href="images/favicons/favicon-96x96.png">-->
+<!--    <link rel="icon" type="image/png" sizes="16x16" href="images/favicons/favicon-16x16.png">-->
+
+    <link rel="apple-touch-icon" sizes="57x57" href="images/favicons/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="images/favicons/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="images/favicons/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="images/favicons/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="images/favicons/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="images/favicons/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="images/favicons/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="images/favicons/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="images/favicons/apple-icon-180x180.png">
+    <link rel="manifest" href="images/favicons/manifest.json">
+    <meta name="msapplication-TileColor" content="#7e57c2">
+    <meta name="msapplication-TileImage" content="images/favicons/ms-icon-144x144.png">
+    <meta name="theme-color" content="#7e57c2">
+
     <style>
       @font-face {
         font-family: 'Icon';

DOCUMENTATION/themes/hugo-material-docs/static/images/favicons/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

DOCUMENTATION/themes/hugo-material-docs/static/images/favicons/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2016 <Mahmoud Zalt>
+Copyright 2018 <Mahmoud Zalt>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

README-zh.md

@@ -70,7 +70,7 @@ git clone https://github.com/laradock/laradock.git
 
 2. 进入 Laradock 目录
  ```bash
-cp env-example .env
+cp .env.example .env
 ```
 
 3. 运行这些容器。
@@ -669,19 +669,19 @@ PHP-CLI 安装在 Workspace 容器，改变 PHP-CLI 版本你需要编辑 `works
 <a name="Use-custom-Domain"></a>
 ### 使用自定义域名 (替换 Docker 的 IP)
 
-假定你的自定义域名是 `laravel.dev`
+假定你的自定义域名是 `laravel.test`
 
-1 - 打开 `/etc/hosts` 文件添加以下内容，映射你的 localhost 地址 `127.0.0.1` 为 `laravel.dev` 域名
+1 - 打开 `/etc/hosts` 文件添加以下内容，映射你的 localhost 地址 `127.0.0.1` 为 `laravel.test` 域名
 ```bash
-127.0.0.1    laravel.dev
+127.0.0.1    laravel.test
 ```
 
-2 - 打开你的浏览器访问 `{http://laravel.dev}`
+2 - 打开你的浏览器访问 `{http://laravel.test}`
 
 你可以在 nginx 配置文件自定义服务器名称,如下:
 
 ```conf
-server_name laravel.dev;
+server_name laravel.test;
 ```
 
 <a name="Enable-Global-Composer-Build-Install"></a>

README.md

@@ -0,0 +1,315 @@
+<p align="center">
+    <img src="/.github/home-page-images/laradock-logo.jpg?raw=true" alt="Laradock Logo"/>
+</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://github.com/laradock/laradock/actions/workflows/main-ci.yml"><img src="https://github.com/laradock/laradock/actions/workflows/main-ci.yml/badge.svg" alt="GitHub CI"></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"><b>Full PHP development environment based on Docker.</b></p>
+
+<p align="center">
+    <a href="http://zalt.me"><img src="http://forthebadge.com/images/badges/built-by-developers.svg" alt="forthebadge" width="180"></a>
+</p>
+
+<br>
+<br>
+
+<h4 align="center" style="color:#7d58c2">Use Docker First - 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>
+
+
+## Join Us
+
+[![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+[![Gitpod](https://img.shields.io/badge/Gitpod-ready--to--code-blue)](https://gitpod.io/#https://github.com/laradock/laradock)
+
+---
+
+
+## Awesome People
+
+Laradock is an MIT-licensed open source project with its ongoing development made possible entirely by the support of all these smart and generous people, from code contributors to financial contributors. 💜
+
+
+### 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
+
+[![Laradock Contributors][contributors-src]][contributors-href]
+
+### Financial Contributors
+
+[![Open Collective backers][backers-src]][backers-href]
+
+You can support us using any of the methods below:
+
+<b>1:</b> [Open Collective](https://opencollective.com/laradock)
+<br>
+<b>2:</b> [Paypal](https://paypal.me/mzmmzz)
+<br>
+<b>3:</b> [Github Sponsors](https://github.com/sponsors/Mahmoudz)
+<br>
+<b>4:</b> [Patreon](https://www.patreon.com/zalt)
+
+---
+
+
+## Sponsors
+
+Sponsoring is an act of giving in a different fashion. 🌱
+
+
+### Gold Sponsors
+
+<p align="center">
+
+<a href="https://casinopilotti.com/"        target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti" ></a>
+<a href="https://www.bestonlinecasino.com/" target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a>
+<a href="http://apiato.io/"                 target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/apiato.png"               height="75px"    alt="Apiato Build PHP API's faster"></a>
+
+
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/0/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/1/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/2/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/3/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/4/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/5/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/6/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/7/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/8/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/9/avatar.svg?button=false&isActive=true" height="75px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/10/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/11/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/12/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/13/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/14/avatar.svg?button=false&isActive=true" height="75px"></a>
+<a href="https://opencollective.com/laradock/tiers/gold-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/15/avatar.svg?button=false&isActive=true" height="75px"></a>
+
+</p>
+
+### Silver Sponsors
+
+<p align="center">
+
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/1/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/2/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/3/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/4/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/5/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/6/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/7/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/8/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/9/avatar.svg?button=false&isActive=true" height="65px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/10/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/11/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/12/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/13/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/14/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/15/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/16/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/16/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/17/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/17/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/18/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/18/avatar.svg?button=false&isActive=true" height="65px"></a>
+<a href="https://opencollective.com/laradock/tiers/silver-sponsors/19/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/19/avatar.svg?button=false&isActive=true" height="65px"></a>
+
+</p>
+
+### Bronze Sponsors
+
+<p align="center">
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/0/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/1/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/2/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/3/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/3/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/4/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/4/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/5/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/5/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/6/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/6/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/7/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/7/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/8/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/8/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/9/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/9/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/10/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/10/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/11/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/11/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/12/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/12/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/13/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/13/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/14/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/14/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/15/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/15/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/16/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/16/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/17/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/17/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/18/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/18/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/19/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/19/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/20/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/20/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/21/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/21/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/22/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/22/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/23/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/23/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/24/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/24/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/25/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/25/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/26/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/26/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/27/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/27/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/28/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/28/avatar.svg?button=false&isActive=true" height="55px"></a>
+<a href="https://opencollective.com/laradock/tiers/bronze-sponsors/29/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/bronze-sponsors/29/avatar.svg?button=false&isActive=true" height="55px"></a>
+
+</p>
+
+
+You can sponsor us using any of the methods below:
+
+<b>1:</b> Sponsor via [Open Collective](https://opencollective.com/laradock/).
+<br>
+<b>2:</b> Email us at <a href = "mailto: support@laradock.io">support@laradock.io</a>.
+
+*Sponsors logos are displayed on the [github repository](https://github.com/laradock/laradock/) page and the [documentation website](http://laradock.io/) home page.*
+
+## License
+
+[MIT](https://github.com/laradock/laradock/blob/master/LICENSE) © Mahmoud Zalt
+
+
+[comment]: # (Open Collective Tiers)
+
+[contributors-src]: https://opencollective.com/laradock/contributors.svg?width=890&button=false&isActive=true
+[contributors-href]: https://github.com/laradock/laradock/graphs/contributors
+[backers-src]: https://opencollective.com/laradock/tiers/awesome-backers.svg?width=890&button=false&isActive=true
+[backers-href]: https://opencollective.com/laradock#contributors
+
+[gold-sponsors-src]: https://opencollective.com/laradock/tiers/gold-sponsors.svg?avatarHeight=80&width=890&button=false&isActive=true
+[gold-sponsors-href]: https://opencollective.com/laradock#contributors
+[silver-sponsors-src]: https://opencollective.com/laradock/tiers/silver-sponsors.svg?avatarHeight=64&width=890&button=false&isActive=true
+[silver-sponsors-href]: https://opencollective.com/laradock#contributors
+[bronze-sponsors-src]: https://opencollective.com/laradock/tiers/bronze-sponsors.svg?avatarHeight=48&width=890&button=false&isActive=true
+[bronze-sponsors-href]: https://opencollective.com/laradock#contributors
+
+

adminer/Dockerfile

@@ -1,9 +1,6 @@
-FROM adminer:4.3.0
+FROM adminer:4
 
-# Version 4.3.1 contains PostgreSQL login errors. See docs.
-# See https://sourceforge.net/p/adminer/bugs-and-features/548/
-
-MAINTAINER Patrick Artounian <partounian@gmail.com>
+LABEL maintainer="Patrick Artounian <partounian@gmail.com>"
 
 # Add volume for sessions to allow session persistence
 VOLUME /sessions
@@ -16,11 +13,15 @@ ARG INSTALL_MSSQL=false
 ENV INSTALL_MSSQL ${INSTALL_MSSQL}
 RUN if [ ${INSTALL_MSSQL} = true ]; then \
   set -xe \
-  && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \
-  && pecl channel-update pecl.php.net \
-  && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
-  && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \
-  && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \
+  # && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \
+  # && pecl channel-update pecl.php.net \
+  # && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
+  # && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \
+  # && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \
+  && apk --update add --no-cache freetds unixodbc \
+  && apk --update add --no-cache --virtual .build-deps $PHPIZE_DEPS freetds-dev unixodbc-dev \
+  && docker-php-ext-install pdo_dblib \
+  && apk del .build-deps \
 ;fi
 
 USER adminer

aerospike/Dockerfile

@@ -1,7 +1,3 @@
 FROM aerospike:latest
 
-MAINTAINER Luciano Jr <luciano@lucianojr.com.br>
-
-RUN rm /etc/aerospike/aerospike.conf
-
-ADD aerospike.conf /etc/aerospike/aerospike.conf
+LABEL maintainer="Luciano Jr <luciano@lucianojr.com.br>"

aerospike/aerospike.conf

@@ -1,77 +0,0 @@
-# Aerospike database configuration file.
-
-# This stanza must come first.
-service {
-	user root
-	group root
-	paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1.
-	pidfile /var/run/aerospike/asd.pid
-	service-threads 4
-	transaction-queues 4
-	transaction-threads-per-queue 4
-	proto-fd-max 15000
-}
-
-logging {
-
-	# Log file must be an absolute path.
-	file /var/log/aerospike/aerospike.log {
-		context any info
-	}
-
-	# Send log messages to stdout
-	console {
-		context any critical
-	}
-}
-
-network {
-	service {
-		address any
-		port 3000
-
-		# Uncomment the following to set the `access-address` parameter to the
-		# IP address of the Docker host. This will the allow the server to correctly
-		# publish the address which applications and other nodes in the cluster to
-		# use when addressing this node.
-		# access-address <IPADDR>
-	}
-
-	heartbeat {
-
-		# mesh is used for environments that do not support multicast
-		mode mesh
-		port 3002
-
-		# use asinfo -v 'tip:host=<ADDR>;port=3002' to inform cluster of
-		# other mesh nodes
-		mesh-port 3002
-
-		interval 150
-		timeout 10
-	}
-
-	fabric {
-		port 3001
-	}
-
-	info {
-		port 3003
-	}
-}
-
-namespace test {
-	replication-factor 2
-	memory-size 1G
-	default-ttl 5d # 5 days, use 0 to never expire/evict.
-
-	#	storage-engine memory
-
-	# To use file storage backing, comment out the line above and use the
-	# following lines instead.
-	storage-engine device {
-		file /opt/aerospike/data/test.dat
-		filesize 4G
-		data-in-memory true # Store data in memory in addition to file.
-	}
-}

apache2/Dockerfile

@@ -1,23 +1,32 @@
-FROM webdevops/apache:ubuntu-16.04
+FROM webdevops/apache:ubuntu-18.04
 
-MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
+LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"
 
+ARG DOCUMENT_ROOT=/var/www/
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000
 ARG PHP_UPSTREAM_TIMEOUT=60
+ARG APACHE_INSTALL_HTTP2=false
 
 ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}
-
-ENV WEB_DOCUMENT_ROOT=/var/www/
-
+ENV WEB_DOCUMENT_ROOT=${DOCUMENT_ROOT}
+ENV APACHE_HTTP2=${APACHE_INSTALL_HTTP2}
 ENV WEB_PHP_TIMEOUT=${PHP_UPSTREAM_TIMEOUT}
 
+ENV LOG_STDOUT=/var/log/apache2/access.log
+
+ENV LOG_STDERR=/var/log/apache2/error.log
+
 EXPOSE 80 443
 
 WORKDIR /var/www/
 
 COPY vhost.conf /etc/apache2/sites-enabled/vhost.conf
 
+ADD ./startup.sh /opt/startup.sh
+
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
-CMD ["supervisord"]
+CMD ["/bin/bash", "/opt/startup.sh"]
+
+EXPOSE 80 443

apache2/sites/default.apache.conf

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName laradock.dev
+  ServerName laradock.test
   DocumentRoot /var/www/
   Options Indexes FollowSymLinks
 
@@ -13,4 +13,6 @@
     </IfVersion>
   </Directory>
 
+  ErrorLog /var/log/apache2/error.log
+  CustomLog /var/log/apache2/access.log combined
 </VirtualHost>

apache2/sites/default.apache.ssl.example

@@ -0,0 +1,32 @@
+<VirtualHost *:80>
+    ServerName laradock.test
+    ServerAlias *.laradock.test
+
+    RewriteEngine On
+    RewriteCond %{HTTPS} !on
+    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerName laradock.test
+    ServerAlias *.laradock.test
+    DocumentRoot /var/www/
+    Options Indexes FollowSymLinks
+
+    SSLEngine on
+    SSLCertificateFile /etc/apache2/ssl/ssl_site.crt
+    SSLCertificateKeyFile /etc/apache2/ssl/ssl_site.key
+
+    <Directory "/var/www/">
+      AllowOverride All
+      <IfVersion < 2.4>
+        Allow from all
+      </IfVersion>
+      <IfVersion >= 2.4>
+        Require all granted
+      </IfVersion>
+    </Directory>
+
+    ErrorLog /var/log/apache2/error.log
+    CustomLog /var/log/apache2/access.log combined
+</VirtualHost>

apache2/sites/sample.conf.example

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName sample.dev
+  ServerName sample.test
   DocumentRoot /var/www/sample/public/
   Options Indexes FollowSymLinks
 

apache2/ssl/.gitignore

@@ -0,0 +1,4 @@
+*.crt
+*.csr
+*.key
+*.pem

apache2/startup.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+mkdir /etc/apache2/ssl 2> /dev/null
+
+# Change laradock.test to the URL to be used
+if [ ${APACHE_HTTP2} = true ]; then
+  if [ ! -f /etc/apache2/ssl/ssl_site.crt ]; then
+    openssl genrsa -out "/etc/apache2/ssl/ssl_site.key" 2048
+    openssl rand -out /root/.rnd -hex 256
+    openssl req -new -key "/etc/apache2/ssl/ssl_site.key" -out "/etc/apache2/ssl/ssl_site.csr" -subj "/CN=laradock.test/O=Laradock/C=BR"
+    openssl x509 -req -days 365 -extfile <(printf "subjectAltName=DNS:laradock.test,DNS:*.laradock.test") -in "/etc/apache2/ssl/ssl_site.csr" -signkey "/etc/apache2/ssl/ssl_site.key" -out "/etc/apache2/ssl/ssl_site.crt"
+  fi
+
+  a2enmod rewrite
+  a2enmod headers
+  a2enmod proxy proxy_html proxy_http xml2enc ssl http2
+  service apache2 restart
+fi
+
+# Start supervisord in foreground
+supervisord

aws-eb-cli/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:slim
 
-MAINTAINER melchabcede@gmail.com
+LABEL maintainer="melchabcede@gmail.com"
 
 RUN pip install --upgrade --no-cache-dir awsebcli
 RUN apt-get -yqq update && apt-get -yqq install git-all

beanstalkd-console/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:latest
 
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
 RUN apt-get update && apt-get install -y curl
 

beanstalkd/Dockerfile

@@ -1,16 +1,7 @@
-FROM phusion/baseimage:latest
+FROM alpine
+LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-RUN apt-get update
-RUN apt-get install -y beanstalkd
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-VOLUME /var/lib/beanstalkd/data
+RUN apk add --no-cache beanstalkd
 
 EXPOSE 11300
-
-CMD ["/usr/bin/beanstalkd"]
+ENTRYPOINT ["/usr/bin/beanstalkd"]

caddy/Dockerfile

@@ -1,18 +1,5 @@
-FROM zuohuadong/caddy:alpine
+FROM abiosoft/caddy:no-stats
 
-
-MAINTAINER Huadong Zuo <admin@zuohuadong.cn>
-
-ARG plugins="cors"
-
-## ARG plugins="cors cgi cloudflare azure linode"
-
-
-RUN caddyplug install ${plugins}
-    
+CMD ["--conf", "/etc/caddy/Caddyfile", "--log", "stdout", "--agree=true"]
 
 EXPOSE 80 443 2015
-
-WORKDIR /var/www/public
-
-CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]

caddy/caddy/Caddyfile

@@ -25,6 +25,27 @@
     #  dns cloudflare
     #}
 }
-laradock.demo:80 {
+
+laradock1.demo:80 {
     root /var/www/public
+    # Create a Webhook in git.
+    #git {
+	#repo https://github.com/xxx/xxx
+    #    path /home/xxx
+    #    #interval 60
+    #    hook  webhook laradock
+    #    hook_type   generic
+    #}
+
 }
+
+laradock2.demo:80 {
+    # Create a Proxy and cors.
+    #proxy domain.com
+	#cors
+}
+
+laradock3.demo:80 {
+    import authlist.conf
+    root /var/www/public
+}

caddy/caddy/authlist.conf

@@ -0,0 +1 @@
+basicauth / laradock laradock

cassandra/Dockerfile

@@ -0,0 +1,5 @@
+ARG CASSANDRA_VERSION=latest
+FROM bitnami/cassandra:${CASSANDRA_VERSION}
+
+LABEL maintainer="Stefan Neuhaus <https://www.github.com/stefnats>"
+

certbot/Dockerfile

@@ -1,6 +1,6 @@
-FROM phusion/baseimage:latest
+FROM phusion/baseimage:bionic-1.0.0
 
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
 COPY run-certbot.sh /root/certbot/run-certbot.sh
 

certbot/run-certbot.sh

@@ -2,5 +2,6 @@
 
 letsencrypt certonly --webroot -w /var/www/letsencrypt -d "$CN" --agree-tos --email "$EMAIL" --non-interactive --text
 
-cp /etc/letsencrypt/archive/"$CN"/cert1.pem /var/certs/cert1.pem
-cp /etc/letsencrypt/archive/"$CN"/privkey1.pem /var/certs/privkey1.pem
+cp /etc/letsencrypt/archive/"$CN"/cert1.pem /var/certs/"$CN"-cert1.pem
+cp /etc/letsencrypt/archive/"$CN"/privkey1.pem /var/certs/"$CN"-privkey1.pem
+

clickhouse/Dockerfile

@@ -0,0 +1,53 @@
+FROM ubuntu:20.04
+
+ARG CLICKHOUSE_VERSION=20.9.4.76
+ARG CLICKHOUSE_GOSU_VERSION=1.10
+
+RUN apt-get update \
+    && apt-get install --yes --no-install-recommends \
+        apt-transport-https \
+        dirmngr \
+        gnupg \
+    && mkdir -p /etc/apt/sources.list.d \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 \
+    && echo "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" > /etc/apt/sources.list.d/clickhouse.list \
+    && apt-get update \
+    && env DEBIAN_FRONTEND=noninteractive \
+        apt-get install --allow-unauthenticated --yes --no-install-recommends \
+            clickhouse-common-static=$CLICKHOUSE_VERSION \
+            clickhouse-client=$CLICKHOUSE_VERSION \
+            clickhouse-server=$CLICKHOUSE_VERSION \
+            locales \
+            tzdata \
+            wget \
+    && rm -rf \
+        /var/lib/apt/lists/* \
+        /var/cache/debconf \
+        /tmp/* \
+    && apt-get clean
+
+ADD https://github.com/tianon/gosu/releases/download/$CLICKHOUSE_GOSU_VERSION/gosu-amd64 /bin/gosu
+
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN mkdir /docker-entrypoint-initdb.d
+
+COPY docker_related_config.xml /etc/clickhouse-server/config.d/
+COPY config.xml /etc/clickhouse-server/config.xml
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod +x \
+    /entrypoint.sh \
+    /bin/gosu
+
+EXPOSE 9000 8123 9009
+VOLUME /var/lib/clickhouse
+
+ENV CLICKHOUSE_CONFIG /etc/clickhouse-server/config.xml
+ENV CLICKHOUSE_USER ${CLICKHOUSE_USER}
+ENV CLICKHOUSE_PASSWORD ${CLICKHOUSE_PASSWORD}
+
+ENTRYPOINT ["/entrypoint.sh"]

clickhouse/config.xml

@@ -0,0 +1,510 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+	<!-- The list of hosts allowed to use in URL-related storage engines and table functions.
+		If this section is not present in configuration, all hosts are allowed.
+	-->
+	<remote_url_allow_hosts>
+		<!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
+			Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
+            		If port is explicitly specified in URL, the host:port is checked as a whole.
+            		If host specified here without port, any port with this host allowed.
+            		"yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed. 
+			If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
+			If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked. 
+		-->
+
+		<!-- Regular expression can be specified. RE2 engine is used for regexps.
+			Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
+			(forgetting to do so is a common source of error).
+		-->
+	</remote_url_allow_hosts>
+
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <server> <!-- Used for https server AND secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+
+        <client> <!-- Used for connecting to https dictionary source -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <!-- <listen_host>0.0.0.0</listen_host> -->
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_shards_localhost>
+        <test_cluster_two_shards>
+            <shard>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </remote_servers>
+
+
+    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
+         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
+         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+      -->
+
+    <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
+         Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/
+      -->
+
+    <zookeeper incl="zookeeper-servers" optional="true" />
+
+    <!-- Substitutions for parameters of replicated tables.
+          Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <events_cumulative>false</events_cumulative>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <events_cumulative>false</events_cumulative>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+    <!-- Serve endpoint fot Prometheus monitoring. -->
+    <!--
+        endpoint - mertics path (relative to root, statring with "/")
+        port - port to setup server. If not defined or 0 than http_port used
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <prometheus>
+        <endpoint>/metrics</endpoint>
+        <port>9363</port>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </prometheus>
+    -->
+
+    <!-- Query log. Used only for queries with setting log_queries = 1. -->
+    <query_log>
+        <!-- What table to insert data. If table is not exist, it will be created.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_thread_log>
+
+    <!-- Uncomment if use part log.
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+    -->
+
+    <!-- Uncomment to write text log into table.
+         Text log contains all information from usual server log but stores it in structured and efficient way.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Uncomment to write metric log into table.
+         Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval.
+    <metric_log>
+        <database>system</database>
+        <table>metric_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </metric_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="clickhouse_compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
+         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
+    <distributed_ddl>
+        <!-- Path in ZooKeeper to queue with DDL queries -->
+        <path>/clickhouse/task_queue/ddl</path>
+
+        <!-- Settings from this profile will be used to execute DDL queries -->
+        <!-- <profile>default</profile> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+
+    <!-- Uncomment to use query masking rules.
+        name - name for the rule (optional)
+        regexp - RE2 compatible regular expression (mandatory)
+        replace - substitution string for sensitive data (optional, by default - six asterisks)
+    <query_masking_rules>
+        <rule>
+            <name>hide SSN</name>
+            <regexp>\b\d{3}-\d{2}-\d{4}\b</regexp>
+            <replace>000-00-0000</replace>
+        </rule>
+    </query_masking_rules>
+    -->
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>

clickhouse/docker_related_config.xml

@@ -0,0 +1,12 @@
+<yandex>
+     <!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
+    <listen_host>::</listen_host>
+    <listen_host>0.0.0.0</listen_host>
+    <listen_try>1</listen_try>
+
+    <!--
+    <logger>
+        <console>1</console>
+    </logger>
+    -->
+</yandex>

clickhouse/entrypoint.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# set some vars
+CLICKHOUSE_CONFIG="${CLICKHOUSE_CONFIG:-/etc/clickhouse-server/config.xml}"
+if [ x"$UID" == x0 ]; then
+    USER="$(id -u clickhouse)"
+    GROUP="$(id -g clickhouse)"
+    gosu="gosu $USER:$GROUP"
+else
+    USER="$(id -u)"
+    GROUP="$(id -g)"
+    gosu=""
+fi
+
+# port is needed to check if clickhouse-server is ready for connections
+HTTP_PORT="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=http_port)"
+
+# get CH directories locations
+DATA_DIR="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=path || true)"
+TMP_DIR="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=tmp_path || true)"
+USER_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=user_files_path || true)"
+LOG_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=logger.log || true)"
+LOG_DIR="$(dirname $LOG_PATH || true)"
+ERROR_LOG_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=logger.errorlog || true)"
+ERROR_LOG_DIR="$(dirname $ERROR_LOG_PATH || true)"
+FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=format_schema_path || true)"
+CLICKHOUSE_USER="${CLICKHOUSE_USER:-default}"
+
+for dir in "$DATA_DIR" \
+  "$ERROR_LOG_DIR" \
+  "$LOG_DIR" \
+  "$TMP_DIR" \
+  "$USER_PATH" \
+  "$FORMAT_SCHEMA_PATH"
+do
+    # check if variable not empty
+    [ -z "$dir" ] && continue
+    # ensure directories exist
+    if ! mkdir -p "$dir"; then
+        echo "Couldn't create necessary directory: $dir"
+        exit 1
+    fi
+
+    if [ x"$UID" == x0 ] && [ "$CLICKHOUSE_DO_NOT_CHOWN" != "1" ]; then
+        # ensure proper directories permissions
+        chown -R "$USER:$GROUP" "$dir"
+    elif [ "$(stat -c %u "$dir")" != "$USER" ]; then
+        echo "Necessary directory '$dir' isn't owned by user with id '$USER'"
+        exit 1
+    fi
+done
+
+
+
+if [ -n "$(ls /docker-entrypoint-initdb.d/)" ]; then
+    $gosu /usr/bin/clickhouse-server --config-file=$CLICKHOUSE_CONFIG &
+    pid="$!"
+
+    # check if clickhouse is ready to accept connections
+    # will try to send ping clickhouse via http_port (max 12 retries, with 1 sec delay)
+    if ! wget --spider --quiet --tries=12 --waitretry=1 --retry-connrefused "http://localhost:$HTTP_PORT/ping" ; then
+        echo >&2 'ClickHouse init process failed.'
+        exit 1
+    fi
+
+    if [ ! -z "$CLICKHOUSE_PASSWORD" ]; then
+        printf -v WITH_PASSWORD '%s %q' "--password" "$CLICKHOUSE_PASSWORD"
+    fi
+
+    clickhouseclient=( clickhouse-client --multiquery -u $CLICKHOUSE_USER $WITH_PASSWORD )
+
+    echo
+    for f in /docker-entrypoint-initdb.d/*; do
+        case "$f" in
+            *.sh)
+                if [ -x "$f" ]; then
+                    echo "$0: running $f"
+                    "$f"
+                else
+                    echo "$0: sourcing $f"
+                    . "$f"
+                fi
+                ;;
+            *.sql)    echo "$0: running $f"; cat "$f" | "${clickhouseclient[@]}" ; echo ;;
+            *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${clickhouseclient[@]}"; echo ;;
+            *)        echo "$0: ignoring $f" ;;
+        esac
+        echo
+    done
+
+    if ! kill -s TERM "$pid" || ! wait "$pid"; then
+        echo >&2 'Finishing of ClickHouse init process failed.'
+        exit 1
+    fi
+fi
+
+# if no args passed to `docker run` or first argument start with `--`, then the user is passing clickhouse-server arguments
+if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
+    exec $gosu /usr/bin/clickhouse-server --config-file=$CLICKHOUSE_CONFIG "$@"
+fi
+
+# Otherwise, we assume the user want to run his own process, for example a `bash` shell to explore this image
+exec "$@"