From 9e663032a1d8697ddde7e0e51e632e8565772265 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 25 Mar 2019 15:27:49 -0700 Subject: [PATCH] [CI] record docker image info for reuse This writes an extra `dist/image-$image.txt` which contains the S3 URL of the cached image and the `sha256` digest of the docker entry point. This will be uploaded with the rest of the deployed artifacts in the Travis `after_success` script. --- src/ci/docker/run.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index ef151750af9bf..98a765e1cec95 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -12,6 +12,9 @@ ci_dir="`dirname $docker_dir`" src_dir="`dirname $ci_dir`" root_dir="`dirname $src_dir`" +objdir=$root_dir/obj +dist=$objdir/build/dist + source "$ci_dir/shared.sh" travis_fold start build_docker @@ -77,6 +80,11 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then else echo "Looks like docker image is the same as before, not uploading" fi + # Record the container image for reuse, e.g. by rustup.rs builds + info="$dist/image-$image.txt" + mkdir -p "$dist" + echo "$url" >"$info" + echo "$digest" >>"$info" fi elif [ -f "$docker_dir/disabled/$image/Dockerfile" ]; then if [ -n "$TRAVIS_OS_NAME" ]; then @@ -99,8 +107,6 @@ fi travis_fold end build_docker travis_time_finish -objdir=$root_dir/obj - mkdir -p $HOME/.cargo mkdir -p $objdir/tmp mkdir -p $objdir/cores