code-analysis:0.3

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

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

docker/code-analysis/supervisord.conf

 [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