From 010dc395792eaeef6910fa7879f28048df069c93 Mon Sep 17 00:00:00 2001 From: ganglv <88995770+ganglyu@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:18:54 +0800 Subject: [PATCH] If gnmi is included, remove dbus from telemetry (#14853) #### Why I did it Remove dbus when telemetry does not use it. ##### Work item tracking - Microsoft ADO **(number only)**: 17852550 #### How I did it Use INCLUDE_SYSTEM_GNMI to determine if telemetry needs dbus. #### How to verify it Build image and check telemetry container. --- rules/docker-telemetry.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index 4a2d3fd64e..30e11d9251 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -31,7 +31,9 @@ $(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry $(DOCKER_TELEMETRY)_RUN_OPT += --privileged -t $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_TELEMETRY)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro +ifneq ($(INCLUDE_SYSTEM_GNMI), y) $(DOCKER_TELEMETRY)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw +endif $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d