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
775 B
Makefile
16 lines
775 B
Makefile
# docker image for mrvl saiserver
|
|
|
|
DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz
|
|
$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
|
|
$(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
|
|
$(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD)
|
|
$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
|
|
|
|
$(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
|
|
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --privileged -t
|
|
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
|
|
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
|
|
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|
|
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/warmboot:/var/warmboot
|