From 0cdcf34a255ba3b2e3d4ea6ea4bb585803c3351e Mon Sep 17 00:00:00 2001 From: Vivek Date: Thu, 12 Dec 2024 14:00:25 -0800 Subject: [PATCH] [202405] [Bookworm] Fix timezone propagation to containers (#21137) * Remove the usage of timezone file from container start scripts Signed-off-by: Vivek * Mount localtime instead of timezone --------- Signed-off-by: Vivek --- dockers/docker-database/docker-database-init.sh | 4 ---- dockers/docker-dhcp-relay/start.sh | 4 ---- dockers/docker-dhcp-server/start.sh | 4 ---- dockers/docker-eventd/start.sh | 3 --- dockers/docker-fpm-frr/docker_init.sh | 4 ---- dockers/docker-iccpd/start.sh | 3 --- dockers/docker-lldp/start.sh | 4 ---- dockers/docker-macsec/Dockerfile.j2 | 1 - dockers/docker-macsec/start.sh | 6 ------ dockers/docker-macsec/supervisord.conf | 11 ----------- dockers/docker-mux/docker-init.sh | 4 ---- dockers/docker-nat/start.sh | 4 ---- dockers/docker-orchagent/docker-init.j2 | 4 ---- dockers/docker-platform-monitor/docker_init.j2 | 4 ---- dockers/docker-router-advertiser/docker-init.sh | 4 ---- dockers/docker-sflow/Dockerfile.j2 | 1 - dockers/docker-sflow/start.sh | 5 ----- dockers/docker-sflow/supervisord.conf | 11 ----------- dockers/docker-snmp/start.sh | 4 ---- dockers/docker-sonic-gnmi/start.sh | 4 ---- dockers/docker-sonic-mgmt-framework/start.sh | 4 ---- dockers/docker-sonic-p4rt/start.sh | 3 --- dockers/docker-sonic-telemetry/start.sh | 4 ---- dockers/docker-teamd/start.sh | 4 ---- rules/docker-database.mk | 2 +- rules/docker-dhcp-relay.mk | 2 +- rules/docker-dhcp-server.mk | 1 + rules/docker-eventd.mk | 2 +- rules/docker-fpm-frr.mk | 2 +- rules/docker-gnmi.mk | 2 +- rules/docker-iccpd.mk | 2 +- rules/docker-lldp.mk | 2 +- rules/docker-macsec.mk | 2 +- rules/docker-mux.mk | 2 +- rules/docker-nat.mk | 2 +- rules/docker-orchagent.mk | 2 +- rules/docker-p4rt.mk | 2 +- rules/docker-platform-monitor.mk | 2 +- rules/docker-router-advertiser.mk | 2 +- rules/docker-sflow.mk | 2 +- rules/docker-snmp.mk | 2 +- rules/docker-sonic-mgmt-framework.mk | 2 +- rules/docker-teamd.mk | 2 +- rules/docker-telemetry.mk | 2 +- 44 files changed, 20 insertions(+), 123 deletions(-) delete mode 100644 dockers/docker-macsec/start.sh delete mode 100644 dockers/docker-sflow/start.sh diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh index 467f33c212d1..490350a0956c 100755 --- a/dockers/docker-database/docker-database-init.sh +++ b/dockers/docker-database/docker-database-init.sh @@ -125,10 +125,6 @@ do fi done -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - chown -R redis:redis $REDIS_DIR exec /usr/local/bin/supervisord diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh index ce0dce10ed3c..87a9e5711f2f 100755 --- a/dockers/docker-dhcp-relay/start.sh +++ b/dockers/docker-dhcp-relay/start.sh @@ -10,10 +10,6 @@ then ${CTR_SCRIPT} -f dhcp_relay -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION} fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - # If our supervisor config has entries in the "dhcp-relay" group... if [ $(supervisorctl status | grep -c "^dhcp-relay:") -gt 0 ]; then # Wait for all interfaces to come up and be assigned IPv4 addresses before diff --git a/dockers/docker-dhcp-server/start.sh b/dockers/docker-dhcp-server/start.sh index 46b8eb503a4a..e24f742b4a93 100755 --- a/dockers/docker-dhcp-server/start.sh +++ b/dockers/docker-dhcp-server/start.sh @@ -13,7 +13,3 @@ if test -f ${CTR_SCRIPT} then ${CTR_SCRIPT} -f dhcp_server -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION} fi - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-eventd/start.sh b/dockers/docker-eventd/start.sh index 2c357a857436..60cd6a00aecb 100755 --- a/dockers/docker-eventd/start.sh +++ b/dockers/docker-eventd/start.sh @@ -4,6 +4,3 @@ if [ "${RUNTIME_OWNER}" == "" ]; then RUNTIME_OWNER="kube" fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh index 0ed274ec703f..13ae77636441 100755 --- a/dockers/docker-fpm-frr/docker_init.sh +++ b/dockers/docker-fpm-frr/docker_init.sh @@ -107,8 +107,4 @@ chmod 0755 /usr/sbin/bgp-unisolate mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-iccpd/start.sh b/dockers/docker-iccpd/start.sh index cb36ce69cfff..85a1c49edab1 100644 --- a/dockers/docker-iccpd/start.sh +++ b/dockers/docker-iccpd/start.sh @@ -11,6 +11,3 @@ sonic-cfggen -d -t /usr/share/sonic/templates/iccpd.j2 > $ICCPD_CONF_PATH/iccpd. mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-lldp/start.sh b/dockers/docker-lldp/start.sh index 5295daed8a9d..e92105db3712 100755 --- a/dockers/docker-lldp/start.sh +++ b/dockers/docker-lldp/start.sh @@ -23,7 +23,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status rm -f /var/run/lldpd.socket - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-macsec/Dockerfile.j2 b/dockers/docker-macsec/Dockerfile.j2 index fc8674859f27..e616a5569b32 100644 --- a/dockers/docker-macsec/Dockerfile.j2 +++ b/dockers/docker-macsec/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN apt-get clean -y && \ apt-get autoremove -y && \ rm -rf /debs -COPY ["start.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["critical_processes", "/etc/supervisor"] diff --git a/dockers/docker-macsec/start.sh b/dockers/docker-macsec/start.sh deleted file mode 100644 index bfb684eecadd..000000000000 --- a/dockers/docker-macsec/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - diff --git a/dockers/docker-macsec/supervisord.conf b/dockers/docker-macsec/supervisord.conf index 3ab4f372f101..fb88f17049b2 100644 --- a/dockers/docker-macsec/supervisord.conf +++ b/dockers/docker-macsec/supervisord.conf @@ -28,17 +28,6 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true -[program:start] -command=/usr/bin/start.sh -priority=2 -autostart=false -autorestart=false -startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running - [program:macsecmgrd] command=/usr/bin/macsecmgrd priority=2 diff --git a/dockers/docker-mux/docker-init.sh b/dockers/docker-mux/docker-init.sh index 1679ec5d9f8f..bea1686132a1 100755 --- a/dockers/docker-mux/docker-init.sh +++ b/dockers/docker-mux/docker-init.sh @@ -3,10 +3,6 @@ # Generate supervisord config file mkdir -p /etc/supervisor/conf.d/ -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - # The docker container should start this script as PID 1, so now that supervisord is # properly configured, we exec supervisord so that it runs as PID 1 for the # duration of the container's lifetime diff --git a/dockers/docker-nat/start.sh b/dockers/docker-nat/start.sh index 74912ce01485..68603d007a51 100755 --- a/dockers/docker-nat/start.sh +++ b/dockers/docker-nat/start.sh @@ -3,7 +3,3 @@ rm -f /var/run/nat/* mkdir -p /var/warmboot/nat - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-orchagent/docker-init.j2 b/dockers/docker-orchagent/docker-init.j2 index 41dbe27285f1..399f6997b062 100755 --- a/dockers/docker-orchagent/docker-init.j2 +++ b/dockers/docker-orchagent/docker-init.j2 @@ -70,8 +70,4 @@ if [ -f "$IS_SUPERVISOR" ]; then fi fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-platform-monitor/docker_init.j2 b/dockers/docker-platform-monitor/docker_init.j2 index ebef713e27f1..c8e2943e6688 100755 --- a/dockers/docker-platform-monitor/docker_init.j2 +++ b/dockers/docker-platform-monitor/docker_init.j2 @@ -128,8 +128,4 @@ else sonic-cfggen -d -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-router-advertiser/docker-init.sh b/dockers/docker-router-advertiser/docker-init.sh index 02c5a8c72be1..6e1bb5545f82 100755 --- a/dockers/docker-router-advertiser/docker-init.sh +++ b/dockers/docker-router-advertiser/docker-init.sh @@ -14,8 +14,4 @@ sonic-cfggen $CFGGEN_PARAMS chmod +x /usr/bin/wait_for_link.sh -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-sflow/Dockerfile.j2 b/dockers/docker-sflow/Dockerfile.j2 index a5eebf3a0959..75ad9169cec5 100644 --- a/dockers/docker-sflow/Dockerfile.j2 +++ b/dockers/docker-sflow/Dockerfile.j2 @@ -26,7 +26,6 @@ RUN apt-get clean -y && \ RUN sed -ri '/^DAEMON_ARGS=""/c DAEMON_ARGS="-c /var/log/hsflowd.crash"' /etc/init.d/hsflowd -COPY ["start.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["critical_processes", "/etc/supervisor"] diff --git a/dockers/docker-sflow/start.sh b/dockers/docker-sflow/start.sh deleted file mode 100644 index 8996769c4c5e..000000000000 --- a/dockers/docker-sflow/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf index d6cd5092e53d..2c8b006df917 100644 --- a/dockers/docker-sflow/supervisord.conf +++ b/dockers/docker-sflow/supervisord.conf @@ -28,17 +28,6 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true -[program:start] -command=/usr/bin/start.sh -priority=2 -autostart=false -autorestart=false -startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running - [program:sflowmgrd] command=/usr/bin/sflowmgrd priority=2 diff --git a/dockers/docker-snmp/start.sh b/dockers/docker-snmp/start.sh index 6de6f740b0ad..aefd0bfc3db6 100755 --- a/dockers/docker-snmp/start.sh +++ b/dockers/docker-snmp/start.sh @@ -27,7 +27,3 @@ sonic-cfggen $SONIC_CFGGEN_ARGS mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-gnmi/start.sh b/dockers/docker-sonic-gnmi/start.sh index c3a928a6f800..2401f3c3d7cd 100755 --- a/dockers/docker-sonic-gnmi/start.sh +++ b/dockers/docker-sonic-gnmi/start.sh @@ -12,7 +12,3 @@ fi mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-mgmt-framework/start.sh b/dockers/docker-sonic-mgmt-framework/start.sh index 2fefbb349cb5..d6722a27fc77 100755 --- a/dockers/docker-sonic-mgmt-framework/start.sh +++ b/dockers/docker-sonic-mgmt-framework/start.sh @@ -2,7 +2,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-p4rt/start.sh b/dockers/docker-sonic-p4rt/start.sh index 2fefbb349cb5..d64f9d1dbc8f 100755 --- a/dockers/docker-sonic-p4rt/start.sh +++ b/dockers/docker-sonic-p4rt/start.sh @@ -3,6 +3,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-telemetry/start.sh b/dockers/docker-sonic-telemetry/start.sh index 8d36f740fa38..08f7292f55ba 100755 --- a/dockers/docker-sonic-telemetry/start.sh +++ b/dockers/docker-sonic-telemetry/start.sh @@ -12,7 +12,3 @@ fi mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 0b45239355ee..d67bc4e925c8 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -3,7 +3,3 @@ rm -f /var/run/teamd/* mkdir -p /var/warmboot/teamd - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/rules/docker-database.mk b/rules/docker-database.mk index c38f574afbfb..6237e2c362a4 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) $(DOCKER_DATABASE)_CONTAINER_NAME = database $(DOCKER_DATABASE)_RUN_OPT += --privileged -t $(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_DATABASE)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_DATABASE)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli $(DOCKER_DATABASE)_FILES += $(SYSCTL_NET_CONFIG) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 6462b4d41165..c8aa011d43f9 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -48,7 +48,7 @@ endif $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay $(DOCKER_DHCP_RELAY)_CONTAINER_PRIVILEGED = false $(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/sonic:/etc/sonic:ro -$(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/timezone:/etc/timezone:ro +$(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /tmp/ $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /var/tmp/ diff --git a/rules/docker-dhcp-server.mk b/rules/docker-dhcp-server.mk index b3960f16a9c6..530fdd9a4112 100644 --- a/rules/docker-dhcp-server.mk +++ b/rules/docker-dhcp-server.mk @@ -37,6 +37,7 @@ endif $(DOCKER_DHCP_SERVER)_CONTAINER_NAME = dhcp_server $(DOCKER_DHCP_SERVER)_VERSION = 1.0.0 $(DOCKER_DHCP_SERVER)_PACKAGE_NAME = dhcp-server +$(DOCKER_DHCP_SERVER)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_DHCP_SERVER)_SERVICE_REQUIRES = config-setup $(DOCKER_DHCP_SERVER)_SERVICE_AFTER = swss syncd diff --git a/rules/docker-eventd.mk b/rules/docker-eventd.mk index 77c4fad21ea8..510dc338af00 100644 --- a/rules/docker-eventd.mk +++ b/rules/docker-eventd.mk @@ -35,7 +35,7 @@ $(DOCKER_EVENTD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_EVENTD)_CONTAINER_NAME = eventd $(DOCKER_EVENTD)_RUN_OPT += -t $(DOCKER_EVENTD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_EVENTD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_EVENTD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro SONIC_BOOKWORM_DOCKERS += $(DOCKER_EVENTD) SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_EVENTD_DBG) diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index f3353e3a34d9..edfa17f5eb68 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -30,7 +30,7 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG) $(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp $(DOCKER_FPM_FRR)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_FPM_FRR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-gnmi.mk b/rules/docker-gnmi.mk index fccbafd2a880..9f2c6ac7406e 100644 --- a/rules/docker-gnmi.mk +++ b/rules/docker-gnmi.mk @@ -32,7 +32,7 @@ endif $(DOCKER_GNMI)_CONTAINER_NAME = gnmi $(DOCKER_GNMI)_RUN_OPT += -t $(DOCKER_GNMI)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_GNMI)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_GNMI)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_GNMI)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_GNMI)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk index 39be9f5a53d4..65677f539cf8 100644 --- a/rules/docker-iccpd.mk +++ b/rules/docker-iccpd.mk @@ -23,7 +23,7 @@ endif $(DOCKER_ICCPD)_CONTAINER_NAME = iccpd $(DOCKER_ICCPD)_RUN_OPT += -t $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_ICCPD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ICCPD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl diff --git a/rules/docker-lldp.mk b/rules/docker-lldp.mk index 81cc582a3f1b..e245da3dcae3 100644 --- a/rules/docker-lldp.mk +++ b/rules/docker-lldp.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_LLDP_DBG) $(DOCKER_LLDP)_CONTAINER_NAME = lldp $(DOCKER_LLDP)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_LLDP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_LLDP)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_LLDP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk index df52eccdf70f..682ef619e9be 100644 --- a/rules/docker-macsec.mk +++ b/rules/docker-macsec.mk @@ -41,7 +41,7 @@ $(DOCKER_MACSEC)_VERSION = 1.0.0 $(DOCKER_MACSEC)_PACKAGE_NAME = macsec $(DOCKER_MACSEC)_CONTAINER_PRIVILEGED = false $(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/sonic:/etc/sonic:ro -$(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/timezone:/etc/timezone:ro +$(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_MACSEC)_CONTAINER_VOLUMES += /host/warmboot:/var/warmboot $(DOCKER_MACSEC)_SERVICE_REQUIRES = config-setup diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk index a0b173233808..1f973755cf97 100644 --- a/rules/docker-mux.mk +++ b/rules/docker-mux.mk @@ -35,5 +35,5 @@ SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MUX_DBG) $(DOCKER_MUX)_CONTAINER_NAME = mux $(DOCKER_MUX)_RUN_OPT += -t $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_MUX)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_MUX)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_MUX)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk index d15c43622886..475ff4507f3b 100644 --- a/rules/docker-nat.mk +++ b/rules/docker-nat.mk @@ -31,7 +31,7 @@ endif $(DOCKER_NAT)_CONTAINER_NAME = nat $(DOCKER_NAT)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_NAT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_NAT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_NAT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_NAT)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_NAT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk index 7cf538eaeb8d..a1a6c34e88a7 100644 --- a/rules/docker-orchagent.mk +++ b/rules/docker-orchagent.mk @@ -39,7 +39,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) $(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss $(DOCKER_ORCHAGENT)_RUN_OPT += --privileged -t $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro -$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/rules/docker-p4rt.mk b/rules/docker-p4rt.mk index 85cfb67552c7..4b359be3c97d 100644 --- a/rules/docker-p4rt.mk +++ b/rules/docker-p4rt.mk @@ -33,7 +33,7 @@ endif $(DOCKER_P4RT)_CONTAINER_NAME = p4rt $(DOCKER_P4RT)_RUN_OPT += -t $(DOCKER_P4RT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_P4RT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_P4RT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_P4RT)_GIT_COMMIT = $(shell cd "$($(SONIC_P4RT)_SRC_PATH)" && git log -n 1 --format=format:"%H %s" || echo "Unable to fetch git log for p4rt") $(DOCKER_P4RT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index 71f9678b5f6a..fbfe252d779b 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -53,7 +53,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG) $(DOCKER_PLATFORM_MONITOR)_CONTAINER_NAME = pmon $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --privileged -t $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /host/pmon/stormond:/usr/share/stormond:rw $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platform_cache:ro $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index fc23a43192ef..2537bfddfedc 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -33,5 +33,5 @@ SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_ROUTER_ADVERTISER_DBG) $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-sflow.mk b/rules/docker-sflow.mk index cf54436a0910..84e096927d9c 100644 --- a/rules/docker-sflow.mk +++ b/rules/docker-sflow.mk @@ -32,7 +32,7 @@ endif $(DOCKER_SFLOW)_CONTAINER_NAME = sflow $(DOCKER_SFLOW)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN $(DOCKER_SFLOW)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SFLOW)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_SFLOW)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_SFLOW)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SFLOW)_BASE_IMAGE_FILES += psample:/usr/bin/psample diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk index 3546d47787a9..e1891f672be1 100644 --- a/rules/docker-snmp.mk +++ b/rules/docker-snmp.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SNMP_DBG) $(DOCKER_SNMP)_CONTAINER_NAME = snmp $(DOCKER_SNMP)_RUN_OPT += -t $(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SNMP)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_SNMP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d diff --git a/rules/docker-sonic-mgmt-framework.mk b/rules/docker-sonic-mgmt-framework.mk index b93c5e1006d3..b61716bb8f64 100644 --- a/rules/docker-sonic-mgmt-framework.mk +++ b/rules/docker-sonic-mgmt-framework.mk @@ -31,7 +31,7 @@ endif $(DOCKER_MGMT_FRAMEWORK)_CONTAINER_NAME = mgmt-framework $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -t $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc:/host_etc:ro $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/" diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index 6d29e0f7e4c9..400268404b2c 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -34,7 +34,7 @@ endif $(DOCKER_TEAMD)_CONTAINER_NAME = teamd $(DOCKER_TEAMD)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_TEAMD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_TEAMD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_TEAMD)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index f710eedd572a..bcbb68dfdb97 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -30,7 +30,7 @@ endif $(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry $(DOCKER_TELEMETRY)_RUN_OPT += -t $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d