From ee89ff96d5d2441bd65e227aeea82462a2eefdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my24251325@gmail.com>
Date: Tue, 4 Dec 2018 00:52:59 +0800
Subject: [PATCH 01/58] [U] ignore self-signed certificate

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 890c25c1..4235e773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /.project
 .docker-sync
 /jenkins/jenkins_home
+/nginx/ssl/

From 2de32fe97fb5edd36a0de199b8504bcd3877818c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my24251325@gmail.com>
Date: Tue, 4 Dec 2018 01:35:21 +0800
Subject: [PATCH 02/58] [F] fix latest version for mysql8.0.13

---
 mysql/my.cnf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql/my.cnf b/mysql/my.cnf
index e03ccf88..399eaac2 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -7,4 +7,4 @@
 
 [mysqld]
 sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
-character-set-server=utf8
+character-set-server=utf8mb4

From 28e82813c4bbc84547cfac1c91e21342dfeed588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my24251325@gmail.com>
Date: Tue, 4 Dec 2018 01:57:37 +0800
Subject: [PATCH 03/58] [F] fix mysql cann't start when version is 8.*

---
 docker-compose.yml | 1 +
 mysql/my.cnf       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0c3ff899..2965a678 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -303,6 +303,7 @@ services:
         context: ./mysql
         args:
           - MYSQL_VERSION=${MYSQL_VERSION}
+      command: "--innodb_use_native_aio=0"
       environment:
         - MYSQL_DATABASE=${MYSQL_DATABASE}
         - MYSQL_USER=${MYSQL_USER}
diff --git a/mysql/my.cnf b/mysql/my.cnf
index 399eaac2..68578ef0 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -6,5 +6,5 @@
 [mysql]
 
 [mysqld]
-sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
+sql-mode="STRICT_TRANS_TABLES,NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
 character-set-server=utf8mb4

From 3ad37405c6cd91304a0e286dcc2d75f8931beffa Mon Sep 17 00:00:00 2001
From: Pavel <gpavellog@gmail.com>
Date: Thu, 24 Jan 2019 20:25:08 +0300
Subject: [PATCH 04/58] Chmod

---
 mariadb/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index 0dcb9481..1929726a 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -4,6 +4,8 @@ LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
 COPY my.cnf /etc/mysql/conf.d/my.cnf
 
+RUN chmod -R 644 /etc/mysql/conf.d/my.cnf
+
 CMD ["mysqld"]
 
 EXPOSE 3306

From 8027a98f72d2d30161c0a193ceef467c05e629df Mon Sep 17 00:00:00 2001
From: Anton Sannikov <a.sannikov@limesoda.com>
Date: Mon, 20 May 2019 22:36:08 +0200
Subject: [PATCH 05/58] Confluence config added

---
 docker-compose.yml                            | 20 +++++++++
 env-example                                   |  8 ++++
 .../docker-entrypoint-initdb.d/.gitignore     |  1 +
 .../init_confluence_db.sh                     | 44 +++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 postgres/docker-entrypoint-initdb.d/init_confluence_db.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 52f0cf31..b022bbd4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,6 +41,8 @@ volumes:
     driver: ${VOLUMES_DRIVER}
   mosquitto:
     driver: ${VOLUMES_DRIVER}
+  confluence:
+    driver: ${VOLUMES_DRIVER}
   sonarqube:
     driver: ${VOLUMES_DRIVER}
 
@@ -414,6 +416,10 @@ services:
         - SONARQUBE_POSTGRES_DB=${SONARQUBE_POSTGRES_DB}
         - SONARQUBE_POSTGRES_USER=${SONARQUBE_POSTGRES_USER}
         - SONARQUBE_POSTGRES_PASSWORD=${SONARQUBE_POSTGRES_PASSWORD}
+        - POSTGRES_CONFLUENCE_INIT=${CONFLUENCE_POSTGRES_INIT}
+        - POSTGRES_CONFLUENCE_DB=${CONFLUENCE_POSTGRES_DB}
+        - POSTGRES_CONFLUENCE_USER=${CONFLUENCE_POSTGRES_USER}
+        - POSTGRES_CONFLUENCE_PASSWORD=${CONFLUENCE_POSTGRES_PASSWORD}
       networks:
         - backend
 
@@ -1459,3 +1465,17 @@ services:
       networks:
         - backend
         - frontend
+### CONFLUENCE ################################################
+    confluence:
+      container_name: Confluence
+      image: atlassian/confluence-server:${CONFLUENCE_VERSION}
+      restart: always
+      ports:
+        - "${CONFLUENCE_HOST_HTTP_PORT}:8090"
+      networks:
+        - frontend
+        - backend
+      depends_on:
+        - postgres
+      volumes:
+        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
\ No newline at end of file
diff --git a/env-example b/env-example
index b5986c19..9ba3cdda 100644
--- a/env-example
+++ b/env-example
@@ -366,6 +366,14 @@ JENKINS_HOST_HTTP_PORT=8090
 JENKINS_HOST_SLAVE_AGENT_PORT=50000
 JENKINS_HOME=./jenkins/jenkins_home
 
+### CONFLUENCE ###############################################
+CONFLUENCE_POSTGRES_INIT=true
+CONFLUENCE_VERSION=6.13-ubuntu-18.04-adoptopenjdk8
+CONFLUENCE_POSTGRES_DB=laradock_confluence
+CONFLUENCE_POSTGRES_USER=laradock_confluence
+CONFLUENCE_POSTGRES_PASSWORD=laradock_confluence
+CONFLUENCE_HOST_HTTP_PORT=8090
+
 ### GRAFANA ###############################################
 
 GRAFANA_PORT=3000
diff --git a/postgres/docker-entrypoint-initdb.d/.gitignore b/postgres/docker-entrypoint-initdb.d/.gitignore
index 0721338b..a56b450c 100644
--- a/postgres/docker-entrypoint-initdb.d/.gitignore
+++ b/postgres/docker-entrypoint-initdb.d/.gitignore
@@ -2,3 +2,4 @@
 !init_gitlab_db.sh
 !init_jupyterhub_db.sh
 !init_sonarqube_db.sh
+!init_confluence_db.sh
\ No newline at end of file
diff --git a/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh b/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
new file mode 100644
index 00000000..ce5e9f72
--- /dev/null
+++ b/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Copy createdb.sh.example to createdb.sh
+# then uncomment then set database name and username to create you need databases
+#
+# example: .env POSTGRES_USER=appuser and need db name is myshop_db
+# 
+#    psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+#        CREATE USER myuser WITH PASSWORD 'mypassword';
+#        CREATE DATABASE myshop_db;
+#        GRANT ALL PRIVILEGES ON DATABASE myshop_db TO myuser;
+#    EOSQL
+#
+# this sh script will auto run when the postgres container starts and the $DATA_PATH_HOST/postgres not found.
+#
+# 
+# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+#     CREATE USER db1 WITH PASSWORD 'db1';
+#     CREATE DATABASE db1;
+#     GRANT ALL PRIVILEGES ON DATABASE db1 TO db1;
+# EOSQL
+# 
+# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+#     CREATE USER db2 WITH PASSWORD 'db2';
+#     CREATE DATABASE db2;
+#     GRANT ALL PRIVILEGES ON DATABASE db2 TO db2;
+# EOSQL
+# 
+# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+#     CREATE USER db3 WITH PASSWORD 'db3';
+#     CREATE DATABASE db3;
+#     GRANT ALL PRIVILEGES ON DATABASE db3 TO db3;
+# EOSQL
+# 
+### default database and user for confluence ##############################################
+if [ "$POSTGRES_CONFLUENCE_INIT" == 'true' ]; then
+	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+		CREATE USER $POSTGRES_CONFLUENCE_USER WITH PASSWORD '$POSTGRES_CONFLUENCE_PASSWORD';
+		CREATE DATABASE $POSTGRES_CONFLUENCE_DB;
+		GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_CONFLUENCE_DB TO $POSTGRES_CONFLUENCE_USER;
+		ALTER ROLE $POSTGRES_CONFLUENCE_USER CREATEROLE SUPERUSER;
+	EOSQL
+	echo
+fi
\ No newline at end of file

From f23149115d7f8c8ecfe18f82b62f57f02d4d56bc Mon Sep 17 00:00:00 2001
From: Anton Sannikov <a.sannikov@limesoda.com>
Date: Mon, 20 May 2019 22:51:36 +0200
Subject: [PATCH 06/58] Confluence docs added

---
 DOCUMENTATION/content/documentation/index.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 0704aba4..22aa559c 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -1023,8 +1023,21 @@ _Note: You can customize the port on which beanstalkd console is listening by ch
 
 
 
+<br>
+<a name="Use-Confluence"></a>
+## Use Confluence
 
+1 - Run the Confluence Container (`confluence`) with the `docker-compose up` command. Example:
 
