revise per community review

Signed-off-by: shine.chen <shine.chen@mediatek.com>
sonic-net · Mar 30, 2020 · c4b6059 · c4b6059
1 parent 0b08967
commit c4b6059
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/rules/config b/rules/config
@@ -95,3 +95,6 @@ FRR_USER_GID = 300
 
 # Default VS build memory preparation
 DEFAULT_VS_PREPARE_MEM = yes
+
+# ENABLE_ICCPD - build docker-iccpd for mclag support
+ENABLE_ICCPD = y
diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk
@@ -4,13 +4,15 @@ DOCKER_ICCPD = docker-iccpd.gz
 $(DOCKER_ICCPD)_PATH = $(DOCKERS_PATH)/docker-iccpd
 $(DOCKER_ICCPD)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(ICCPD)
 $(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+
+ifeq ($(ENABLE_ICCPD), y)
 SONIC_DOCKER_IMAGES += $(DOCKER_ICCPD)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ICCPD)
-
 SONIC_STRETCH_DOCKERS += $(DOCKER_ICCPD)
+endif
 
 $(DOCKER_ICCPD)_CONTAINER_NAME = iccpd
-$(DOCKER_ICCPD)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_ICCPD)_RUN_OPT += --privileged -t
 $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl