From 971be65546c4e88938b750abd80e9096f94462ba Mon Sep 17 00:00:00 2001
From: nikos-li <31227248+nikos-li@users.noreply.github.com>
Date: Tue, 13 Feb 2018 17:40:26 -0800
Subject: [PATCH] [docker-base]: Upgrade supervisord to 3.3.3 and fix
 supervisord.conf (#1390)

---
 dockers/docker-base/etc/supervisor/supervisord.conf | 5 +++++
 rules/supervisor.mk                                 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-base/etc/supervisor/supervisord.conf b/dockers/docker-base/etc/supervisor/supervisord.conf
index afead15524..351cc06fc0 100644
--- a/dockers/docker-base/etc/supervisor/supervisord.conf
+++ b/dockers/docker-base/etc/supervisor/supervisord.conf
@@ -3,11 +3,14 @@
 [unix_http_server]
 file=/var/run/supervisor.sock   ; (the path to the socket file)
 chmod=0700                       ; sockef file mode (default 0700)
+username=dummy
+password=dummy
 
 [supervisord]
 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)
+user=root
 
 ; the below section must remain in the config file for RPC
 ; (supervisorctl/web interface) to work, additional interfaces may be
@@ -17,6 +20,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 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
 ; setting can list multiple files (separated by whitespace or
diff --git a/rules/supervisor.mk b/rules/supervisor.mk
index 7e7466bbad..cd97eabf80 100644
--- a/rules/supervisor.mk
+++ b/rules/supervisor.mk
@@ -1,6 +1,6 @@
 # supervisor package
 
-SUPERVISOR_VERSION = 3.3.2
+SUPERVISOR_VERSION = 3.3.3
 
 export SUPERVISOR_VERSION