c38b95c899
The start template script that this value is used in will determine what network namespace to use, and will add --net=host if it needs to run in the host namespace. With Docker 20.10, if --net=host is specified twice in docker run, then it errors out. Therefore, remove the explicit --net=host in the run options setting and let the start template script specify it. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
27 lines
1.2 KiB
Makefile
27 lines
1.2 KiB
Makefile
# docker image for mrvl syncd with rpc
|
|
|
|
DOCKER_SYNCD_MRVL_RPC = docker-syncd-mrvl-rpc.gz
|
|
$(DOCKER_SYNCD_MRVL_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mrvl-rpc
|
|
$(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(PTF)
|
|
$(DOCKER_SYNCD_MRVL_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
|
ifeq ($(INSTALL_DEBUG_TOOLS), y)
|
|
$(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
|
|
$(LIBSWSSCOMMON_DBG) \
|
|
$(LIBSAIMETADATA_DBG) \
|
|
$(LIBSAIREDIS_DBG)
|
|
endif
|
|
$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
|
|
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC)
|
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
|
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
|
|
endif
|
|
|
|
$(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
|
|
$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0-rpc
|
|
$(DOCKER_SYNCD_MRVL_RPC)_PACKAGE_NAME = syncd
|
|
$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --privileged -t
|
|
$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
|
|
$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|
|
$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
|