3bbfaa1ee8
* Upgrade docker-sonic-vs and docker-syncd-vs to Bullseye Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * iproute2: Force a new version and timestamp to be used for the package There is an issue with Docker's overlay2 storage driver when not using native diffs (and thus falling back to naive diff mode), which is the case in the CI builds. The way the naive diff mode detects changes is by comparing the file size and comparing the timestamps (specifically, I believe it's the modification timestamp), and if there's a change there, then it's considered a change that needs to be recorded as part of that layer. The problem is that with the code being added in the patch, the file size remains the same, and the timestamp of binary files appear to be the same timestamp as the changelog entry (likely for reproducible build purposes). The file size remains the same likely due to extra padding within the file introduced by relro. Because of this, Docker doesn't detect this file has changed, and doesn't save the new file as part of this layer. To work around this, create a new changelog entry (with a new version as well) with a new timestamp. This will result in the binary files having a different timestamp, and thus will get saved by Docker as part of that layer. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
50 lines
2.0 KiB
Makefile
50 lines
2.0 KiB
Makefile
# docker image for virtual switch based sonic docker image
|
|
|
|
DOCKER_SONIC_VS = docker-sonic-vs.gz
|
|
$(DOCKER_SONIC_VS)_PATH = $(PLATFORM_PATH)/docker-sonic-vs
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \
|
|
$(PYTHON3_SWSSCOMMON) \
|
|
$(LIBTEAMDCTL) \
|
|
$(LIBTEAM_UTILS) \
|
|
$(SONIC_DEVICE_DATA) \
|
|
$(LIBYANG) \
|
|
$(LIBYANG_CPP) \
|
|
$(LIBYANG_PY3) \
|
|
$(SONIC_UTILITIES_DATA) \
|
|
$(SONIC_HOST_SERVICES_DATA) \
|
|
$(IPROUTE2)
|
|
|
|
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
|
|
$(SONIC_PLATFORM_COMMON_PY3) \
|
|
$(SONIC_YANG_MODELS_PY3) \
|
|
$(SONIC_YANG_MGMT_PY3) \
|
|
$(SONIC_UTILITIES_PY3) \
|
|
$(SONIC_HOST_SERVICES_PY3)
|
|
|
|
ifeq ($(INSTALL_DEBUG_TOOLS), y)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(LIBSWSSCOMMON_DBG) \
|
|
$(LIBSAIREDIS_DBG) \
|
|
$(LIBSAIVS_DBG) \
|
|
$(SYNCD_VS_DBG)
|
|
endif
|
|
|
|
ifeq ($(SONIC_ROUTING_STACK), frr)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(FRR)
|
|
else
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP)
|
|
endif
|
|
|
|
$(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
|
|
$(ARP_UPDATE_SCRIPT) \
|
|
$(ARP_UPDATE_VARS_TEMPLATE) \
|
|
$(BUFFERS_CONFIG_TEMPLATE) \
|
|
$(QOS_CONFIG_TEMPLATE) \
|
|
$(SONIC_VERSION) \
|
|
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
|
|
$(COPP_CONFIG_TEMPLATE)
|
|
|
|
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
|
|
|
|
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_VS)
|