about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-02-09 19:21:18 +0100
committerGitHub <noreply@github.com>2024-02-09 19:21:18 +0100
commitc9386246ae36d41facd726d12dc3b952f8e1cdf5 (patch)
treedd1d62394a28b57b84ff1f587199491b7255e79e
parentd9a957b32ab798724f8d332b26f94b42f2e9850f (diff)
parentbc31920c639ce57a19ae909fc3a9949ca4524b20 (diff)
downloadrust-c9386246ae36d41facd726d12dc3b952f8e1cdf5.tar.gz
rust-c9386246ae36d41facd726d12dc3b952f8e1cdf5.zip
Rollup merge of #120827 - DianQK:docker-run-local, r=Kobzol
Print image input file and checksum in CI only

Avoid getting stuck without the variable locally.

r? `@Kobzol`
-rwxr-xr-xsrc/ci/docker/run.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 0db61204f77..bd5447ac835 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -72,8 +72,12 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
       # Include cache version. Can be used to manually bust the Docker cache.
       echo "2" >> $hash_key
 
+      echo "Image input"
+      cat $hash_key
+
       cksum=$(sha512sum $hash_key | \
         awk '{print $1}')
+      echo "Image input checksum ${cksum}"
     fi
 
     dockerfile="$docker_dir/$image/Dockerfile"
@@ -84,9 +88,6 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
         context="$script_dir"
     fi
     echo "::group::Building docker image for $image"
-    echo "Image input"
-    cat $hash_key
-    echo "Image input checksum ${cksum}"
 
     # Print docker version
     docker --version