For syncd, specify that they're Buster-based containers in the templa…

…te file instead of the individual container definitions Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
project-arlo · Nov 10, 2021 · 66913ff · 66913ff
1 parent 1d00613
commit 66913ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/platform/broadcom/docker-syncd-brcm-dnx.mk b/platform/broadcom/docker-syncd-brcm-dnx.mk
@@ -48,3 +48,4 @@ $(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
 $(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
 
 SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_DNX_BASE)
+SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SYNCD_DNX_BASE_DBG)
diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
@@ -22,5 +22,3 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /usr/share/sonic/device/x86_64-broadcom_commo
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
-
-SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE)
diff --git a/platform/template/docker-syncd-base.mk b/platform/template/docker-syncd-base.mk
@@ -38,3 +38,5 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
+SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE)
+SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,3 +48,4 @@ $(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
		$(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common

		SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_DNX_BASE)
		SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SYNCD_DNX_BASE_DBG)