feat: mirror can set to none, set to rust when confit is none

This commit is contained in:
2020-11-22 00:01:59 +08:00
parent 940d280e6a
commit 47fb8fef66
5 changed files with 24 additions and 4 deletions

View File

@@ -14,7 +14,7 @@ pub use docker_util::DockerCmd;
fn main() {
information!("{} v{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
let docker_build_config = config::load_docker_build_config().expect("Read config failed, not found or parse error!");
let docker_build_config = config::load_docker_build_config_or_default();
let mut args_iter = env::args().skip(1).peekable();
let mut get_docker_image = || {
@@ -45,7 +45,9 @@ fn main() {
let mut docker_cmd = DockerCmd::new(&docker_image);
docker_cmd.add_volumn(&get_final_docker_registry(&docker_image), "/usr/local/cargo/registry");
if let Some(mirror) = &crates_mirror.or(docker_build_config.mirror) {
docker_cmd.mirror(mirror);
if mirror.to_lowercase() != "none" {
docker_cmd.mirror(mirror);
}
}
docker_cmd.exec(&args).unwrap();
}