From 27e921889a35453352fbf007e9b933ed0f18967b Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:32:05 +0300
Subject: [PATCH 1/5] unzip is too noisy in logs
 https://github.com/rust-lang-ci/rust/actions/runs/5790152050/job/15692661456#step:24:1474

---
 src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
index 319989df33460..2b2be44c4cfcd 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@@ -61,7 +61,7 @@ ENV CC=clang CXX=clang++
 # Should also be changed in the opt-dist tool for other environments.
 ENV PERF_COMMIT 8b2ac3042e1ff2c0074455a0a3618adef97156b1
 RUN curl -LS -o perf.zip https://github.com/rust-lang/rustc-perf/archive/$PERF_COMMIT.zip && \
-    unzip perf.zip && \
+    unzip -q perf.zip && \
     mv rustc-perf-$PERF_COMMIT rustc-perf && \
     rm perf.zip
 

From 9a1c6752d067b4205c6cd34f52e0ddd122054c2c Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:16:47 +0300
Subject: [PATCH 2/5] can't parse layers

---
 src/ci/docker/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 87db964a15f0a..55cef31cc9cb3 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -76,8 +76,8 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
       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/')
+      # FIXME: why can't parse output here?
+      loaded_images=$(docker load -i /tmp/rustci_docker_cache)
       set -e
       printf "Downloaded containers:\n$loaded_images\n"
     fi

From 80deed8ccad3f179dd2123263b2e2db2fc65fd95 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 8 Aug 2023 19:09:11 +0300
Subject: [PATCH 3/5] docker images

---
 src/ci/docker/run.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 55cef31cc9cb3..aa83382d786ab 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -90,6 +90,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
         context="$script_dir"
     fi
     echo "::group::Building docker image for $image"
+    docker images
     retry docker \
       build \
       --rm \
@@ -97,6 +98,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
       -f "$dockerfile" \
       "$context"
     echo "::endgroup::"
+    docker images
 
     if [ "$CI" != "" ]; then
       s3url="s3://$SCCACHE_BUCKET/docker/$cksum"

From 161cdfa44466f4255b1ef104fba9e2d387c7d55d Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 8 Aug 2023 20:35:14 +0300
Subject: [PATCH 4/5] show docker history

---
 src/ci/docker/run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index aa83382d786ab..9634bf872f90e 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -108,6 +108,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
       if ! grep -q "$digest" <(echo "$loaded_images"); then
         echo "Uploading finished image to $url"
         set +e
+        docker history rust-ci
         docker history -q rust-ci | \
           grep -v missing | \
           xargs docker save | \

From 5592aa3be02984426cf69e7fe402305227c839d3 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Wed, 9 Aug 2023 15:58:07 +0300
Subject: [PATCH 5/5] try not removing iter images

---
 src/ci/docker/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 9634bf872f90e..d1d60314af072 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -93,7 +93,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
     docker images
     retry docker \
       build \
-      --rm \
+      --rm=false \
       -t rust-ci \
       -f "$dockerfile" \
       "$context"