2ef97bb5df
- Why I did it In case an app.ext requires a dependency syncd^1.0.0, the RPC version of syncd will not satisfy this constraint, since 1.0.0-rpc < 1.0.0. This is not correct to put 'rpc' as a prerelease identifier. Instead put 'rpc' as build metadata in the version: 1.0.0+rpc which satisfies the constraint ^1.0.0. - How I did it Changed the way how to version in RPC and DBG images are constructed. - How to verify it Install app.ext with syncd^1.0.0 dependency on a switch with RPC syncd docker. Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
26 lines
1.1 KiB
Makefile
26 lines
1.1 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)
|
|
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
|