Skip to content

Commit e9ecd71

Browse files
committed
pick a base stage name that wont clash with dockerio lib
Signed-off-by: Pierre Fenoll <[email protected]>
1 parent b5707e4 commit e9ecd71

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

rustcbuildx/src/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ RUN \
9292
}
9393
block
9494
} else {
95-
format!("FROM {base} AS rust\n")
95+
format!("FROM {base} AS {RUST}\n")
9696
}
9797
}
9898
}

rustcbuildx/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ const VSN: &str = env!("CARGO_PKG_VERSION");
4040

4141
const BUILDRS_CRATE_NAME: &str = "build_script_build";
4242

43-
const RUST: &str = "rust";
44-
// const RUST: &str = "rust-base";
43+
const RUST: &str = "rust-base";
4544

4645
// NOTE: this RUSTC_WRAPPER program only ever gets called by `cargo`, so we save
4746
// ourselves some trouble and assume std::path::{Path, PathBuf} are UTF-8.

rustcbuildx/src/md.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ fn md_utils() {
209209
fs::write(&tmp, format!(r#"this = "9494aa6093cd94c9"
210210
deps = ["0dc1fe2644e3176a"]
211211
contexts = [
212-
{{ name = "rust", uri = {LONG:?} }},
212+
{{ name = "rust-base", uri = {LONG:?} }},
213213
{{ name = "input_src_lib_rs--rustversion-1.0.9", uri = "/home/maison/.cargo/registry/src/github.com-1ecc6299db9ec823/rustversion-1.0.9" }},
214214
{{ name = "crate_out-...", uri = "/home/maison/code/thing.git/target/debug/build/rustversion-ae69baa7face5565/out" }},
215215
]

0 commit comments

Comments
 (0)