Merge branch 'main' into 8-run-default-profile

MrHedmad · Jan 3, 2024 · 242fd53 · 242fd53
2 parents 94428d6 + dcb612b
commit 242fd53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/commands/run.rs b/src/commands/run.rs
@@ -142,15 +142,24 @@ impl Executor {
     /// Build the context of this executor and return its tag.
     pub fn build_env(&self, signal_receiver: Receiver<bool>) -> Result<String> {
         let mut cleanup: Vec<PathBuf> = vec![];
-        let env_name = "kerblam_runtime";
 
         if self.env.is_none() {
             bail!("Cannot build environment with no environment file.")
         }
 
         // Move the executor file
         cleanup.push(self.target.copy()?);
-        let dockerfile_path = self.env.clone().unwrap().to_str().unwrap().to_string();
+        let dockerfile_path = self.env.clone().unwrap();
+
+        let dockerfile_name = dockerfile_path
+            .file_name()
+            .unwrap()
+            .to_string_lossy()
+            .to_string();
+        let env_name: String = dockerfile_name.split(".").take(1).collect();
+        let env_name = env_name + "_kerblam_runtime";
+
+        let dockerfile_path = dockerfile_path.as_os_str().to_string_lossy().to_string();
 
         let builder = || {
             Command::new("docker")
@@ -160,7 +169,7 @@ impl Executor {
                     "-f",
                     dockerfile_path.as_str(),
                     "--tag",
-                    env_name,
+                    env_name.as_str(),
                     ".",
                 ])
                 .stdout(Stdio::inherit())