Rollup merge of rust-lang#132967 - klensy:docker-unite, r=Kobzol

fix REGISTRY_USERNAME to reuse cache between auto and pr jobs see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/reuse.20.28some.29.20docker.20images.20for.20pr.2Fauto.3F
GuillaumeGomez · Nov 13, 2024 · 3e97622 · 3e97622
2 parents 72a30db + acea108
commit 3e97622
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
@@ -96,7 +96,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
     docker --version
 
     REGISTRY=ghcr.io
-    REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER:-rust-lang-ci}
+    # Hardcode username to reuse cache between auto and pr jobs
+    # FIXME: should be changed after move from rust-lang-ci
+    REGISTRY_USERNAME=rust-lang-ci
     # Tag used to push the final Docker image, so that it can be pulled by e.g. rustup
     IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci:${cksum}
     # Tag used to cache the Docker build