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>
19 lines
910 B
Makefile
19 lines
910 B
Makefile
# docker image for brcm saiserver
|
|
|
|
DOCKER_SAISERVER_BRCM = docker-saiserver-brcm.gz
|
|
$(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm
|
|
$(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER)
|
|
$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
|
|
$(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)
|
|
|
|
$(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver
|
|
$(DOCKER_SAISERVER_BRCM)_RUN_OPT += --privileged -t
|
|
$(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
|
|
$(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
|
|
$(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|
|
$(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
|
|
|
$(DOCKER_SAISERVER_BRCM)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
|
|
$(DOCKER_SAISERVER_BRCM)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
|