Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a unique name for the Docker image used by CI. #3427

Merged
merged 1 commit into from Nov 9, 2023
Merged

Use a unique name for the Docker image used by CI. #3427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci/run-docker.sh
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ run() {
echo "Building docker container for target ${1}"

# use -f so we can use ci/ as build context
docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/
docker build -t "libc-${1}" -f "ci/docker/${1}/Dockerfile" ci/
mkdir -p target
if [ -w /dev/kvm ]; then
kvm="--volume /dev/kvm:/dev/kvm"
Expand All @@ -50,15 +50,15 @@ run() {
$kvm \
--init \
--workdir /checkout \
libc \
"libc-${1}" \
sh -c "HOME=/tmp PATH=\$PATH:/rust/bin exec ci/run.sh ${1}"
}

build_switch() {
echo "Building docker container for target switch"

# use -f so we can use ci/ as build context
docker build -t libc -f "ci/docker/switch/Dockerfile" ci/
docker build -t libc-switch -f "ci/docker/switch/Dockerfile" ci/
mkdir -p target
if [ -w /dev/kvm ]; then
kvm="--volume /dev/kvm:/dev/kvm"
Expand All @@ -82,7 +82,7 @@ build_switch() {
$kvm \
--init \
--workdir /checkout \
libc \
libc-switch \
sh -c "HOME=/tmp RUSTUP_HOME=/tmp PATH=\$PATH:/rust/bin rustup default nightly \
&& rustup component add rust-src --target ci/switch.json \
&& cargo build -Z build-std=core,alloc --target ci/switch.json"
Expand Down