From 818d0435fb931d2974bf4aed02c24ca6a3e37dfb Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Tue, 9 May 2017 18:33:29 +0000
Subject: [PATCH] [dockers]: Disable autorestart on all supervisor processes
 inside containers

---
 dockers/docker-basic_router/supervisord.conf         | 3 ++-
 dockers/docker-database/supervisord.conf             | 1 +
 dockers/docker-dhcp-relay/supervisord.conf           | 4 +++-
 dockers/docker-fpm-gobgp/supervisord.conf            | 5 ++++-
 dockers/docker-fpm-quagga/supervisord.conf           | 4 +++-
 dockers/docker-lldp-sv2/supervisord.conf             | 7 +++++--
 dockers/docker-orchagent/supervisord.conf            | 4 +++-
 dockers/docker-platform-monitor/supervisord.conf     | 5 +++--
 dockers/docker-saiserver-brcm/supervisord.conf       | 4 +++-
 dockers/docker-saiserver-cavm/supervisord.conf       | 4 +++-
 dockers/docker-saiserver-mlnx/supervisord.conf       | 4 +++-
 dockers/docker-snmp-sv2/supervisord.conf             | 5 ++++-
 dockers/docker-teamd/supervisord.conf                | 4 +++-
 platform/broadcom/docker-syncd-brcm/supervisord.conf | 4 +++-
 platform/cavium/docker-syncd-cavm/supervisord.conf   | 4 +++-
 platform/centec/docker-syncd-centec/supervisord.conf | 4 +++-
 platform/mellanox/docker-syncd-mlnx/supervisord.conf | 4 +++-
 17 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/dockers/docker-basic_router/supervisord.conf b/dockers/docker-basic_router/supervisord.conf
index 2ae8ec428b3e..76f9a1968786 100644
--- a/dockers/docker-basic_router/supervisord.conf
+++ b/dockers/docker-basic_router/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf
index 12a6c0a8fb1b..2c78d9c39311 100644
--- a/dockers/docker-database/supervisord.conf
+++ b/dockers/docker-database/supervisord.conf
@@ -7,6 +7,7 @@ nodaemon=true
 command=/usr/bin/redis-server /etc/redis/redis.conf
 priority=1
 autostart=true
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-dhcp-relay/supervisord.conf b/dockers/docker-dhcp-relay/supervisord.conf
index 8e23c5c260ce..512762f2a5b4 100644
--- a/dockers/docker-dhcp-relay/supervisord.conf
+++ b/dockers/docker-dhcp-relay/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/isc-dhcp-relay.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
index 18670a084703..34fca6756821 100644
--- a/dockers/docker-fpm-gobgp/supervisord.conf
+++ b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/sbin/gobgpd -p -f /etc/gobgp/gobgpd.conf -r
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -29,6 +31,7 @@ stderr_logfile=syslog
 command=fpmsyncd
 priority=5
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
index 2e9d4925b985..db069bd93787 100644
--- a/dockers/docker-fpm-quagga/supervisord.conf
+++ b/dockers/docker-fpm-quagga/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=fpmsyncd
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-lldp-sv2/supervisord.conf b/dockers/docker-lldp-sv2/supervisord.conf
index 62b4daebd107..dcac7a8645f5 100644
--- a/dockers/docker-lldp-sv2/supervisord.conf
+++ b/dockers/docker-lldp-sv2/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -27,6 +28,7 @@ stderr_logfile=syslog
 command=/usr/sbin/lldpd -d -I Ethernet*,eth*
 priority=100
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -34,7 +36,7 @@ stderr_logfile=syslog
 command=/opt/reconfigure.sh
 priority=150
 autostart=false
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -42,6 +44,7 @@ stderr_logfile=syslog
 command=/usr/bin/env python2 -m lldp_syncd
 priority=200
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index ef3a30f64358..943233d2d421 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/orchagent.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf
index b069c48141ac..d4f21cf609fa 100644
--- a/dockers/docker-platform-monitor/supervisord.conf
+++ b/dockers/docker-platform-monitor/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,7 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/lm-sensors.sh
 priority=3
 autostart=false
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-brcm/supervisord.conf b/dockers/docker-saiserver-brcm/supervisord.conf
index aa6899737e8d..e09ac3cbb449 100644
--- a/dockers/docker-saiserver-brcm/supervisord.conf
+++ b/dockers/docker-saiserver-brcm/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-cavm/supervisord.conf b/dockers/docker-saiserver-cavm/supervisord.conf
index aa6899737e8d..e09ac3cbb449 100644
--- a/dockers/docker-saiserver-cavm/supervisord.conf
+++ b/dockers/docker-saiserver-cavm/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-mlnx/supervisord.conf b/dockers/docker-saiserver-mlnx/supervisord.conf
index aa6899737e8d..e09ac3cbb449 100644
--- a/dockers/docker-saiserver-mlnx/supervisord.conf
+++ b/dockers/docker-saiserver-mlnx/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf
index c4e883b3f8f0..624b61f96225 100644
--- a/dockers/docker-snmp-sv2/supervisord.conf
+++ b/dockers/docker-snmp-sv2/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ip -p /run/snmpd.pid
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -29,6 +31,7 @@ stderr_logfile=syslog
 command=/usr/bin/env python3.6 -m sonic_ax_impl
 priority=4
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
index 3d471bd3a222..2db52ebd073f 100644
--- a/dockers/docker-teamd/supervisord.conf
+++ b/dockers/docker-teamd/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/teamd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
index 71ebffee3bf4..80d04a225ffd 100644
--- a/platform/broadcom/docker-syncd-brcm/supervisord.conf
+++ b/platform/broadcom/docker-syncd-brcm/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
index 71ebffee3bf4..80d04a225ffd 100644
--- a/platform/cavium/docker-syncd-cavm/supervisord.conf
+++ b/platform/cavium/docker-syncd-cavm/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf
index 71ebffee3bf4..80d04a225ffd 100644
--- a/platform/centec/docker-syncd-centec/supervisord.conf
+++ b/platform/centec/docker-syncd-centec/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
index 71ebffee3bf4..80d04a225ffd 100644
--- a/platform/mellanox/docker-syncd-mlnx/supervisord.conf
+++ b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
@@ -7,7 +7,7 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -15,6 +15,7 @@ stderr_logfile=syslog
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -22,6 +23,7 @@ stderr_logfile=syslog
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog