diff options
| -rwxr-xr-x | src/ci/docker/run.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index e42b4748fdc..b1dacf79d26 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -70,8 +70,13 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then echo "Attempting to download $url" rm -f /tmp/rustci_docker_cache set +e - retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache "$url" - loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/') + retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \ + -o /tmp/rustci_docker_cache "$url" + echo "Loading images into docker" + # docker load sometimes hangs in the CI, so time out after 10 minutes with TERM, + # KILL after 12 minutes + loaded_images=$(/usr/bin/timeout -k 720 600 docker load -i /tmp/rustci_docker_cache \ + | sed 's/.* sha/sha/') set -e echo "Downloaded containers:\n$loaded_images" fi |