[build]: wait up to 60 seconds for docker engine to start (#3067)
* [build]: wait 60 seconds for docker engine to start On some platforms, it can take more than 1 second for docker engine to start. Signed-off-by: Guohan Lu <gulv@microsoft.com>
This commit is contained in:
parent
81cf33231f
commit
40330bcbdf
15
scripts/wait_for_docker.sh
Executable file
15
scripts/wait_for_docker.sh
Executable file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
total_time=$1
|
||||||
|
cnt=0
|
||||||
|
while [ $cnt -le $total_time ]; do
|
||||||
|
docker info 1>/dev/null
|
||||||
|
rv=$?
|
||||||
|
if [ $rv -eq 0 ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
cnt=$((cnt+1))
|
||||||
|
done
|
||||||
|
|
||||||
|
exit 1
|
2
slave.mk
2
slave.mk
@ -454,7 +454,7 @@ $(SONIC_INSTALL_WHEELS) : $(PYTHON_WHEELS_PATH)/%-install : .platform $$(addsuff
|
|||||||
docker-start :
|
docker-start :
|
||||||
@sudo sed -i '/http_proxy/d' /etc/default/docker
|
@sudo sed -i '/http_proxy/d' /etc/default/docker
|
||||||
@sudo bash -c "echo \"export http_proxy=$$http_proxy\" >> /etc/default/docker"
|
@sudo bash -c "echo \"export http_proxy=$$http_proxy\" >> /etc/default/docker"
|
||||||
@test x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) != x"y" && sudo service docker status &> /dev/null || ( sudo service docker start &> /dev/null && sleep 1 )
|
@test x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) != x"y" && sudo service docker status &> /dev/null || ( sudo service docker start &> /dev/null && ./scripts/wait_for_docker.sh 60 )
|
||||||
|
|
||||||
# targets for building simple docker images that do not depend on any debian packages
|
# targets for building simple docker images that do not depend on any debian packages
|
||||||
$(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))
|
$(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))
|
||||||
|
Loading…
Reference in New Issue
Block a user