File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -70,8 +70,13 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
7070 echo " Attempting to download $url "
7171 rm -f /tmp/rustci_docker_cache
7272 set +e
73- retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache " $url "
74- loaded_images=$( docker load -i /tmp/rustci_docker_cache | sed ' s/.* sha/sha/' )
73+ retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \
74+ -o /tmp/rustci_docker_cache " $url "
75+ echo " Loading images into docker"
76+ # docker load sometimes hangs in the CI, so time out after 10 minutes with TERM,
77+ # KILL after 12 minutes
78+ loaded_images=$( /usr/bin/timeout -k 720 600 docker load -i /tmp/rustci_docker_cache \
79+ | sed ' s/.* sha/sha/' )
7580 set -e
7681 echo " Downloaded containers:\n$loaded_images "
7782 fi
You can’t perform that action at this time.
0 commit comments