+```bash
+docker-compose up -d confluence
+```
+
+2 - Open your browser and visit the localhost on port **8090**:  `http://localhost:8090`
+
+**Note:** You can you trial version and then you have to buy a licence to use it.
+
+You can set custom confluence version in `CONFLUENCE_VERSION`. [Find more info in section 'Versioning'](https://hub.docker.com/r/atlassian/confluence-server/)
 
 <br>
 <a name="Use-ElasticSearch"></a>

From f64adc211430a668021833f53a14db978f71c04e Mon Sep 17 00:00:00 2001
From: mouyong <my242551325@gmail.com>
Date: Fri, 9 Aug 2019 08:52:32 +0800
Subject: [PATCH 07/58] workspace and php-fpm change source

---
 docker-compose.yml                                |  5 +++++
 mysql/my.cnf                                      |  8 +++++++-
 .../sites/{default.conf => default.conf.example}  |  0
 php-fpm/Dockerfile                                | 10 ++++++++++
 php-fpm/debian.sources.list                       |  8 ++++++++
 php-fpm/xdebug.ini                                |  9 +++++++--
 workspace/Dockerfile                              |  9 +++++++++
 workspace/ubuntu.sources.list                     | 15 +++++++++++++++
 workspace/xdebug.ini                              |  9 +++++++--
 9 files changed, 68 insertions(+), 5 deletions(-)
 rename nginx/sites/{default.conf => default.conf.example} (100%)
 create mode 100644 php-fpm/debian.sources.list
 create mode 100644 workspace/ubuntu.sources.list

diff --git a/docker-compose.yml b/docker-compose.yml
index 462b085d..2b9bff34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,6 +55,7 @@ services:
       build:
         context: ./workspace
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
@@ -126,6 +127,7 @@ services:
           - no_proxy
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
+        - "./workspace/crontab/laradock:/etc/cron.d/laradock"
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
       ports:
@@ -145,6 +147,7 @@ services:
       build:
         context: ./php-fpm
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
@@ -200,6 +203,7 @@ services:
         - "9000"
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
+      dns: 114.114.114.114
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
         - DOCKER_HOST=tcp://docker-in-docker:2375
@@ -211,6 +215,7 @@ services:
       links:
         - docker-in-docker
 
+
 ### PHP Worker ############################################
     php-worker:
       build:
diff --git a/mysql/my.cnf b/mysql/my.cnf
index 68578ef0..a7facd5c 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -6,5 +6,11 @@
 [mysql]
 
 [mysqld]
-sql-mode="STRICT_TRANS_TABLES,NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
+sql-mode="STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
 character-set-server=utf8mb4
+skip-name-resolve
+symbolic-links=0
+explicit_defaults_for_timestamp
+default_authentication_plugin=mysql_native_password
+#skip-grant-tables=1
+
diff --git a/nginx/sites/default.conf b/nginx/sites/default.conf.example
similarity index 100%
rename from nginx/sites/default.conf
rename to nginx/sites/default.conf.example
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 68a1933e..183bd3cf 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -24,6 +24,16 @@ ARG LARADOCK_PHP_VERSION
 # Set Environment Variables
 ENV DEBIAN_FRONTEND noninteractive
 
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ADD debian.sources.list /etc/apt/debian.sources.list
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+  mv /etc/apt/sources.list /etc/apt/sources.list.back && \
+  mv /etc/apt/debian.sources.list /etc/apt/sources.list \
+;fi
+
+
 # always run apt update when start and after add new source list, then clean up at end.
 RUN set -xe; \
     apt-get update -yqq && \
diff --git a/php-fpm/debian.sources.list b/php-fpm/debian.sources.list
new file mode 100644
index 00000000..4cf49767
--- /dev/null
+++ b/php-fpm/debian.sources.list
@@ -0,0 +1,8 @@
+deb http://mirrors.aliyun.com/debian/ stretch main non-free contrib
+deb-src http://mirrors.aliyun.com/debian/ stretch main non-free contrib
+deb http://mirrors.aliyun.com/debian-security stretch/updates main
+deb-src http://mirrors.aliyun.com/debian-security stretch/updates main
+deb http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib
+deb-src http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib
+deb http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib
+deb-src http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib
\ No newline at end of file
diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index c3f32ece..42a7c9b7 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -5,14 +5,19 @@ xdebug.remote_connect_back=1
 xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
-xdebug.remote_autostart=0
+xdebug.remote_autostart=1
 xdebug.remote_enable=0
-xdebug.cli_color=0
+xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
+xdebug.remote_log=/var/log/php/xdebug_remote.log
+
+xdebug.auto_trace = 1
+xdebug.collect_params = 1
+xdebug.collect_return = 1
 
 xdebug.var_display_max_children=-1
 xdebug.var_display_max_data=-1
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index cbbeb2e9..fa2ea64c 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -24,6 +24,15 @@ ARG LARADOCK_PHP_VERSION
 # Set Environment Variables
 ENV DEBIAN_FRONTEND noninteractive
 
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ADD ubuntu.sources.list /etc/apt/ubuntu.sources.list
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+  mv /etc/apt/sources.list /etc/apt/sources.list.back && \
+  mv /etc/apt/ubuntu.sources.list /etc/apt/sources.list \
+;fi
+
 # Start as root
 USER root
 
diff --git a/workspace/ubuntu.sources.list b/workspace/ubuntu.sources.list
new file mode 100644
index 00000000..6edaa130
--- /dev/null
+++ b/workspace/ubuntu.sources.list
@@ -0,0 +1,15 @@
+deb http://mirrors.aliyun.com/ubuntu/ xenial main
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial main
+
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main
+
+deb http://mirrors.aliyun.com/ubuntu/ xenial universe
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
+
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security main
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security universe
\ No newline at end of file
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
index c3f32ece..42a7c9b7 100644
--- a/workspace/xdebug.ini
+++ b/workspace/xdebug.ini
@@ -5,14 +5,19 @@ xdebug.remote_connect_back=1
 xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
-xdebug.remote_autostart=0
+xdebug.remote_autostart=1
 xdebug.remote_enable=0
-xdebug.cli_color=0
+xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
+xdebug.remote_log=/var/log/php/xdebug_remote.log
+
+xdebug.auto_trace = 1
+xdebug.collect_params = 1
+xdebug.collect_return = 1
 
 xdebug.var_display_max_children=-1
 xdebug.var_display_max_data=-1

From f01cab7742eca0c4fbc7a3e9afc11acabcb903d0 Mon Sep 17 00:00:00 2001
From: mouyong <my242551325@gmail.com>
Date: Fri, 9 Aug 2019 09:08:49 +0800
Subject: [PATCH 08/58] set xdebug.remote_autostart=0
 https://github.com/laradock/laradock/issues/2112#issuecomment-489603086

---
 php-fpm/xdebug.ini   | 2 +-
 workspace/xdebug.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index 42a7c9b7..1fef0580 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -5,7 +5,7 @@ xdebug.remote_connect_back=1
 xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
-xdebug.remote_autostart=1
+xdebug.remote_autostart=0
 xdebug.remote_enable=0
 xdebug.cli_color=1
 xdebug.profiler_enable=0
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
index 42a7c9b7..1fef0580 100644
--- a/workspace/xdebug.ini
+++ b/workspace/xdebug.ini
@@ -5,7 +5,7 @@ xdebug.remote_connect_back=1
 xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
-xdebug.remote_autostart=1
+xdebug.remote_autostart=0
 xdebug.remote_enable=0
 xdebug.cli_color=1
 xdebug.profiler_enable=0

From 48933479809a318cb17bed7742655f65da4aac03 Mon Sep 17 00:00:00 2001
From: mouyong <my242551325@gmail.com>
Date: Fri, 9 Aug 2019 09:14:10 +0800
Subject: [PATCH 09/58] remove setting remote_log

---
 php-fpm/xdebug.ini   | 3 +--
 workspace/xdebug.ini | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index 1fef0580..9bc6578f 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -6,14 +6,13 @@ xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
-xdebug.remote_enable=0
+xdebug.remote_enable=1
 xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
-xdebug.remote_log=/var/log/php/xdebug_remote.log
 
 xdebug.auto_trace = 1
 xdebug.collect_params = 1
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
index 1fef0580..9bc6578f 100644
--- a/workspace/xdebug.ini
+++ b/workspace/xdebug.ini
@@ -6,14 +6,13 @@ xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
-xdebug.remote_enable=0
+xdebug.remote_enable=1
 xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
-xdebug.remote_log=/var/log/php/xdebug_remote.log
 
 xdebug.auto_trace = 1
 xdebug.collect_params = 1

From b8a971e634275bd290bc6f880e39f54f3344e1fd Mon Sep 17 00:00:00 2001
From: mouyong <my242551325@gmail.com>
Date: Fri, 9 Aug 2019 09:26:40 +0800
Subject: [PATCH 10/58] fix in aliyun mirrors, hash check error.

---
 php-fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 183bd3cf..d5aba61d 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -574,7 +574,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y libmagickwand-dev imagemagick && \
+    apt-get install -f -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi

From ab3a325ea3396fe95175986ab33290a630822cdf Mon Sep 17 00:00:00 2001
From: mouyong <my242551325@gmail.com>
Date: Fri, 9 Aug 2019 13:11:03 +0800
Subject: [PATCH 11/58] fix apt install fail

---
 php-fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d5aba61d..3b0b6007 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -574,7 +574,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -f -y libmagickwand-dev imagemagick && \
+    apt-get install --fix-missing -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi

From b7ede26634c32e43e9198be3da7a63115e714eb7 Mon Sep 17 00:00:00 2001
From: Beau Hastings <beausy@gmail.com>
Date: Sun, 11 Aug 2019 11:09:24 +0800
Subject: [PATCH 12/58] Add ast extension

---
 DOCUMENTATION/content/documentation/index.md | 20 ++++++++++++++++++++
 docker-compose.yml                           |  2 ++
 env-example                                  |  2 ++
 workspace/Dockerfile                         | 15 +++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index d83b4422..b98fe306 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -1973,6 +1973,26 @@ YAML PHP extension allows you to easily parse and create YAML structured data. I
 4 - Re-build the container `docker-compose build php-fpm`<br>
 
 
+
+
+<br>
+<a name="Install-AST"></a>
+## Install AST PHP extension
+AST exposes the abstract syntax tree generated by PHP 7+. This extension is required by tools such as `Phan`, a static analyzer for PHP.
+
+1 - Open the `.env` file
+
+2 - Search for the `WORKSPACE_INSTALL_AST` argument under the Workspace Container
+
+3 - Set it to `true`
+
+4 - Re-build the container `docker-compose build workspace`
+
+**Note** If you need a specific version of AST then search for the `WORKSPACE_AST_VERSION` argument under the Workspace Container and set it to the desired version and continue step 4.
+
+
+
+
 <br>
 <a name="phpstorm-debugging"></a>
 ## PHPStorm Debugging Guide
diff --git a/docker-compose.yml b/docker-compose.yml
index 07c47f65..9ed17d19 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -109,12 +109,14 @@ services:
           - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
           - INSTALL_PING=${WORKSPACE_INSTALL_PING}
           - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
+          - INSTALL_AST=${WORKSPACE_INSTALL_AST}
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
           - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
           - NODE_VERSION=${WORKSPACE_NODE_VERSION}
           - YARN_VERSION=${WORKSPACE_YARN_VERSION}
           - DRUSH_VERSION=${WORKSPACE_DRUSH_VERSION}
+          - AST_VERSION=${WORKSPACE_AST_VERSION}
           - TZ=${WORKSPACE_TIMEZONE}
           - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
           - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
diff --git a/env-example b/env-example
index 0fd9d9db..09304a20 100644
--- a/env-example
+++ b/env-example
@@ -145,6 +145,8 @@ WORKSPACE_TIMEZONE=UTC
 WORKSPACE_SSH_PORT=2222
 WORKSPACE_INSTALL_FFMPEG=false
 WORKSPACE_INSTALL_GNU_PARALLEL=false
+WORKSPACE_INSTALL_AST=true
+WORKSPACE_AST_VERSION=1.0.3
 
 ### PHP_FPM ###############################################
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 0fd26b62..baf8f226 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -508,6 +508,21 @@ RUN if [ ${INSTALL_INOTIFY} = true ]; then \
     ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \
 ;fi
 
+###########################################################################
+# AST EXTENSION
+###########################################################################
+
+ARG INSTALL_AST=false
+ARG AST_VERSION=1.0.3
+ENV AST_VERSION ${AST_VERSION}
+
+RUN if [ ${INSTALL_AST} = true ]; then \
+    # Install AST extension
+    printf "\n" | pecl -q install ast-${AST_VERSION} && \
+    echo "extension=ast.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ast.ini && \
+    phpenmod -v ${LARADOCK_PHP_VERSION} -s cli ast \
+;fi
+
 ###########################################################################
 # fswatch
 ###########################################################################

From 237e39b40d11b56540803bd17bd73b7c48141fcc Mon Sep 17 00:00:00 2001
From: PeliCan <51474517+pelicancode@users.noreply.github.com>
Date: Sat, 21 Sep 2019 15:56:09 +0200
Subject: [PATCH 13/58] MySql config file permissions fix

Reason: [Warning] World-writable config file '/etc/mysql/docker-default.d/my.cnf' is ignored
---
 mysql/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 3fe5bdcf..03bb15ca 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -13,6 +13,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
 
 COPY my.cnf /etc/mysql/conf.d/my.cnf
 
+RUN chmod 0444 /etc/mysql/conf.d/my.cnf
+
 CMD ["mysqld"]
 
 EXPOSE 3306

From 3f9b888139a2811c65842d492bf8ce2817687a50 Mon Sep 17 00:00:00 2001
From: William Ono <william.ono@ubc.ca>
Date: Mon, 30 Sep 2019 16:08:09 -0700
Subject: [PATCH 14/58] Run php-fpm as different user (#1745)

---
 docker-compose.yml | 2 ++
 env-example        | 3 +++
 php-fpm/Dockerfile | 9 ++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 07c47f65..53dee769 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -190,6 +190,8 @@ services:
           - ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
           - INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
           - INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
+          - PUID=${PHP_FPM_PUID}
+          - PGID=${PHP_FPM_PGID}
           - http_proxy
           - https_proxy
           - no_proxy
diff --git a/env-example b/env-example
index 0fd9d9db..b454fec8 100644
--- a/env-example
+++ b/env-example
@@ -193,6 +193,9 @@ PHP_FPM_INSTALL_SSHPASS=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
 
+PHP_FPM_PUID=1000
+PHP_FPM_PGID=1000
+
 ### PHP_WORKER ############################################
 
 PHP_WORKER_INSTALL_PGSQL=false
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 3e39d2ec..4a0fcc8a 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -759,7 +759,14 @@ RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     rm /var/log/lastlog /var/log/faillog
 
-RUN usermod -u 1000 www-data
+# Configure non-root user.
+ARG PUID=1000
+ENV PUID ${PUID}
+ARG PGID=1000
+ENV PGID ${PGID}
+
+RUN groupmod -o -g ${PGID} www-data && \
+    usermod -o -u ${PUID} -g www-data www-data
 
 # Adding the faketime library to the preload file needs to be done last
 # otherwise it will preload it for all commands that follow in this file

From b7b468765ac0fcf19b5c7065e24f3ea0d3134b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?=
 <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Tue, 8 Oct 2019 09:11:02 -0300
Subject: [PATCH 15/58] Add sample configuration for Visual Studio Code Remote
 Development on Containers.

---
 .devcontainer/devcontainer.example.json |  9 +++++++++
 .gitignore                              |  5 ++++-
 DOCUMENTATION/content/guides/index.md   | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 .devcontainer/devcontainer.example.json

diff --git a/.devcontainer/devcontainer.example.json b/.devcontainer/devcontainer.example.json
new file mode 100644
index 00000000..4be22f7f
--- /dev/null
+++ b/.devcontainer/devcontainer.example.json
@@ -0,0 +1,9 @@
+{
+  "name": "Laradock",
+  "dockerComposeFile": ["../docker-compose.yml"],
+  "runServices": ["nginx", "postgres", "pgadmin"],
+  "service": "workspace",
+  "workspaceFolder": "/var/www",
+  "shutdownAction": "stopCompose",
+  "postCreateCommand": "uname -a"
+}
diff --git a/.gitignore b/.gitignore
index 06732062..06eccb52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@
 /nginx/ssl/*.key
 /nginx/ssl/*.csr
 
-.DS_Store
\ No newline at end of file
+/.devcontainer/*
+!/.devcontainer/devcontainer.example.json
+
+.DS_Store
diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md
index 9ffd0140..ab8c9c7e 100644
--- a/DOCUMENTATION/content/guides/index.md
+++ b/DOCUMENTATION/content/guides/index.md
@@ -70,6 +70,16 @@ If you want to only execute some command and don't want to enter bash, you can e
 docker-compose run workspace php artisan migrate
 ```
 
+### Prepare for Visual Studio Code remote development
+
+If you want to use Visual Studio Code for [remote development](https://code.visualstudio.com/docs/remote/containers) directly on your `workspace` container, copy file `devcontainer.example.json` to `devcontainer.json` and customize it (see [devcontainer.json reference](https://code.visualstudio.com/docs/remote/containers#_devcontainerjson-reference) for more options):
+```
+cd .devcontainer
+cp devcontainer.example.json devcontainer.json
+```
+
+Then open your `laradock` folder in Visual Studio Code and click on popup button **Reopen in Container**.
+
 ### 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.

From 3cb43e613925ebe3278578562a7cec514859f298 Mon Sep 17 00:00:00 2001
From: Fernando Larios <lariosly2@gmail.com>
Date: Tue, 8 Oct 2019 13:35:55 -0600
Subject: [PATCH 16/58] add gettext extensio php-fpm

---
 docker-compose.yml |  1 +
 env-example        |  3 ++-
 php-fpm/Dockerfile | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 896adb59..a3f4f2da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -187,6 +187,7 @@ services:
           - INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
           - INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
           - INSTALL_RDKAFKA=${PHP_FPM_INSTALL_RDKAFKA}
+          - INSTALL_GETTEXT=${PHP_FPM_INSTALL_GETTEXT}
           - INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
           - INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
           - INSTALL_PING=${PHP_FPM_INSTALL_PING}
diff --git a/env-example b/env-example
index 1b714796..f3afab72 100644
--- a/env-example
+++ b/env-example
@@ -186,6 +186,7 @@ PHP_FPM_INSTALL_CALENDAR=false
 PHP_FPM_INSTALL_FAKETIME=false
 PHP_FPM_INSTALL_IONCUBE=false
 PHP_FPM_INSTALL_RDKAFKA=false
+PHP_FPM_INSTALL_GETTEXT=false
 PHP_FPM_FAKETIME=-0
 PHP_FPM_INSTALL_APCU=false
 PHP_FPM_INSTALL_YAML=false
@@ -822,4 +823,4 @@ GEARMAN_MYSQL_PASSWORD_FILE=
 # Database to use by Gearman (Default: Gearmand)
 GEARMAN_MYSQL_DB=Gearmand
 # Table to use by Gearman (Default: gearman_queue)
-GEARMAN_MYSQL_TABLE=gearman_queue
\ No newline at end of file
+GEARMAN_MYSQL_TABLE=gearman_queue
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d74ef345..f03f696d 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -682,6 +682,17 @@ RUN if [ ${INSTALL_RDKAFKA} = true ]; then \
     docker-php-ext-enable rdkafka \
 ;fi
 
+###########################################################################
+# GETTEXT:
+###########################################################################
+
+ARG INSTALL_GETTEXT=false
+
+RUN if [ ${INSTALL_GETTEXT} = true ]; then \
+    apt-get install -y zlib1g-dev libicu-dev g++ libpq-dev libssl-dev gettext && \
+    docker-php-ext-install gettext \
+;fi
+
 ###########################################################################
 # Install additional locales:
 ###########################################################################

From 52bd45e1b8380ce604b1ea17e1304db34a3a3e42 Mon Sep 17 00:00:00 2001
From: Fernando-Larios <lariosly2@gmail.com>
Date: Tue, 8 Oct 2019 14:04:12 -0600
Subject: [PATCH 17/58] Update env-example


From 4dc4a4e680f247cc4f3f80fe074d11a371c00778 Mon Sep 17 00:00:00 2001
From: Fernando-Larios <lariosly2@gmail.com>
Date: Tue, 8 Oct 2019 14:05:03 -0600
Subject: [PATCH 18/58] Removing unnecesary spaces


From 6764a88fe630b5ca1c53c4c630a9c58c4958253f Mon Sep 17 00:00:00 2001
From: Alone <794000949@qq.com>
Date: Wed, 16 Oct 2019 18:18:03 +0800
Subject: [PATCH 19/58] Install supervistor in the workspace

---
 docker-compose.yml   |  1 +
 env-example          |  1 +
 workspace/Dockerfile | 12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 896adb59..8d679bac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,6 +121,7 @@ services:
           - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
           - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
           - INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
+          - INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
           - INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
           - INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
           - http_proxy
diff --git a/env-example b/env-example
index 1b714796..c8618f42 100644
--- a/env-example
+++ b/env-example
@@ -124,6 +124,7 @@ WORKSPACE_INSTALL_MC=false
 WORKSPACE_INSTALL_SYMFONY=false
 WORKSPACE_INSTALL_PYTHON=false
 WORKSPACE_INSTALL_POWERLINE=false
+WORKSPACE_INSTALL_SUPERVISOR=false
 WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
 WORKSPACE_INSTALL_IMAGEMAGICK=false
 WORKSPACE_INSTALL_TERRAFORM=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index f413e903..6081ebd3 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -957,6 +957,18 @@ RUN if [ ${INSTALL_POWERLINE} = true ]; then \
   ;fi \
 ;fi
 
+###########################################################################
+# SUPERVISOR:
+###########################################################################
+ARG INSTALL_SUPERVISOR=false
+
+RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \
+    if [ ${INSTALL_PYTHON} = true ]; then \
+    python -m pip install --upgrade supervisor && \
+    echo_supervisord_conf > /etc/supervisord.conf \
+  ;fi \
+;fi
+
 USER laradock
 
 ###########################################################################

From ef9eee2defacfeaba343a9130602ed7f09791d7b Mon Sep 17 00:00:00 2001
From: Mike Hingley <computa_mike@hotmail.com>
Date: Fri, 25 Oct 2019 16:45:46 +0100
Subject: [PATCH 20/58] fix slight typo

---
 DOCUMENTATION/content/documentation/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index d83b4422..e3ebbcbe 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -650,7 +650,7 @@ docker-compose up -d metabase
 
 1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`.
 
-2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping)
+2) Go to `http://localhost:8090/` (if you didn't change your default port mapping)
 
 3) Authenticate from the web app.
 

From f5c00c61bed2358a293e7ff4e838e4f2904fde3b Mon Sep 17 00:00:00 2001
From: Mike Hingley <computa_mike@hotmail.com>
Date: Fri, 25 Oct 2019 17:12:59 +0100
Subject: [PATCH 21/58] Update Confluence section

The original text was confusing.  Refactored to attempt to make more sense.
---
 DOCUMENTATION/content/documentation/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index e3ebbcbe..d2b91fb4 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -1054,7 +1054,7 @@ docker-compose up -d confluence
 
 2 - Open your browser and visit the localhost on port **8090**:  `http://localhost:8090`
 
-**Note:** You can you trial version and then you have to buy a licence to use it.
+**Note:** Confluence is a licensed application - an evaluation licence can be obtained from Atlassian.
 
 You can set custom confluence version in `CONFLUENCE_VERSION`. [Find more info in section 'Versioning'](https://hub.docker.com/r/atlassian/confluence-server/)
 

From 7247d8f7cef1c71595c08b5f1bcf3d14cba12b9a Mon Sep 17 00:00:00 2001
From: Lukas Besch <connect@lukasbesch.com>
Date: Fri, 25 Oct 2019 18:15:40 +0200
Subject: [PATCH 22/58] Install default-mysql-client for PHP 7.3 (#2329)

Install default-mysql-client for PHP 7.3
---
 php-fpm/Dockerfile    | 6 +++++-
 php-worker/Dockerfile | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d74ef345..69e8374f 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -708,7 +708,11 @@ ARG INSTALL_MYSQL_CLIENT=false
 
 RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
     apt-get update -yqq && \
-    apt-get -y install mysql-client \
+    if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
+      apt-get -y install default-mysql-client \
+    ;else \
+      apt-get -y install mysql-client \
+    ;fi \
 ;fi
 
 ###########################################################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index ac0c1404..9bccca0e 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -66,7 +66,11 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
 # Install MySQL Client:
 ARG INSTALL_MYSQL_CLIENT=false
 RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
-    apk --update add mysql-client \
+    if [ ${PHP_VERSION} = "7.3" ]; then \
+      apk --update add default-mysql-client \
+    ;else \
+      apk --update add mysql-client \
+    ;fi \
 ;fi
 
 # Install FFMPEG:

From 51d821b35f527edd4c618b646a31c23a5b8bd942 Mon Sep 17 00:00:00 2001
From: zill057 <hiwangzi@outlook.com>
Date: Mon, 28 Oct 2019 17:15:31 +0800
Subject: [PATCH 23/58] Add CHANGE_SOURCE option for php-worker

---
 docker-compose.yml    | 1 +
 php-worker/Dockerfile | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 896adb59..ee00bd25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -222,6 +222,7 @@ services:
       build:
         context: ./php-worker
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - PHP_VERSION=${PHP_VERSION}
           - PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 9bccca0e..350c40dc 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -9,6 +9,14 @@ FROM php:${PHP_VERSION}-alpine
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi
+
 RUN apk --update add wget \
   curl \
   git \

From 8b2bcc6d153e78c4f5289eb832513e787a84a04b Mon Sep 17 00:00:00 2001
From: Alone <794000949@qq.com>
Date: Mon, 28 Oct 2019 17:33:13 +0800
Subject: [PATCH 24/58] add config file for supervisord

---
 docker-compose.yml   | 1 +
 workspace/Dockerfile | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8d679bac..9d34be7e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,6 +129,7 @@ services:
           - no_proxy
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
+        - ./php-worker/supervisord.d:/etc/supervisord.d
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
       ports:
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6081ebd3..8a1d4c9d 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -965,7 +965,9 @@ ARG INSTALL_SUPERVISOR=false
 RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \
     if [ ${INSTALL_PYTHON} = true ]; then \
     python -m pip install --upgrade supervisor && \
-    echo_supervisord_conf > /etc/supervisord.conf \
+    echo_supervisord_conf > /etc/supervisord.conf && \
+    sed -i 's/\;\[include\]/\[include\]/g' /etc/supervisord.conf && \
+    sed -i 's/\;files\s.*/files = supervisord.d\/*.conf/g' /etc/supervisord.conf \
   ;fi \
 ;fi
 

From 41438e9c311e3d514e2a7b32805724336dca34fa Mon Sep 17 00:00:00 2001
From: Alone <794000949@qq.com>
Date: Mon, 28 Oct 2019 17:55:36 +0800
Subject: [PATCH 25/58] add install supervisor document

---
 DOCUMENTATION/content/documentation/index.md | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index d2b91fb4..d2d574c0 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -1865,6 +1865,27 @@ To install GNU Parallel in the Workspace container
 
 
 
+<br>
+<a name="Install-Supervisor"></a>
+## Install Supervisor
+
+Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems.
+
+(see http://supervisord.org/index.html)
+
+To install Supervisor in the Workspace container
+
+1 - Open the `.env` file
+
+2 - Set `WORKSPACE_INSTALL_SUPERVISOR` and `WORKSPACE_INSTALL_PYTHON` to `true`.
+
+3 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 
+
+
+
+
+
+
 <br>
 <a name="Common-Aliases"></a>
 <br>

From 7ad82a3cd1f864d21de73b513f24760b5c96a4de Mon Sep 17 00:00:00 2001
From: Anton Sannikov <a.sannikov@limesoda.com>
Date: Thu, 31 Oct 2019 11:50:39 +0300
Subject: [PATCH 26/58] Added nginx settings for confluence

---
 DOCUMENTATION/content/documentation/index.md | 10 +++++
 nginx/sites/confluence.conf.example          | 43 ++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 nginx/sites/confluence.conf.example

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index d2b91fb4..14d9e331 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -1044,6 +1044,7 @@ _Note: You can customize the port on which beanstalkd console is listening by ch
 
 <br>
 <a name="Use-Confluence"></a>
+
 ## Use Confluence
 
 1 - Run the Confluence Container (`confluence`) with the `docker-compose up` command. Example:
@@ -1058,6 +1059,15 @@ docker-compose up -d confluence
 
 You can set custom confluence version in `CONFLUENCE_VERSION`. [Find more info in section 'Versioning'](https://hub.docker.com/r/atlassian/confluence-server/)
 
+
+##### Confluence usage with Nginx and SSL.
+
+1. Find an instance configuration file in `nginx/sites/confluence.conf.example` and replace sample domain with yours.
+
+2. Configure ssl keys to your domain.
+
+Keep in mind that Confluence is still accessible on 8090 anyway.
+
 <br>
 <a name="Use-ElasticSearch"></a>
 ## Use ElasticSearch
diff --git a/nginx/sites/confluence.conf.example b/nginx/sites/confluence.conf.example
new file mode 100644
index 00000000..f804956b
--- /dev/null
+++ b/nginx/sites/confluence.conf.example
@@ -0,0 +1,43 @@
+server {
+    listen 80;
+    listen [::]:80;
+    server_name www.confluence-domain.com;
+    rewrite ^(.*) https://confluence-domain.com$1/ permanent;
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name confluence-domain.com;
+    rewrite ^(.*) https://confluence-domain.com/ permanent;
+}
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    ssl_certificate /etc/nginx/ssl/confluence-domain.com.crt;
+    ssl_certificate_key /etc/nginx/ssl/confluence-domain.com.key;
+
+    server_name confluence-domain.com;
+
+    location / {
+            client_max_body_size 100m;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Server $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://confluence-domain.com:8090/;
+    }
+
+    location /synchrony {
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://confluence-domain.com:8090/synchrony-proxy;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    error_log /var/log/nginx/bookchangerru_error.log;
+    access_log /var/log/nginx/bookchangerru_access.log;
+}

From 402ea8747a020590ccc7c5a8606fb3f212e0b7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAnior=20Ara=C3=BAjo?= <walter.jrp@live.com>
Date: Fri, 1 Nov 2019 14:35:23 -0300
Subject: [PATCH 27/58] Install MongoDB drivers

---
 laravel-horizon/Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index 5ce1d8ef..425499d6 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -74,6 +74,12 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
   && docker-php-ext-enable cassandra \
 ;fi
 
+# Install MongoDB drivers:
+ARG INSTALL_MONGO=false
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+  pecl install mongodb \
+  && docker-php-ext-enable mongodb \
+  ;fi
 
 
 ###########################################################################

From 10c28a14fa5ec044ce55e6aeaead6f296c62575b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=85=8B?= <goodjack@users.noreply.github.com>
Date: Sat, 2 Nov 2019 21:19:37 +0800
Subject: [PATCH 28/58] Use default user

---
 DOCUMENTATION/content/documentation/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index d83b4422..0e01cec7 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -76,7 +76,7 @@ docker-compose exec mysql bash
 *Example: enter to MySQL prompt within MySQL container*
 
 ```bash
-docker-compose exec mysql mysql -u homestead -psecret
+docker-compose exec mysql mysql -udefault -psecret
 ```
 
 3 - To exit a container, type `exit`.
@@ -1575,7 +1575,7 @@ The default username and password for the root MySQL user are `root` and `root `
 
 1 - Enter the MySQL container: `docker-compose exec mysql bash`.
 
-2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -uhomestead -psecret`.
+2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -udefault -psecret`.
 
 3 - See all users: `SELECT User FROM mysql.user;`
 

From c6ad0a1a2d7d7c02b2a11f8733c5be6554e0fca5 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoudz.me@gmail.com>
Date: Wed, 13 Nov 2019 19:58:39 +0100
Subject: [PATCH 29/58] Remove a dead link from the documentation

---
 DOCUMENTATION/content/introduction/index.md | 1 -
 README.md                                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index fc4f6241..0505d981 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -36,7 +36,6 @@ Supporting a variety of common services, all pre-configured to provide a full PH
 <a name="sponsors"></a>
 ## Sponsors
 
-<a href="https://opencollective.com/socketio/sponsor/23/website" target="_blank"><img src="https://opencollective.com/socketio/sponsor/23/avatar.svg"></a>
 <a href="https://opencollective.com/laradock/sponsor/0/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg?requireActive=false"></a>
 <a href="https://opencollective.com/laradock/sponsor/1/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg?requireActive=false"></a>
 <a href="https://opencollective.com/laradock/sponsor/2/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg?requireActive=false"></a>
diff --git a/README.md b/README.md
index 3e794ffc..09c7c489 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,6 @@ Contribute and help us sustain the project.
 
 ## Sponsors
 
-<a href="https://opencollective.com/socketio/sponsor/23/website" target="_blank"><img src="https://opencollective.com/socketio/sponsor/23/avatar.svg"></a>
 <a href="https://opencollective.com/laradock/sponsor/0/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg?requireActive=false"></a>
 <a href="https://opencollective.com/laradock/sponsor/1/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg?requireActive=false"></a>
 <a href="https://opencollective.com/laradock/sponsor/2/website?requireActive=false" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg?requireActive=false"></a>

From 4e5a142c9d89e6b5d9f3186fa86cbbd6142e8070 Mon Sep 17 00:00:00 2001
From: Valentino Lauciani <vlauciani@gmail.com>
Date: Wed, 13 Nov 2019 23:08:54 +0100
Subject: [PATCH 30/58] YAML extension for php-cli (#2360)

* Add 'WORKSPACE_INSTALL_YAML' variable to install php yaml extension for php-cli

* Set 'INSTALL_YAML' variable to install php yaml extension for php-cli

* Install yaml extension for php-cli
---
 docker-compose.yml   |  1 +
 env-example          |  3 ++-
 workspace/Dockerfile | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0bc79725..d2152543 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -110,6 +110,7 @@ services:
           - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
           - INSTALL_PING=${WORKSPACE_INSTALL_PING}
           - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
+          - INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
           - INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
diff --git a/env-example b/env-example
index 673deb0a..a52f36ef 100644
--- a/env-example
+++ b/env-example
@@ -140,6 +140,7 @@ WORKSPACE_INSTALL_PING=false
 WORKSPACE_INSTALL_SSHPASS=false
 WORKSPACE_INSTALL_INOTIFY=false
 WORKSPACE_INSTALL_FSWATCH=false
+WORKSPACE_INSTALL_YAML=false
 WORKSPACE_INSTALL_MAILPARSE=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
@@ -826,4 +827,4 @@ GEARMAN_MYSQL_PASSWORD_FILE=
 # Database to use by Gearman (Default: Gearmand)
 GEARMAN_MYSQL_DB=Gearmand
 # Table to use by Gearman (Default: gearman_queue)
-GEARMAN_MYSQL_TABLE=gearman_queue
\ No newline at end of file
+GEARMAN_MYSQL_TABLE=gearman_queue
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 8a1d4c9d..58bd4633 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1101,6 +1101,25 @@ RUN if [ ${INSTALL_SSHPASS} = true ]; then \
     apt-get -y install sshpass \
 ;fi
 
+###########################################################################
+# YAML: extension for PHP-CLI
+###########################################################################
+
+USER root
+
+ARG INSTALL_YAML=false
+
+RUN if [ ${INSTALL_YAML} = true ]; then \
+    apt-get install libyaml-dev -y ; \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+        pecl install -a yaml-1.3.2; \
+    else \
+        pecl install yaml; \
+    fi && \
+    echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini && \
+    ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \
+;fi
+
 ###########################################################################
 # FFMpeg:
 ###########################################################################

From c3620e95c8c6174f07c593e7fee3c7a6b2bdc1d7 Mon Sep 17 00:00:00 2001
From: StefanT123 <stefan8tanevski@gmail.com>
Date: Wed, 13 Nov 2019 23:22:41 +0100
Subject: [PATCH 31/58] Volumes are created on every docker start (#2247)

* Added graylog to the list of softwares.

* Added persistent volumes for docker-in-docker and graylog.

Added volume for mongo configdb.
These services were making volumes on every start, so we might end up with many unnecessary volumes.
With this pull request this issue is resolved.
---
 docker-compose.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d2152543..4f32e05b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,10 @@ volumes:
     driver: ${VOLUMES_DRIVER}
   cassandra:
     driver: ${VOLUMES_DRIVER}
+  graylog:
+    driver: ${VOLUMES_DRIVER}
+  dind:
+    driver: ${VOLUMES_DRIVER}
 
 services:
 
@@ -503,6 +507,7 @@ services:
         - "${MONGODB_PORT}:27017"
       volumes:
         - ${DATA_PATH_HOST}/mongo:/data/db
+        - ${DATA_PATH_HOST}/mongo_config:/data/configdb
       networks:
         - backend
 
@@ -936,9 +941,9 @@ services:
           - ${GRAYLOG_GELF_TCP_PORT}:12201
           # GELF UDP
           - ${GRAYLOG_GELF_UDP_PORT}:12201/udp
-        user: root
+        user: graylog
         volumes:
-          - ./graylog/config:/usr/share/graylog/data/config
+          - ${DATA_PATH_HOST}/graylog:/usr/share/graylog/data
         networks:
           - backend
 
@@ -1218,6 +1223,7 @@ services:
       privileged: true
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
+        - ${DATA_PATH_HOST}/dind:/var/lib/docker
       expose:
         - 2375
       networks:

From 07c019b672bcac8d6d6fffb13f70512e4247c7ba Mon Sep 17 00:00:00 2001
From: Joe Sweeney <joe.sweeney224@gmail.com>
Date: Wed, 13 Nov 2019 22:10:41 -0700
Subject: [PATCH 32/58] Fix confluence / postgres init

---
 postgres/docker-entrypoint-initdb.d/init_confluence_db.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh b/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
index ce5e9f72..aa744a1b 100644
--- a/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
+++ b/postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
@@ -33,7 +33,7 @@
 # EOSQL
 # 
 ### default database and user for confluence ##############################################
-if [ "$POSTGRES_CONFLUENCE_INIT" == 'true' ]; then
+if [ "$CONFLUENCE_POSTGRES_INIT" == 'true' ]; then
 	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
 		CREATE USER $POSTGRES_CONFLUENCE_USER WITH PASSWORD '$POSTGRES_CONFLUENCE_PASSWORD';
 		CREATE DATABASE $POSTGRES_CONFLUENCE_DB;
@@ -41,4 +41,4 @@ if [ "$POSTGRES_CONFLUENCE_INIT" == 'true' ]; then
 		ALTER ROLE $POSTGRES_CONFLUENCE_USER CREATEROLE SUPERUSER;
 	EOSQL
 	echo
-fi
\ No newline at end of file
+fi

From d3e505cd73a9ed44373b0efdb69aa15a096f687a Mon Sep 17 00:00:00 2001
From: Lan Phan <lanphan@Lans-MacBook-Pro.local>
Date: Thu, 14 Nov 2019 22:34:23 +0700
Subject: [PATCH 33/58] remove duplicated laravel installer code

---
 workspace/Dockerfile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 58bd4633..4bef4dfc 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -777,13 +777,6 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \
     composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \
 ;fi
 
-ARG INSTALL_LARAVEL_INSTALLER=false
-
-RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
-    # Install the Laravel Installer
-	composer global require "laravel/installer" \
-;fi
-
 ###########################################################################
 # Deployer:
 ###########################################################################

From 440002f0fc861ffad21ea6b4fbce12becc11d376 Mon Sep 17 00:00:00 2001
From: bkarstaedt <bastian.karstaedt@gmail.com>
Date: Fri, 15 Nov 2019 09:52:48 +0100
Subject: [PATCH 34/58] Update to Kibana 7.1.1

When spinning up the stack via `docker-compose -d apache2 elasticsearch kibana` Kibana won't work currently and displays "kibana is not ready yet". `docker-compose logs kibana` the message:

```
{"type":"log","@timestamp":"2019-11-14T15:46:37Z","tags":["status","plugin:reporting@6.6.0","error"],"pid":1,"state":"red","message":"Status changed from uninitialized to red - This version of Kibana requires Elasticsearch v6.6.0 on all nodes. I found the following incompatible nodes in your cluster: v7.1.1 @ 172.26.0.3:9200 (172.26.0.3)","prevState":"uninitialized","prevMsg":"uninitialized"}
```

I update the version to align with elasticsearchs' version which works fine on my machine.
---
 kibana/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index badfd80a..b831d6d0 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/kibana/kibana:6.6.0
+FROM docker.elastic.co/kibana/kibana:7.1.1
 
 EXPOSE 5601

From aff7d9d615cd2aba00d9f2f1b8d03d1f643268a2 Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Mon, 18 Nov 2019 03:05:13 +0800
Subject: [PATCH 35/58] add nvm NVM_NODEJS_ORG_MIRROR

---
 docker-compose.yml   | 1 +
 env-example          | 1 +
 workspace/Dockerfile | 1 +
 3 files changed, 3 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4f32e05b..41a4aeae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,6 +77,7 @@ services:
           - INSTALL_GEARMAN=${WORKSPACE_INSTALL_GEARMAN}
           - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
           - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
+          - NVM_NODEJS_ORG_MIRROR=${WORKSPACE_NVM_NODEJS_ORG_MIRROR}
           - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
           - NPM_REGISTRY=${WORKSPACE_NPM_REGISTRY}
           - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
diff --git a/env-example b/env-example
index a52f36ef..cdc3874b 100644
--- a/env-example
+++ b/env-example
@@ -84,6 +84,7 @@ DOCKER_SYNC_STRATEGY=native_osx
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
 WORKSPACE_COMPOSER_AUTH=false
 WORKSPACE_COMPOSER_REPO_PACKAGIST=
+WORKSPACE_NVM_NODEJS_ORG_MIRROR=
 WORKSPACE_INSTALL_NODE=true
 WORKSPACE_NODE_VERSION=node
 WORKSPACE_NPM_REGISTRY=
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 58bd4633..28ff0a6c 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -580,6 +580,7 @@ ARG INSTALL_NPM_ANGULAR_CLI=false
 ARG NPM_REGISTRY
 ENV NPM_REGISTRY ${NPM_REGISTRY}
 ENV NVM_DIR /home/laradock/.nvm
+ENV NVM_NODEJS_ORG_MIRROR=${NVM_NODEJS_ORG_MIRROR}
 
 RUN if [ ${INSTALL_NODE} = true ]; then \
     # Install nvm (A Node Version Manager)

From 461e05d677cff58b7e1727caa7ff0f2bb390a5b6 Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Mon, 18 Nov 2019 03:24:27 +0800
Subject: [PATCH 36/58] change workspace ubuntu sources.list file

---
 workspace/Dockerfile |  9 +++++
 workspace/sources.sh | 81 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100755 workspace/sources.sh

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 28ff0a6c..f9b3ec6d 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -36,6 +36,15 @@ ENV PUID ${PUID}
 ARG PGID=1000
 ENV PGID ${PGID}
 
+COPY ./sources.sh /tmp/sources.sh
+
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    chmod +x /tmp/sources.sh && \
+    # bash /tmp/sources.sh aliyun
+    # ./tmp/sources.sh aliyun
+    /bin/bash /tmp/sources.sh aliyun && \
+;fi
+
 # always run apt update when start and after add new source list, then clean up at end.
 RUN set -xe; \
     apt-get update -yqq && \
diff --git a/workspace/sources.sh b/workspace/sources.sh
new file mode 100755
index 00000000..61da3a24
--- /dev/null
+++ b/workspace/sources.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+if type "tee" 2>/dev/null && [ -n "$1" ]; then
+    SOURCE_PATH="/etc/apt/sources.list"
+    cp ${SOURCE_PATH} ${SOURCE_PATH}.bak && rm -rf ${SOURCE_PATH}
+    case "$1" in
+        "aliyun")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "zju")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+EOF
+;;
+        "tsinghua")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        "163")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "ustc")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        *)
+            echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter"
+            exit 1;;
+    esac
+fi
\ No newline at end of file

From 24361ca818ca41577d8f8de4966b36de84445002 Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Sat, 30 Nov 2019 08:51:23 +0800
Subject: [PATCH 37/58] add ubuntu sources.list

---
 docker-compose.yml   |  3 ++
 env-example          |  2 ++
 workspace/Dockerfile |  8 ++---
 workspace/sources.sh | 81 --------------------------------------------
 4 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100755 workspace/sources.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 41a4aeae..d1fde5c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -133,6 +133,8 @@ services:
           - http_proxy
           - https_proxy
           - no_proxy
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
+          - UBUNTU_SOURCE=${UBUNTU_SOURCE}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
         - ./php-worker/supervisord.d:/etc/supervisord.d
@@ -156,6 +158,7 @@ services:
         context: ./php-fpm
         args:
           - CHANGE_SOURCE=${CHANGE_SOURCE}
+          - UBUNTU_SOURCE=${UBUNTU_SOURCE}
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
diff --git a/env-example b/env-example
index cdc3874b..aee4d62d 100644
--- a/env-example
+++ b/env-example
@@ -69,6 +69,8 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1
 
 # If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true
 CHANGE_SOURCE=false
+# Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file.
+UBUNTU_SOURCE=aliyun
 
 ### Docker Sync ###########################################
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d38bb167..a997e080 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -36,13 +36,13 @@ ENV PUID ${PUID}
 ARG PGID=1000
 ENV PGID ${PGID}
 
+ARG CHANGE_SOURCE=false
+ARG UBUNTU_SOURCE
 COPY ./sources.sh /tmp/sources.sh
 
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
-    chmod +x /tmp/sources.sh && \
-    # bash /tmp/sources.sh aliyun
-    # ./tmp/sources.sh aliyun
-    /bin/bash /tmp/sources.sh aliyun && \
+    /bin/sh -c /tmp/sources.sh ${UBUNTU_SOURCE} && \
+    rm -rf /tmp/sources.sh \
 ;fi
 
 # always run apt update when start and after add new source list, then clean up at end.
diff --git a/workspace/sources.sh b/workspace/sources.sh
deleted file mode 100755
index 61da3a24..00000000
--- a/workspace/sources.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-if type "tee" 2>/dev/null && [ -n "$1" ]; then
-    SOURCE_PATH="/etc/apt/sources.list"
-    cp ${SOURCE_PATH} ${SOURCE_PATH}.bak && rm -rf ${SOURCE_PATH}
-    case "$1" in
-        "aliyun")
-            tee ${SOURCE_PATH} <<-'EOF'
-deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
-deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
-deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
-deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
-deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
-deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
-deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
-deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
-deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
-deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
-EOF
-;;
-        "zju")
-            tee ${SOURCE_PATH} <<-'EOF'
-deb http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
-deb http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
-deb http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
-deb http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
-deb http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
-deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
-deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
-deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
-deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
-deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
-EOF
-;;
-        "tsinghua")
-            tee ${SOURCE_PATH} <<-'EOF'
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
-deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
-deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
-deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
-deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
-deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
-EOF
-;;
-        "163")
-            tee ${SOURCE_PATH} <<-'EOF'
-deb http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
-deb-src http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
-deb-src http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
-deb-src http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
-deb-src http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
-deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
-EOF
-;;
-        "ustc")
-            tee ${SOURCE_PATH} <<-'EOF'
-deb https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
-deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
-deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
-deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
-deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
-deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
-deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
-deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
-deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
-deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
-EOF
-;;
-        *)
-            echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter"
-            exit 1;;
-    esac
-fi
\ No newline at end of file

From c64be9969fb957f95c55e4e83c995660fcaf7a0b Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Sat, 30 Nov 2019 08:54:29 +0800
Subject: [PATCH 38/58] delete php-fpm args UBUNTU_SOURCE

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d1fde5c7..1e61eb4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -158,7 +158,6 @@ services:
         context: ./php-fpm
         args:
           - CHANGE_SOURCE=${CHANGE_SOURCE}
-          - UBUNTU_SOURCE=${UBUNTU_SOURCE}
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}

From fe2631649cf23e18894101c6548d76f5cb025ee6 Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Sat, 30 Nov 2019 09:06:09 +0800
Subject: [PATCH 39/58] add sources.sh for workspace

---
 workspace/sources.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100755 workspace/sources.sh

diff --git a/workspace/sources.sh b/workspace/sources.sh
new file mode 100755
index 00000000..eef06706
--- /dev/null
+++ b/workspace/sources.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+set -xe;
+
+if type "tee" 2>/dev/null && [ -n "${UBUNTU_SOURCE}" ]; then
+    SOURCE_PATH="/etc/apt/sources.list"
+    cp ${SOURCE_PATH} ${SOURCE_PATH}.bak && rm -rf ${SOURCE_PATH}
+    case "${UBUNTU_SOURCE}" in
+        "aliyun")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "zju")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe
+deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe
+EOF
+;;
+        "tsinghua")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        "163")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse
+EOF
+;;
+        "ustc")
+            tee ${SOURCE_PATH} <<-'EOF'
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse
+deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse
+EOF
+;;
+        *)
+            echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter"
+            exit 1;;
+    esac
+fi
\ No newline at end of file

From 919cfc0c87c07725756c848a81bbe615de98b312 Mon Sep 17 00:00:00 2001
From: Shao Yu Lung <bestlong168@gmail.com>
Date: Sat, 30 Nov 2019 18:26:16 +0800
Subject: [PATCH 40/58] increase update filesize to 2G

#2344
---
 phpmyadmin/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile
index 75812d9b..ded59baf 100644
--- a/phpmyadmin/Dockerfile
+++ b/phpmyadmin/Dockerfile
@@ -5,5 +5,10 @@ LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>"
 # Add volume for sessions to allow session persistence
 VOLUME /sessions
 
+RUN echo '' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo '[PHP]' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo 'post_max_size = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \
+ && echo 'upload_max_filesize = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini
+
 # We expose phpMyAdmin on port 80
 EXPOSE 80

From 497878557c9ed4663237e902ed12d63888638ef5 Mon Sep 17 00:00:00 2001
From: alone <794000949@qq.com>
Date: Sun, 1 Dec 2019 00:02:59 +0800
Subject: [PATCH 41/58] Remove the sources.sh Ubuntu_Source parameter

---
 workspace/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index a997e080..f4514578 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -41,7 +41,7 @@ ARG UBUNTU_SOURCE
 COPY ./sources.sh /tmp/sources.sh
 
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
-    /bin/sh -c /tmp/sources.sh ${UBUNTU_SOURCE} && \
+    /bin/sh -c /tmp/sources.sh && \
     rm -rf /tmp/sources.sh \
 ;fi
 

From f5f1f458586a96521e21591f87c14f1000021a3e Mon Sep 17 00:00:00 2001
From: Vladyslav Startsev <vladyslavstartsev@gmail.com>
Date: Tue, 3 Dec 2019 12:53:42 +0200
Subject: [PATCH 42/58] added cachetool to invalidate shared php cache (APCu,
 OPcache) without reloading PHP-FPM

---
 docker-compose.yml |  1 +
 env-example        |  1 +
 php-fpm/Dockerfile | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4f32e05b..8e84141a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -192,6 +192,7 @@ services:
           - INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME}
           - INSTALL_IONCUBE=${PHP_FPM_INSTALL_IONCUBE}
           - INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
+          - INSTALL_CACHETOOL=${PHP_FPM_INSTALL_CACHETOOL}
           - INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
           - INSTALL_RDKAFKA=${PHP_FPM_INSTALL_RDKAFKA}
           - INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
diff --git a/env-example b/env-example
index a52f36ef..f3d51ce6 100644
--- a/env-example
+++ b/env-example
@@ -190,6 +190,7 @@ PHP_FPM_INSTALL_IONCUBE=false
 PHP_FPM_INSTALL_RDKAFKA=false
 PHP_FPM_FAKETIME=-0
 PHP_FPM_INSTALL_APCU=false
+PHP_FPM_INSTALL_CACHETOOL=false
 PHP_FPM_INSTALL_YAML=false
 PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false
 PHP_FPM_INSTALL_MYSQL_CLIENT=false
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 20474893..01f025b7 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -767,6 +767,22 @@ RUN if [ ${INSTALL_MAILPARSE} = true ]; then \
     &&  docker-php-ext-enable mailparse \
 ;fi
 
+###########################################################################
+# CacheTool:
+###########################################################################
+
+ARG INSTALL_CACHETOOL=false
+
+RUN if [ ${INSTALL_CACHETOOL} = true ]; then \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -ge 1 ]; then \
+            curl -sO http://gordalina.github.io/cachetool/downloads/cachetool.phar; \
+    else \
+        curl http://gordalina.github.io/cachetool/downloads/cachetool-3.2.1.phar -o cachetool.phar; \
+    fi && \
+    chmod +x cachetool.phar && \
+    mv cachetool.phar /usr/local/bin/cachetool \
+;fi
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################

From abdcfa10029a1c7235ddcc3ee6f86dd534df08d9 Mon Sep 17 00:00:00 2001
From: Bagus Erlang <erlangparasu@gmail.com>
Date: Wed, 4 Dec 2019 15:38:52 +0800
Subject: [PATCH 43/58] Update index.md

---
 DOCUMENTATION/content/documentation/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index a8bdcb86..e0e88282 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -536,7 +536,7 @@ Note: Should add `--user=laradock` (example `docker-compose exec --user=laradock
 php artisan
 ```
 ```bash
-Composer update
+composer update
 ```
 ```bash
 phpunit

From 351f19b8fe3a9839ba0c63bfc5234f17402371c1 Mon Sep 17 00:00:00 2001
From: Shao Yu Lung <bestlong168@gmail.com>
Date: Wed, 4 Dec 2019 23:02:35 +0800
Subject: [PATCH 44/58] support PHP 7.4, #2387.

---
 php-fpm/Dockerfile   | 2 +-
 workspace/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 20474893..73cf44fd 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -14,7 +14,7 @@
 
 ARG LARADOCK_PHP_VERSION
 
-FROM laradock/php-fpm:2.5-${LARADOCK_PHP_VERSION}
+FROM laradock/php-fpm:2.6.1-${LARADOCK_PHP_VERSION}
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 4bef4dfc..0be87f8d 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -14,7 +14,7 @@
 
 ARG LARADOCK_PHP_VERSION
 
-FROM laradock/workspace:2.5-${LARADOCK_PHP_VERSION}
+FROM laradock/workspace:2.6.1-${LARADOCK_PHP_VERSION}
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 

From 9e5ff1888e50c12437c78628b7e5d7d6d060a72f Mon Sep 17 00:00:00 2001
From: Shao Yu Lung <bestlong168@gmail.com>
Date: Thu, 5 Dec 2019 10:29:08 +0800
Subject: [PATCH 45/58] update document

---
 DOCUMENTATION/content/introduction/index.md | 2 +-
 env-example                                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index 0505d981..85115551 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -12,7 +12,7 @@ Supporting a variety of common services, all pre-configured to provide a full PH
 <a name="features"></a>
 ## Features
 
-- Easy switch between PHP versions: 7.3, 7.2, 7.1, 5.6...
+- 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...
diff --git a/env-example b/env-example
index a52f36ef..9e25ea5b 100644
--- a/env-example
+++ b/env-example
@@ -37,7 +37,8 @@ COMPOSE_PROJECT_NAME=laradock
 
 ### PHP Version ###########################################
 
-# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.3 - 7.2 - 7.1 - 7.0 - 5.6
+# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
+# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 PHP_VERSION=7.3
 
 ### Phalcon Version ###########################################

From 4afc747bf5fee439a6377532c2ce3d135f49d2cd Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Thu, 5 Dec 2019 10:46:24 +0800
Subject: [PATCH 46/58] Update docker-compose.yml

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 896adb59..362ebb67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -262,6 +262,7 @@ services:
           - INSTALL_SOCKETS=${LARAVEL_HORIZON_INSTALL_SOCKETS}
           - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
           - INSTALL_PHPREDIS=${LARAVEL_HORIZON_INSTALL_PHPREDIS}
+          - INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
         - ./laravel-horizon/supervisord.d:/etc/supervisord.d

From 8474acdf17ce8f6397d91e48b2e472490a991d0c Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Thu, 5 Dec 2019 10:47:31 +0800
Subject: [PATCH 47/58] Update env-example

---
 env-example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/env-example b/env-example
index 1b714796..f021aaa6 100644
--- a/env-example
+++ b/env-example
@@ -232,6 +232,7 @@ NGINX_SSL_PATH=./nginx/ssl/
 
 LARAVEL_HORIZON_INSTALL_SOCKETS=false
 LARAVEL_HORIZON_INSTALL_PHPREDIS=true
+LARAVEL_HORIZON_INSTALL_MONGO=false
 
 ### APACHE ################################################
 
@@ -822,4 +823,4 @@ GEARMAN_MYSQL_PASSWORD_FILE=
 # Database to use by Gearman (Default: Gearmand)
 GEARMAN_MYSQL_DB=Gearmand
 # Table to use by Gearman (Default: gearman_queue)
-GEARMAN_MYSQL_TABLE=gearman_queue
\ No newline at end of file
+GEARMAN_MYSQL_TABLE=gearman_queue

From b6204e5933e8a7173ce143432fe20fe8150e034a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:16:32 +0800
Subject: [PATCH 48/58] pref: add change source flag

---
 docker-compose.yml         |  4 +++-
 laravel-horizon/Dockerfile | 10 +++++++++-
 php-worker/Dockerfile      |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b0b297c7..acbe2264 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -234,6 +234,7 @@ services:
       build:
         context: ./php-worker
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - PHP_VERSION=${PHP_VERSION}
           - PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
@@ -267,6 +268,7 @@ services:
       build:
         context: ./laravel-horizon
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - PHP_VERSION=${PHP_VERSION}
           - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
           - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
@@ -290,9 +292,9 @@ services:
       build:
         context: ./nginx
         args:
+          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - PHP_UPSTREAM_CONTAINER=${NGINX_PHP_UPSTREAM_CONTAINER}
           - PHP_UPSTREAM_PORT=${NGINX_PHP_UPSTREAM_PORT}
-          - CHANGE_SOURCE=${CHANGE_SOURCE}
           - http_proxy
           - https_proxy
           - no_proxy
diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index 425499d6..9edbe14b 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -9,6 +9,14 @@ FROM php:${PHP_VERSION}-alpine
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi
+
 RUN apk --update add wget \
   curl \
   git \
@@ -50,7 +58,7 @@ ARG INSTALL_CASSANDRA=false
 RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
   apk --update add cassandra-cpp-driver \
   ;fi
-  
+
 # Install PhpRedis package:
 ARG INSTALL_PHPREDIS=false
 RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 9bccca0e..350c40dc 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -9,6 +9,14 @@ FROM php:${PHP_VERSION}-alpine
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi
+
 RUN apk --update add wget \
   curl \
   git \

From 5a0c9054571ba69a6b5ba3cc777234295a6133ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:23:51 +0800
Subject: [PATCH 49/58] feat: change source

---
 docker-compose.yml            |  3 ---
 php-fpm/xdebug.ini            |  2 +-
 workspace/Dockerfile          |  7 ++++---
 workspace/ubuntu.sources.list | 15 ---------------
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 workspace/ubuntu.sources.list

diff --git a/docker-compose.yml b/docker-compose.yml
index acbe2264..d5de70b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -216,7 +216,6 @@ services:
         - "9000"
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
-      dns: 114.114.114.114
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
         - DOCKER_HOST=tcp://docker-in-docker:2375
@@ -228,7 +227,6 @@ services:
       links:
         - docker-in-docker
 
-
 ### PHP Worker ############################################
     php-worker:
       build:
@@ -379,7 +377,6 @@ services:
         context: ./mysql
         args:
           - MYSQL_VERSION=${MYSQL_VERSION}
-      command: "--innodb_use_native_aio=0"
       environment:
         - MYSQL_DATABASE=${MYSQL_DATABASE}
         - MYSQL_USER=${MYSQL_USER}
diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index 9bc6578f..8560f98b 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -6,7 +6,7 @@ xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
-xdebug.remote_enable=1
+xdebug.remote_enable=0
 xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 70b5ab40..18eb306a 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -25,11 +25,12 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
 
-ADD ubuntu.sources.list /etc/apt/ubuntu.sources.list
 ARG CHANGE_SOURCE=false
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
-  mv /etc/apt/sources.list /etc/apt/sources.list.back && \
-  mv /etc/apt/ubuntu.sources.list /etc/apt/sources.list \
+    # Change application source from deb.debian.org to aliyun source
+    sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \
 ;fi
 
 # Start as root
diff --git a/workspace/ubuntu.sources.list b/workspace/ubuntu.sources.list
deleted file mode 100644
index 6edaa130..00000000
--- a/workspace/ubuntu.sources.list
+++ /dev/null
@@ -1,15 +0,0 @@
-deb http://mirrors.aliyun.com/ubuntu/ xenial main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial main
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial universe
-deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial-security main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main
-deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security universe
\ No newline at end of file

From dab5ff1ac6a41818a2d3df2ea1e0af4c470b8efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:26:01 +0800
Subject: [PATCH 50/58] feat: restore mysql/my.cnf

---
 mysql/my.cnf | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/mysql/my.cnf b/mysql/my.cnf
index a7facd5c..e03ccf88 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -6,11 +6,5 @@
 [mysql]
 
 [mysqld]
-sql-mode="STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
-character-set-server=utf8mb4
-skip-name-resolve
-symbolic-links=0
-explicit_defaults_for_timestamp
-default_authentication_plugin=mysql_native_password
-#skip-grant-tables=1
-
+sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
+character-set-server=utf8

From 2c9563d2cdf35b441a1e75f159ca3e18d928b57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:27:44 +0800
Subject: [PATCH 51/58] feat: restore some file

---
 php-fpm/Dockerfile   | 2 +-
 workspace/xdebug.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 789bbadc..73e55a96 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -590,7 +590,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install --fix-missing -y libmagickwand-dev imagemagick && \
+    apt-get install -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
index 9bc6578f..8560f98b 100644
--- a/workspace/xdebug.ini
+++ b/workspace/xdebug.ini
@@ -6,7 +6,7 @@ xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
-xdebug.remote_enable=1
+xdebug.remote_enable=0
 xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"

From c84db7d4d7cdab1639fa6944fda2b0b8609a3c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:48:27 +0800
Subject: [PATCH 52/58] fix: fix the extension cannot install problem.

---
 php-fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 73e55a96..f1e66c71 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -590,7 +590,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y libmagickwand-dev imagemagick && \
+    apt-get install -y --fix-missing libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi

From 9bdeaa3682976d61f3a66f50b5fa4e6e19d5f80f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 13:21:10 +0800
Subject: [PATCH 53/58] fix: fix cannot install imagemagick extension problem

---
 php-fpm/Dockerfile   | 6 +++---
 workspace/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index f1e66c71..3e4bac25 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND noninteractive
 ARG CHANGE_SOURCE=false
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
     # Change application source from deb.debian.org to aliyun source
-    sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
-    sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
-    sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \
+    sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \
 ;fi
 
 # always run apt update when start and after add new source list, then clean up at end.
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 18eb306a..ca34a561 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND noninteractive
 ARG CHANGE_SOURCE=false
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
     # Change application source from deb.debian.org to aliyun source
-    sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
-    sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
-    sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \
+    sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \
 ;fi
 
 # Start as root

From 838156b1bdede7519e79a85fd077305f3b9d16fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 13:28:42 +0800
Subject: [PATCH 54/58] refactor: remove some option

---
 php-fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 3e4bac25..8dfa9f15 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -590,7 +590,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --fix-missing libmagickwand-dev imagemagick && \
+    apt-get install -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi

From ed6be69cc1f6e02e234037f4eabe3000bb6a98a1 Mon Sep 17 00:00:00 2001
From: Bagus Erlang <erlangparasu@gmail.com>
Date: Fri, 6 Dec 2019 03:50:41 +0800
Subject: [PATCH 55/58] typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 09c7c489..53e29e0a 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ Laradock exists thanks to all the people who contribute.
 
 ### Code Contributors
 
-<a href="https://github.com/undefined/undefined/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890&button=false" /></a>
+<a href="https://github.com/laradock/laradock/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890&button=false" /></a>
 
 ### Financial Contributors
 

From 84db9b079d9c28c2cc6a3456b7d2000b8f500008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Fri, 6 Dec 2019 09:30:11 +0800
Subject: [PATCH 56/58] =?UTF-8?q?refactor:=20=E8=BF=98=E5=8E=9F=20xdebug.i?=
 =?UTF-8?q?ni?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 php-fpm/xdebug.ini   | 6 +-----
 workspace/xdebug.ini | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index 8560f98b..c3f32ece 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -7,17 +7,13 @@ xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
 xdebug.remote_enable=0
-xdebug.cli_color=1
+xdebug.cli_color=0
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
 
-xdebug.auto_trace = 1
-xdebug.collect_params = 1
-xdebug.collect_return = 1
-
 xdebug.var_display_max_children=-1
 xdebug.var_display_max_data=-1
 xdebug.var_display_max_depth=-1
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
index 8560f98b..c3f32ece 100644
--- a/workspace/xdebug.ini
+++ b/workspace/xdebug.ini
@@ -7,17 +7,13 @@ xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
 xdebug.remote_enable=0
-xdebug.cli_color=1
+xdebug.cli_color=0
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
 
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
 
-xdebug.auto_trace = 1
-xdebug.collect_params = 1
-xdebug.collect_return = 1
-
 xdebug.var_display_max_children=-1
 xdebug.var_display_max_data=-1
 xdebug.var_display_max_depth=-1

From f3e3bbe2b75993e309cac4454cb542de16db0716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Fri, 6 Dec 2019 09:35:10 +0800
Subject: [PATCH 57/58] =?UTF-8?q?refactor:=20=E8=BF=98=E5=8E=9F=20nginx.co?=
 =?UTF-8?q?nf=20=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nginx/sites/{default.conf.example => default.conf} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename nginx/sites/{default.conf.example => default.conf} (100%)

diff --git a/nginx/sites/default.conf.example b/nginx/sites/default.conf
similarity index 100%
rename from nginx/sites/default.conf.example
rename to nginx/sites/default.conf

From 9cea74dc6ffed71a28dc2b54252aba0c834a514b Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Fri, 6 Dec 2019 19:17:22 +0800
Subject: [PATCH 58/58] update travis ci config (#2409)

---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d92a02b..821b0f62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,20 +12,23 @@ env:
     - PHP_VERSION=7.1 BUILD_SERVICE=workspace
     - PHP_VERSION=7.2 BUILD_SERVICE=workspace
     - PHP_VERSION=7.3 BUILD_SERVICE=workspace
+    - PHP_VERSION=7.4 BUILD_SERVICE=workspace
 
     - PHP_VERSION=5.6 BUILD_SERVICE=php-fpm
     - PHP_VERSION=7.0 BUILD_SERVICE=php-fpm
     - PHP_VERSION=7.1 BUILD_SERVICE=php-fpm
     - PHP_VERSION=7.2 BUILD_SERVICE=php-fpm
     - PHP_VERSION=7.3 BUILD_SERVICE=php-fpm
+    - PHP_VERSION=7.4 BUILD_SERVICE=php-fpm
 
     - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
 
     # - 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.0 BUILD_SERVICE="php-worker laravel-horizon"
+    - PHP_VERSION=7.1 BUILD_SERVICE="php-worker laravel-horizon"
+    - PHP_VERSION=7.2 BUILD_SERVICE="php-worker laravel-horizon"
+    - PHP_VERSION=7.3 BUILD_SERVICE="php-worker laravel-horizon"
+    - PHP_VERSION=7.4 BUILD_SERVICE="php-worker laravel-horizon"
 
     - PHP_VERSION=NA BUILD_SERVICE=solr
     - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"