matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Build] Fix the docker-sync not found issue (#12593)

Browse Source 
Why I did it
[Build] Fix the docker-sync not found issue

How I did it
When SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD not enabled, not to remove the docker-sync tag.
This commit is contained in:
xumia 2022-11-07 10:04:43 +08:00 committed by Ying Xie
parent c7ce62154b
commit c1db09e3f2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slave.mk
View File

@ -395,8 +395,10 @@ define docker-image-save
docker tag $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(1):latest $(LOG) docker tag $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(1):latest $(LOG)
@echo "Saving docker image $(1):latest" $(LOG) @echo "Saving docker image $(1):latest" $(LOG)
docker save $(1):latest | gzip -c > $(2) docker save $(1):latest | gzip -c > $(2)
@echo "Removing docker image $(1):latest" $(LOG) if [ x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) == x"y" ]; then
docker rmi -f $(1):latest $(LOG) @echo "Removing docker image $(1):latest" $(LOG)
docker rmi -f $(1):latest $(LOG)
fi
$(call MOD_UNLOCK,$(1)) $(call MOD_UNLOCK,$(1))
@echo "Released docker image lock for $(1) save" $(LOG) @echo "Released docker image lock for $(1) save" $(LOG)
@echo "Removing docker image $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG) @echo "Removing docker image $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG)
@ -418,8 +420,10 @@ define docker-image-load
docker load -i $(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) @echo "Tagging docker image $(1):latest as $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG)
docker tag $(1):latest $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG) docker tag $(1):latest $(1)-$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG)
@echo "Removing docker image $(1):latest" $(LOG) if [ x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) == x"y" ]; then
docker rmi -f $(1):latest $(LOG) @echo "Removing docker image $(1):latest" $(LOG)
docker rmi -f $(1):latest $(LOG)
fi
$(call MOD_UNLOCK,$(1)) $(call MOD_UNLOCK,$(1))
@echo "Released docker image lock for $(1) load" $(LOG) @echo "Released docker image lock for $(1) load" $(LOG)
endef endef