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] 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