From 0873d8bf9d62877e50d7e806020d9fd0507bf872 Mon Sep 17 00:00:00 2001
From: Suru Dissanaike <suru.dissanaike@iopsys.eu>
Date: Fri, 10 Jan 2020 12:57:56 +0100
Subject: [PATCH] code-analysis:0.3
---
docker/code-analysis/Dockerfile | 3 ++-
docker/code-analysis/entrypoint.sh | 2 +-
docker/code-analysis/supervisord.conf | 21 ++++++++++++++++-----
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index c4a6854..d37e7cf 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -203,7 +203,8 @@ WORKDIR /opt/work
# Prepare supervisor
RUN mkdir -p /var/log/supervisor
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN mkdir -p /etc/supervisor/conf.d/
+COPY supervisord.conf /etc/supervisor/
# Prepare JSON Schemas
RUN mkdir -p /usr/share/rpcd/schemas
diff --git a/docker/code-analysis/entrypoint.sh b/docker/code-analysis/entrypoint.sh
index b7a547d..a9018c2 100755
--- a/docker/code-analysis/entrypoint.sh
+++ b/docker/code-analysis/entrypoint.sh
@@ -3,7 +3,7 @@
set -x
# Start supervisor
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf -l /var/log/supervisord.log -j /var/run/supervisord.pid
+/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
#Start bash to enable an interactive session
/bin/bash
diff --git a/docker/code-analysis/supervisord.conf b/docker/code-analysis/supervisord.conf
index 77ce644..aeb9849 100644
--- a/docker/code-analysis/supervisord.conf
+++ b/docker/code-analysis/supervisord.conf
@@ -1,8 +1,19 @@
[supervisord]
-nodaemon=false
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
+nodaemon=false ; true to run in foreground
-[program:ubusd]
-command=/bin/bash -c "/usr/sbin/ubusd"
+[unix_http_server]
+file=/var/run/supervisor.sock ; (the path to the socket file)
+chmod=0700 ; sockef file mode (default 0700)
-[program:rpcd]
-command=/bin/bash -c "/usr/sbin/rpcd"
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
+
+; enables us to add additional applications in a convenient way
+[include]
+files = /etc/supervisor/conf.d/*.conf
--
GitLab