bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #132967 - klensy:docker-unite, r=Kobzol

Browse source 
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
This commit is contained in:
bors 2024-11-15 08:08:11 +00:00
commit f00f68245e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ci/docker/run.sh
View file

@ -96,7 +96,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
docker --version docker --version
REGISTRY=ghcr.io 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 # 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} IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci:${cksum}
# Tag used to cache the Docker build # Tag used to cache the Docker build