[Dockers]: Manage all Docker containers with Supervisord

.gitignore

@@ -26,15 +26,16 @@ src/thrift/*
 src/sonic-device-data/src/device/
 
 # Autogenerated Dockerfiles
+dockers/docker-base/Dockerfile
+dockers/docker-config-engine/Dockerfile
 dockers/docker-database/Dockerfile
-dockers/docker-fpm/Dockerfile
+dockers/docker-fpm-frr/Dockerfile
+dockers/docker-fpm-gobgp/Dockerfile
+dockers/docker-fpm-quagga/Dockerfile
 dockers/docker-lldp-sv2/Dockerfile
 dockers/docker-orchagent/Dockerfile
 dockers/docker-snmp-sv2/Dockerfile
-dockers/docker-team/Dockerfile
 dockers/docker-teamd/Dockerfile
-dockers/docker-config-engine/Dockerfile
-dockers/docker-base/Dockerfile
 platform/*/docker-syncd-*/Dockerfile
 platform/*/docker-syncd-*-rpc/Dockerfile
 

dockers/docker-base/Dockerfile.j2

@@ -4,36 +4,38 @@ FROM debian:jessie
 RUN find /usr/share/doc -depth \( -type f -o -type l \) ! -name copyright | xargs rm || true
 ## Clean doc directories that are empty or only contain empty directories
 RUN while [ -n "$(find /usr/share/doc -depth -type d -empty -print -exec rmdir {} +)" ]; do :; done
-RUN rm -rf                              \
-        /usr/share/man/*                \
-        /usr/share/groff/*              \
-        /usr/share/info/*               \
-        /usr/share/lintian/*            \
-        /usr/share/linda/*              \
-        /var/cache/man/*                \
-        /usr/share/locale/*
+RUN rm -rf               \
+    /usr/share/man/*     \
+    /usr/share/groff/*   \
+    /usr/share/info/*    \
+    /usr/share/lintian/* \
+    /usr/share/linda/*   \
+    /var/cache/man/*     \
+    /usr/share/locale/*
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-## Set the apt source
-COPY sources.list /etc/apt/sources.list
-COPY dpkg_01_drop /etc/dpkg/dpkg.cfg.d/01_drop
+## Configure data sources for apt/dpkg
+COPY ["sources.list", "/etc/apt/sources.list"]
+COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
 RUN apt-get clean && apt-get update
 
-## Pre-install the fundamental packages
-RUN apt-get -y install                  \
-    rsyslog                             \
-    vim-tiny                            \
-    perl                                \
+## Pre-install fundamental packages
+RUN apt-get -y install \
+    rsyslog            \
+    supervisor         \
+    vim-tiny           \
+    perl               \
     python
 
-COPY rsyslog.conf /etc/rsyslog.conf
+COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
+COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
 
-RUN apt-get -y purge                    \
-    exim4                               \
-    exim4-base                          \
-    exim4-config                        \
+RUN apt-get -y purge   \
+    exim4              \
+    exim4-base         \
+    exim4-config       \
     exim4-daemon-light
 
 {% if docker_base_dbgs %}
@@ -46,6 +48,7 @@ RUN apt-get -y install \
 
 ## Clean up apt
 ## Remove /var/lib/apt/lists/*, could be obsoleted for derived images
-RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y;      \
-    rm -rf /var/lib/apt/lists/*;                                        \
+RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y; \
+    rm -rf /var/lib/apt/lists/*;                                   \
     rm -rf /tmp/*;
+

dockers/docker-base/etc/rsyslog.d/supervisor.conf

@@ -0,0 +1,8 @@
+$ModLoad imfile
+
+$InputFileName /var/log/supervisor/supervisord.log
+$InputFileTag supervisord
+$InputFileStateFile state-supervisor
+$InputFileSeverity info
+$InputFileFacility local0
+$InputRunFileMonitor

dockers/docker-basic_router/Dockerfile

@@ -5,18 +5,19 @@ MAINTAINER Xudong Wu
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-## Set the apt source
+## Update apt's cache of available packages
 RUN apt-get clean && apt-get update
 
 COPY deps /deps
 
-RUN dpkg -i /deps/libopennsl_*.deb;         \
-    dpkg -i /deps/libsaibcm_*.deb;          \
+RUN dpkg -i /deps/libopennsl_*.deb; \
+    dpkg -i /deps/libsaibcm_*.deb;  \
     apt-get -y install -f
 
-
 RUN mv /deps/basic_router /usr/sbin/basic_router
 
-ENTRYPOINT rm -f /var/run/rsyslogd.pid  \
-    && service rsyslog start            \
-    && /bin/bash
+COPY ["start.sh", "/usr/bin/"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+
+ENTRYPOINT ["/usr/bin/supervisord"]
+

dockers/docker-basic_router/start.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+rm -f /var/run/rsyslogd.pid
+
+supervisorctl start rsyslogd
+

dockers/docker-basic_router/supervisord.conf

@@ -0,0 +1,20 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[program:start.sh]
+command=/usr/bin/start.sh
+priority=1
+autostart=true
+autorestart=false     ; One-shot
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n
+priority=2
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+

dockers/docker-database/Dockerfile.j2

@@ -32,4 +32,7 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
              s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \
             ' /etc/redis/redis.conf
 
-ENTRYPOINT ["/usr/bin/redis-server", "/etc/redis/redis.conf"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+
+ENTRYPOINT ["/usr/bin/supervisord"]
+

dockers/docker-database/supervisord.conf

@@ -0,0 +1,12 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[program:redis-server]
+command=/usr/bin/redis-server /etc/redis/redis.conf
+priority=1
+autostart=true
+stdout_logfile=syslog
+stderr_logfile=syslog
+

dockers/docker-dhcp-relay/Dockerfile

@@ -1,22 +1,21 @@
 FROM docker-config-engine
 
-## Make apt-get non-interactive
+# Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-## Update APT package lists
+# Update apt's cache of available packages
 RUN apt-get update
 
-## Install isc-dhcp-relay Debian package
+# Install isc-dhcp-relay Debian package
 RUN apt-get -y install isc-dhcp-relay
 
-## Clean up
+# Clean up
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
+COPY ["start.sh", "isc-dhcp-relay.sh", "/usr/bin/"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["isc-dhcp-relay.j2", "/usr/share/sonic/templates/"]
-COPY ["config.sh", "/usr/bin/"]
-COPY ["start.sh", "/usr/bin/"]
 
-ENTRYPOINT /usr/bin/config.sh \
-    && /usr/bin/start.sh      \
-    && /bin/bash
+ENTRYPOINT ["/usr/bin/supervisord"]
+

dockers/docker-dhcp-relay/isc-dhcp-relay.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Based off /etc/init.d/isc-dhcp-relay
+#
+
+# Read init script configuration (interfaces the daemon should listen on
+# and the DHCP server we should forward requests to.)
+[ -f /etc/default/isc-dhcp-relay ] && . /etc/default/isc-dhcp-relay
+
+# Build command line for interfaces (will be passed to dhrelay below.)
+IFCMD=""
+if test "$INTERFACES" != ""; then
+        for I in $INTERFACES; do
+                IFCMD=${IFCMD}"-i "${I}" "
+        done
+fi
+
+exec /usr/sbin/dhcrelay -d -q ${OPTIONS} ${IFCMD} ${SERVERS}
+

dockers/docker-dhcp-relay/start.sh

@@ -1,7 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/isc-dhcp-relay.j2 > /etc/default/isc-dhcp-relay
 
 rm -f /var/run/rsyslogd.pid
-service rsyslog start
+
+supervisorctl start rsyslogd
 
 VLAN_IFACE_NAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_vlan_interfaces[0]['attachto']"`
 
@@ -11,5 +14,5 @@ until ip link show $VLAN_IFACE_NAME > /dev/null 2>&1; do
 done
 
 # Start the DHCP relay
-service isc-dhcp-relay start
+supervisorctl start isc-dhcp-relay
 

dockers/docker-dhcp-relay/supervisord.conf

@@ -0,0 +1,27 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[program:start.sh]
+command=/usr/bin/start.sh
+priority=1
+autostart=true
+autorestart=false     ; One-shot
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n
+priority=2
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:isc-dhcp-relay]
+command=/usr/bin/isc-dhcp-relay.sh
+priority=3
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+

dockers/docker-fpm-gobgp/Dockerfile.j2

@@ -3,7 +3,7 @@ FROM docker-fpm-quagga
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y supervisor
+RUN apt-get update
 
 COPY \
 {% for deb in docker_fpm_gobgp_debs.split(' ') -%}
@@ -20,12 +20,10 @@ debs/{{ deb }}{{' '}}
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
+COPY ["start.sh", "/usr/bin/"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["*.j2", "/usr/share/sonic/templates/"]
-COPY ["start.sh", "config.sh", "/usr/bin/"]
 COPY ["daemons", "/etc/quagga/"]
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
-ENTRYPOINT /usr/bin/config.sh   \
-        && /usr/bin/start.sh    \
-        && /usr/bin/supervisord \
-        && /bin/bash
+ENTRYPOINT ["/usr/bin/supervisord"]
+

dockers/docker-fpm-gobgp/start.sh

@@ -1,6 +1,26 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+mkdir -p /etc/quagga
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/gobgpd.conf.j2 > /etc/gobgp/gobgpd.conf
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf
+
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/isolate.j2 > /usr/sbin/bgp-isolate
+chown root:root /usr/sbin/bgp-isolate
+chmod 0755 /usr/sbin/bgp-isolate
+
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/unisolate.j2 > /usr/sbin/bgp-unisolate
+chown root:root /usr/sbin/bgp-unisolate
+chmod 0755 /usr/sbin/bgp-unisolate
+
+mkdir -p /var/sonic
+echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
 
 rm -f /var/run/rsyslogd.pid
-service rsyslog start
+
+supervisorctl start rsyslogd
+
+# Quagga has its own monitor process, 'watchquagga'
 service quagga start
-fpmsyncd &
+
+supervisorctl start fpmsyncd
+

dockers/docker-fpm-gobgp/supervisord.conf

@@ -1,6 +1,34 @@
 [supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
 nodaemon=true
 
+[program:start.sh]
+command=/usr/bin/start.sh
+priority=1
+autostart=true
+autorestart=false     ; One-shot
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n
+priority=2
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
 [program:gobgpd]
 command=/usr/sbin/gobgpd -p -f /etc/gobgp/gobgpd.conf -r
-priority=1
+priority=3
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:fpmsyncd]
+command=fpmsyncd
+priority=5
+autostart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+