diff --git a/Cargo.lock b/Cargo.lock index 537eacf..9d57492 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,7 +77,7 @@ dependencies = [ [[package]] name = "dockerbuild" -version = "0.1.2" +version = "0.1.3" dependencies = [ "rust_util", "serde", diff --git a/Cargo.toml b/Cargo.toml index 3b604d2..3afd30f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dockerbuild" -version = "0.1.2" +version = "0.1.3" authors = ["Hatter Jiang "] edition = "2018" license = "MIT" diff --git a/README.md b/README.md index e4410b0..349e6b6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ $ cargo install --git https://git.hatter.ink/hatter/dockerbuild.git ``` Config file: +* `dockerbuild.json` * `~/.dockerbuild.json` * `/etc/dockerbuild.json` diff --git a/src/config.rs b/src/config.rs index b36843e..de79834 100644 --- a/src/config.rs +++ b/src/config.rs @@ -33,7 +33,7 @@ pub fn load_docker_build_config() -> Option { fn find_docker_build_config_file() -> Option { util_file::read_config(None, &vec![ - // "dockerbuild.json".into(), + "dockerbuild.json".into(), "~/.dockerbuild.json".into(), "/etc/dockerbuild.json".into(), ]) diff --git a/src/docker_util.rs b/src/docker_util.rs index a0c7d85..193fab8 100644 --- a/src/docker_util.rs +++ b/src/docker_util.rs @@ -1,7 +1,6 @@ use std::fs; use std::process::Command; -use rust_util::XResult; -use rust_util::util_cmd; +use rust_util::{XResult, util_cmd}; use crate::build_util; use crate::build_util::Builder; @@ -22,6 +21,7 @@ pub struct DockerCmd { mirror: Option, } +#[allow(dead_code)] impl DockerCmd { pub fn new(docker_name: &str) -> Self { success!("Docker image: {}", docker_name); diff --git a/src/main.rs b/src/main.rs index 45aa675..bb0b236 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,7 +9,7 @@ use std::fs; use std::env; use std::path::{Path, PathBuf}; use rust_util::util_file; -pub use docker_util::DockerCmd; +use docker_util::DockerCmd; fn main() { information!("{} v{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));