matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-base]: Upgrade supervisord to 3.3.3 and fix supervisord.conf (#1390)

Browse Source
This commit is contained in:
nikos-li 2018-02-13 17:40:26 -08:00 committed by lguohan
parent 8f52845b82
commit 971be65546
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dockers/docker-base/etc/supervisor/supervisord.conf
View File

@ -3,11 +3,14 @@
[unix_http_server] [unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file) file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700) chmod=0700 ; sockef file mode (default 0700)
username=dummy
password=dummy
[supervisord] [supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
user=root
; the below section must remain in the config file for RPC ; the below section must remain in the config file for RPC
; (supervisorctl/web interface) to work, additional interfaces may be ; (supervisorctl/web interface) to work, additional interfaces may be
@ -17,6 +20,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl] [supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username=dummy
password=dummy
; The [include] section can just contain the "files" setting. This ; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or ; setting can list multiple files (separated by whitespace or

2
rules/supervisor.mk
View File

@ -1,6 +1,6 @@
# supervisor package # supervisor package
SUPERVISOR_VERSION = 3.3.2 SUPERVISOR_VERSION = 3.3.3
export SUPERVISOR_VERSION export SUPERVISOR_VERSION