Skip to content

Commit 44da850

Browse files
committed
Clarify the origin of rust-$TARGET CI Docker images
1 parent aa972e5 commit 44da850

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

.github/workflows/linux-builds-on-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
*) DOCKER="$TARGET" ;;
9797
esac
9898
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
99-
- name: Fetch the docker
99+
- name: Fetch the base docker images from rust-lang/rust
100100
run: bash ci/fetch-rust-docker.bash "${TARGET}"
101101
- name: Maybe build a docker from there
102102
run: |

.github/workflows/linux-builds-on-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
*) DOCKER="$TARGET" ;;
9191
esac
9292
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
93-
- name: Fetch the docker
93+
- name: Fetch the base docker images from rust-lang/rust
9494
run: bash ci/fetch-rust-docker.bash "${TARGET}"
9595
- name: Maybe build a docker from there
9696
run: |

.github/workflows/linux-builds-on-stable.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
*) DOCKER="$TARGET" ;;
121121
esac
122122
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
123-
- name: Fetch the docker
123+
- name: Fetch the base docker images from rust-lang/rust
124124
run: bash ci/fetch-rust-docker.bash "${TARGET}"
125125
- name: Maybe build a docker from there
126126
run: |

ci/actions-templates/linux-builds-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
*) DOCKER="$TARGET" ;;
130130
esac
131131
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
132-
- name: Fetch the docker
132+
- name: Fetch the base docker images from rust-lang/rust
133133
run: bash ci/fetch-rust-docker.bash "${TARGET}"
134134
- name: Maybe build a docker from there
135135
run: |

ci/fetch-rust-docker.bash

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ TARGET="$1"
1212

1313
RUST_REPO="https://github.com/rust-lang/rust"
1414
ARTIFACTS_BASE_URL="https://ci-artifacts.rust-lang.org/rustc-builds"
15-
LOCAL_DOCKER_TAG="rust-$TARGET"
1615

17-
# Use images from rustc master
16+
# A `Dockerfile` under `rustup`'s `ci/docker` directory may start with `FROM rust-$TARGET`.
17+
# This means it is using an S3-cached Docker image provided by `rustc`'s CI.
18+
LOCAL_DOCKER_TAG="rust-$TARGET"
19+
# The following is a mapping from `$TARGET`s to cached Docker images built from `Dockerfile`s under
20+
# <https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/>,
21+
# e.g. `FROM rust-aarch64-unknown-linux-musl` means the base `Dockerfile` to look at is located under
22+
# <https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/dist-arm-linux>.
1823
case "$TARGET" in
1924
aarch64-unknown-linux-gnu) image=dist-aarch64-linux ;;
2025
aarch64-unknown-linux-musl) image=dist-arm-linux ;;

0 commit comments

Comments
 (0)