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 1/3] 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 896adb5..8d679ba 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 1b71479..c8618f4 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 f413e90..6081ebd 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 8b2bcc6d153e78c4f5289eb832513e787a84a04b Mon Sep 17 00:00:00 2001
From: Alone <794000949@qq.com>
Date: Mon, 28 Oct 2019 17:33:13 +0800
Subject: [PATCH 2/3] 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 8d679ba..9d34be7 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 6081ebd..8a1d4c9 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 3/3] 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 d2b91fb..d2d574c 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>