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>
16 lines
741 B
Makefile
16 lines
741 B
Makefile
# docker image for mlnx saiserver
|
|
|
|
DOCKER_SAISERVER_MLNX = docker-saiserver-mlnx.gz
|
|
$(DOCKER_SAISERVER_MLNX)_PATH = $(PLATFORM_PATH)/docker-saiserver-mlnx
|
|
$(DOCKER_SAISERVER_MLNX)_DEPENDS += $(SAISERVER) $(PYTHON_SDK_API)
|
|
$(DOCKER_SAISERVER_MLNX)_PYTHON_DEBS += $(MLNX_SFPD)
|
|
$(DOCKER_SAISERVER_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MLNX)
|
|
SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MLNX)
|
|
|
|
$(DOCKER_SAISERVER_MLNX)_CONTAINER_NAME = saiserver
|
|
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += --privileged -t
|
|
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
|
|
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|
|
$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /run/criu
|