Merge pull request #5 from damien-mathieu1/fix/docker-compose-version

Fix Docker Compose Command Compatibility
lwlee2608 · Feb 4, 2025 · f96d987 · f96d987
2 parents f777f9f + 1c8a53c
commit f96d987
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -17,8 +17,18 @@ impl DockerComposeCmd {
         }
     }
 
+    fn get_docker_compose_command() -> &'static str {
+        if Command::new("docker-compose").output().is_ok() {
+            return "docker-compose";
+        } else {
+            return "docker compose";
+        }
+    }
+
     pub fn up(&self) {
-        let output = Command::new("docker-compose")
+        let docker_compose_command = Self::get_docker_compose_command();
+
+        let output = Command::new(docker_compose_command)
             .arg("-f")
             .arg(self.file.clone())
             .arg("up")
@@ -35,7 +45,7 @@ impl DockerComposeCmd {
         }
         std::fs::create_dir_all(dir).unwrap();
 
-        let output = Command::new("docker-compose")
+        let output = Command::new(docker_compose_command)
             .arg("-f")
             .arg(self.file.clone())
             .arg("ps")
@@ -56,7 +66,7 @@ impl DockerComposeCmd {
                     let follow_container_log =
                         |container: String, file_path: std::path::PathBuf| {
                             let file = File::create(file_path).unwrap();
-                            let _ = Command::new("docker-compose")
+                            let _ = Command::new(docker_compose_command)
                                 .arg("-f")
                                 .arg(docker_compose_file)
                                 .arg("logs")
@@ -77,7 +87,9 @@ impl DockerComposeCmd {
     pub fn down(&self) {
         println!("Gracefully shutting down...");
 
-        let _output = Command::new("docker-compose")
+        let docker_compose_command = Self::get_docker_compose_command();
+
+        let _output = Command::new(docker_compose_command)
             .arg("-f")
             .arg(self.file.clone())
             .arg("down")
@@ -86,7 +98,6 @@ impl DockerComposeCmd {
     }
 }
 
-
 pub struct DockerCompose {
     cmd: DockerComposeCmd,
 }
@@ -103,4 +114,4 @@ impl Drop for DockerCompose {
     fn drop(&mut self) {
         self.cmd.down();
     }
-}
+}