diff --git a/slave.mk b/slave.mk index 9e4bf532bfd..d23860b922e 100644 --- a/slave.mk +++ b/slave.mk @@ -779,7 +779,10 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_pkgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_APT_PACKAGES)))\n" | awk '!a[$$0]++')) if [ -d $($*.gz_PATH)/cli-plugin-tests/ ]; then pushd $($*.gz_PATH)/cli-plugin-tests; pytest-$($(SONIC_UTILITIES_PY3)_PYTHON_VERSION) -v $(LOG); popd; fi # Label docker image with componenets versions - $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_labels=$(foreach component,$($*.gz_DEPENDS) $($*.gz_PYTHON_DEBS) $($*.gz_PYTHON_WHEELS),\ + $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_labels=$(foreach component,\ + $(call expand,$($*.gz_DEPENDS),RDEPENDS) \ + $(call expand,$($*.gz_PYTHON_DEBS)) \ + $(call expand,$($*.gz_PYTHON_WHEELS)),\ $(shell [[ ! -z "$($(component)_VERSION)" && ! -z "$($(component)_NAME)" ]] && \ echo "--label com.azure.sonic.versions.$($(component)_NAME)=$($(component)_VERSION)"))) j2 $($*.gz_PATH)/Dockerfile.j2 > $($*.gz_PATH)/Dockerfile