85b0de3df1
Add the same mechanism I developed for the SwSS service in #2845 to the syncd service. However, in order to cause the SwSS service to also exit and restart in this situation, I developed a docker-wait-any program which the SwSS service uses to wait for either the swss or syncd containers to exit.
26 lines
1.2 KiB
Makefile
26 lines
1.2 KiB
Makefile
# docker image for brcm syncd with rpc
|
|
|
|
DOCKER_SYNCD_BRCM_RPC = docker-syncd-brcm-rpc.gz
|
|
$(DOCKER_SYNCD_BRCM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-brcm-rpc
|
|
$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
|
|
ifeq ($(INSTALL_DEBUG_TOOLS), y)
|
|
$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
|
|
$(LIBSWSSCOMMON_DBG) \
|
|
$(LIBSAIMETADATA_DBG) \
|
|
$(LIBSAIREDIS_DBG)
|
|
endif
|
|
$(DOCKER_SYNCD_BRCM_RPC)_FILES += $(DSSERVE) $(BCMCMD) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
|
$(DOCKER_SYNCD_BRCM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
|
|
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BRCM_RPC)
|
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
|
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
|
|
endif
|
|
|
|
$(DOCKER_SYNCD_BRCM_RPC)_CONTAINER_NAME = syncd
|
|
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --net=host --privileged -t
|
|
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
|
|
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
|
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
|
|
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|