From 922ba1e8ee142d3932ba7bc9e4d6fff08e4ea56b Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 5 Dec 2022 22:27:50 -0800 Subject: [PATCH] Fix docker load image tag not being the expected tag PR #12829 modified the docker tagging scheme such that optional docker containers would be tagged with the SONiC image version. However, the docker-image-load macro wasn't updated for these changes. Update it here. Signed-off-by: Saikrishna Arcot --- slave.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slave.mk b/slave.mk index e8be0fcde8ea..e1cf454660d4 100644 --- a/slave.mk +++ b/slave.mk @@ -498,11 +498,11 @@ define docker-image-load @echo "Obtained docker image lock for $(1) load" $(LOG) @echo "Loading docker image $(TARGET_PATH)/$(1).gz" $(LOG) docker load -i $(TARGET_PATH)/$(1).gz $(LOG) - @echo "Tagging docker image $(1):latest as $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG) - docker tag $(1):latest $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG) + @echo "Tagging docker image $(1):$(call docker-get-tag,$(1)) as $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG) + docker tag $(1):$(call docker-get-tag,$(1)) $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG) if [ x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) == x"y" ]; then @echo "Removing docker image $(1):latest" $(LOG) - docker rmi -f $(1):latest $(LOG) + docker rmi -f $(1):$(call docker-get-tag,$(1)) $(LOG) fi $(call MOD_UNLOCK,$(1)) @echo "Released docker image lock for $(1) load" $(LOG)