feat: add builder

src/docker_util.rs

@@ -1,6 +1,8 @@
 use std::process::Command;
 use rust_util::XResult;
 use rust_util::util_cmd;
+use crate::build_util;
+use crate::build_util::Builder;
 
 const DOCKER_CMD: &str = "docker";
 
@@ -48,27 +50,29 @@ impl DockerCmd {
             self.docker_run_gid.unwrap_or_else(|| users::get_current_gid() as u32),
         ));
         cmd.arg("-v");
-        cmd.arg(&format!("{}:/usr/src/app", match self.docker_current_dir {
-            Some(dir) => dir, None => match std::env::current_dir() {
-                Ok(dir) =>  match dir.as_path().to_str() {
-                    Some(dir) => dir.into(), None => return Err(rust_util::new_box_error("Error in get current dir!")),
-                },
-                Err(e) => return Err(rust_util::new_box_error(&format!("Error in get current dir: {}", e))),
-            },
-        }));
+        cmd.arg(&format!("{}:/usr/src/app", build_util::get_work_dir(&self.docker_current_dir)?));
         cmd.arg("-w");
         cmd.arg("/usr/src/app");
         cmd.arg(&self.docker_name);
+
+        let builder = Builder::from(&self.docker_current_dir)?;
+        let builder_name = match builder.get_name() {
+            Some(n) => n, None => {
+                warning!("Unknown builder, use default: cargo");
+                "cargo".into() // default use cargo?
+            },
+        };
+
         let mut cmds_iter = cmds.iter();
         if let Some(cmd0) = cmds_iter.next() {
             if cmd0.starts_with(":") {
                 cmd.arg(&cmd0.chars().skip(1).collect::<String>());
             } else {
-                cmd.arg("cargo");
+                cmd.arg(&builder_name);
                 cmd.arg(&cmd0);
             }
         } else {
-            cmd.arg("cargo");
+            cmd.arg(&builder_name);
         }
         cmds_iter.for_each(|c| { cmd.arg(c); });
         information!("Docker cmd exec: {:?}", cmd);