From 2cd68212029eaf0852d09e9ca46da28cb341e927 Mon Sep 17 00:00:00 2001 From: chenhu Date: Thu, 1 Mar 2018 14:32:18 +0800 Subject: [PATCH] [sonic-buildimage] sync timezone to docker, so the docker has the correct timestamp in log Signed-off-by: chenhu --- dockers/docker-basic_router/start.sh | 2 ++ dockers/docker-dhcp-relay/start.sh | 2 ++ dockers/docker-fpm-frr/start.sh | 2 ++ dockers/docker-fpm-gobgp/start.sh | 2 ++ dockers/docker-fpm-quagga/start.sh | 2 ++ dockers/docker-lldp-sv2/start.sh | 2 ++ dockers/docker-orchagent/start.sh | 2 ++ dockers/docker-platform-monitor/start.sh | 2 ++ dockers/docker-saiserver-brcm/start.sh | 2 ++ dockers/docker-saiserver-cavm/start.sh | 2 ++ dockers/docker-saiserver-mlnx/start.sh | 2 ++ dockers/docker-snmp-sv2/start.sh | 2 ++ dockers/docker-teamd/start.sh | 2 ++ files/build_templates/docker_image_ctl.j2 | 1 + platform/broadcom/docker-syncd-brcm/start.sh | 2 ++ platform/cavium/docker-syncd-cavm/start.sh | 2 ++ platform/centec/docker-syncd-centec/start.sh | 2 ++ platform/marvell/docker-syncd-mrvl/start.sh | 2 ++ platform/mellanox/docker-syncd-mlnx/start.sh | 2 ++ platform/nephos/docker-syncd-nephos/start.sh | 2 ++ platform/p4/docker-sonic-p4/start.sh | 2 ++ platform/vs/docker-sonic-vs/start.sh | 2 ++ 22 files changed, 43 insertions(+) diff --git a/dockers/docker-basic_router/start.sh b/dockers/docker-basic_router/start.sh index a4d378ef77d..f8d669e1138 100755 --- a/dockers/docker-basic_router/start.sh +++ b/dockers/docker-basic_router/start.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash + +dpkg-reconfigure -f noninteractive tzdata rm -f /var/run/rsyslogd.pid diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh index 2ee80c4e338..a409682c108 100755 --- a/dockers/docker-dhcp-relay/start.sh +++ b/dockers/docker-dhcp-relay/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + # Remove stale rsyslog PID file if it exists rm -f /var/run/rsyslogd.pid diff --git a/dockers/docker-fpm-frr/start.sh b/dockers/docker-fpm-frr/start.sh index f46a42b4c34..4bef380d72e 100755 --- a/dockers/docker-fpm-frr/start.sh +++ b/dockers/docker-fpm-frr/start.sh @@ -1,5 +1,7 @@ #!/bin/bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid service rsyslog start service frr start diff --git a/dockers/docker-fpm-gobgp/start.sh b/dockers/docker-fpm-gobgp/start.sh index 83afbda4f73..365b9820a94 100755 --- a/dockers/docker-fpm-gobgp/start.sh +++ b/dockers/docker-fpm-gobgp/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + mkdir -p /etc/quagga sonic-cfggen -d -t /usr/share/sonic/templates/gobgpd.conf.j2 > /etc/gobgp/gobgpd.conf sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf diff --git a/dockers/docker-fpm-quagga/start.sh b/dockers/docker-fpm-quagga/start.sh index 06fdd3bb396..a0dfd990a6d 100755 --- a/dockers/docker-fpm-quagga/start.sh +++ b/dockers/docker-fpm-quagga/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + mkdir -p /etc/quagga sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf diff --git a/dockers/docker-lldp-sv2/start.sh b/dockers/docker-lldp-sv2/start.sh index 3a765c6f548..5c5579dbb75 100755 --- a/dockers/docker-lldp-sv2/start.sh +++ b/dockers/docker-lldp-sv2/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + sonic-cfggen -d -t /usr/share/sonic/templates/lldpd.conf.j2 > /etc/lldpd.conf mkdir -p /var/sonic diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh index e26be9286aa..771a5d82b6f 100755 --- a/dockers/docker-orchagent/start.sh +++ b/dockers/docker-orchagent/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + mkdir -p /etc/swss/config.d/ sonic-cfggen -d -t /usr/share/sonic/templates/switch.json.j2 > /etc/swss/config.d/switch.json diff --git a/dockers/docker-platform-monitor/start.sh b/dockers/docker-platform-monitor/start.sh index b4023c16367..9136844ff0b 100755 --- a/dockers/docker-platform-monitor/start.sh +++ b/dockers/docker-platform-monitor/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status diff --git a/dockers/docker-saiserver-brcm/start.sh b/dockers/docker-saiserver-brcm/start.sh index 494c0e9126c..8241aef34fb 100755 --- a/dockers/docker-saiserver-brcm/start.sh +++ b/dockers/docker-saiserver-brcm/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + start_bcm() { [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0 diff --git a/dockers/docker-saiserver-cavm/start.sh b/dockers/docker-saiserver-cavm/start.sh index 09cc0ddb541..123d6b73490 100755 --- a/dockers/docker-saiserver-cavm/start.sh +++ b/dockers/docker-saiserver-cavm/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/dockers/docker-saiserver-mlnx/start.sh b/dockers/docker-saiserver-mlnx/start.sh index 58a0c316add..4fe81051d92 100755 --- a/dockers/docker-saiserver-mlnx/start.sh +++ b/dockers/docker-saiserver-mlnx/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + start_mlnx() { [ -e /dev/sxdevs/sxcdev ] || ( mkdir -p /dev/sxdevs && mknod /dev/sxdevs/sxcdev c 231 193 ) diff --git a/dockers/docker-snmp-sv2/start.sh b/dockers/docker-snmp-sv2/start.sh index 1b83624068a..ffdba8c462d 100755 --- a/dockers/docker-snmp-sv2/start.sh +++ b/dockers/docker-snmp-sv2/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + mkdir -p /etc/ssw sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t /usr/share/sonic/templates/sysDescription.j2 > /etc/ssw/sysDescription diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 6e80f6eb9a8..2a717e291d9 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + TEAMD_CONF_PATH=/etc/teamd rm -rf $TEAMD_CONF_PATH diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index c1a9b6ad412..0892883824c 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -56,6 +56,7 @@ start() { --log-opt max-size=2M --log-opt max-file=5 \ {%- endif %} -v /var/run/redis:/var/run/redis:rw \ + -v /etc/timezone:/etc/timezone:rw \ -v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \ {%- if docker_container_name != "database" %} -v /usr/share/sonic/device/$PLATFORM/$HWSKU:/usr/share/sonic/hwsku:ro \ diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh index e06a29b2b2a..7805e1ddda1 100755 --- a/platform/broadcom/docker-syncd-brcm/start.sh +++ b/platform/broadcom/docker-syncd-brcm/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + PLATFORM_DIR=/usr/share/sonic/platform rm -f /var/run/rsyslogd.pid diff --git a/platform/cavium/docker-syncd-cavm/start.sh b/platform/cavium/docker-syncd-cavm/start.sh index 62331605047..315375bf1b9 100755 --- a/platform/cavium/docker-syncd-cavm/start.sh +++ b/platform/cavium/docker-syncd-cavm/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/platform/centec/docker-syncd-centec/start.sh b/platform/centec/docker-syncd-centec/start.sh index 62331605047..315375bf1b9 100755 --- a/platform/centec/docker-syncd-centec/start.sh +++ b/platform/centec/docker-syncd-centec/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/platform/marvell/docker-syncd-mrvl/start.sh b/platform/marvell/docker-syncd-mrvl/start.sh index 96e2a912808..edabbe14402 100755 --- a/platform/marvell/docker-syncd-mrvl/start.sh +++ b/platform/marvell/docker-syncd-mrvl/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/platform/mellanox/docker-syncd-mlnx/start.sh b/platform/mellanox/docker-syncd-mlnx/start.sh index 62331605047..315375bf1b9 100755 --- a/platform/mellanox/docker-syncd-mlnx/start.sh +++ b/platform/mellanox/docker-syncd-mlnx/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/platform/nephos/docker-syncd-nephos/start.sh b/platform/nephos/docker-syncd-nephos/start.sh index 62331605047..315375bf1b9 100755 --- a/platform/nephos/docker-syncd-nephos/start.sh +++ b/platform/nephos/docker-syncd-nephos/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +dpkg-reconfigure -f noninteractive tzdata + rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd diff --git a/platform/p4/docker-sonic-p4/start.sh b/platform/p4/docker-sonic-p4/start.sh index 7c8f9ce151c..c6dc7c010a5 100755 --- a/platform/p4/docker-sonic-p4/start.sh +++ b/platform/p4/docker-sonic-p4/start.sh @@ -1,5 +1,7 @@ #!/bin/bash -e +dpkg-reconfigure -f noninteractive tzdata + # generate configuration [ -d /etc/sonic ] || mkdir -p /etc/sonic diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 960cc242b86..e5337beb004 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -2,6 +2,8 @@ # generate configuration +dpkg-reconfigure -f noninteractive tzdata + [ -d /etc/sonic ] || mkdir -p /etc/sonic SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')