added file path when getting compose logs

bin/core/src/api/read/stack.rs

@@ -95,6 +95,7 @@ impl Resolve<ReadArgs> for GetStackLog {
         services,
         tail,
         timestamps,
+        compose_files: stack.compose_file_paths().to_vec(),
       })
       .await
       .context("Failed to get stack log from periphery")?;
@@ -130,6 +131,7 @@ impl Resolve<ReadArgs> for SearchStackLog {
         combinator,
         invert,
         timestamps,
+        compose_files: stack.compose_file_paths().to_vec(),
       })
       .await
       .context("Failed to search stack log from periphery")?;

bin/periphery/src/api/compose.rs

@@ -101,15 +101,23 @@ impl Resolve<super::Args> for GetComposeLog {
       services,
       tail,
       timestamps,
+      compose_files,
     } = self;
     let docker_compose = docker_compose();
     let timestamps = if timestamps {
       " --timestamps"
     } else {
       Default::default()
     };
+    // Convert compose files into -f <file> strings
+    let compose_flags = compose_files
+            .iter()
+            .map(|f| format!("-f {}", f))
+            .collect::<Vec<_>>()
+            .join(" ");
+
     let command = format!(
-      "{docker_compose} -p {project} logs --tail {tail}{timestamps} {}",
+      "{docker_compose} {compose_flags} -p {project} logs --tail {tail}{timestamps} {}",
       services.join(" ")
     );
     Ok(run_komodo_command("get stack log", None, command).await)
@@ -126,16 +134,25 @@ impl Resolve<super::Args> for GetComposeLogSearch {
       combinator,
       invert,
       timestamps,
+      compose_files,
     } = self;
     let docker_compose = docker_compose();
+
+    // Convert compose files into -f <file> strings
+    let compose_flags = compose_files
+            .iter()
+            .map(|f| format!("-f {}", f))
+            .collect::<Vec<_>>()
+            .join(" ");
+
     let grep = log_grep(&terms, combinator, invert);
     let timestamps = if timestamps {
       " --timestamps"
     } else {
       Default::default()
     };
     let command = format!(
-      "{docker_compose} -p {project} logs --tail 5000{timestamps} {} 2>&1 | {grep}",
+      "{docker_compose} {compose_flags} -p {project} logs --tail 5000{timestamps} {} 2>&1 | {grep}",
       services.join(" ")
     );
     Ok(run_komodo_command("Get stack log grep", None, command).await)

client/periphery/rs/src/api/compose.rs

@@ -61,6 +61,8 @@ pub struct GetComposeLog {
   /// Enable `--timestamps`
   #[serde(default)]
   pub timestamps: bool,
+  /// Compose files used in the project (required for podman)
+  pub compose_files: Vec<String>,
 }
 
 fn default_tail() -> u64 {
@@ -92,6 +94,8 @@ pub struct GetComposeLogSearch {
   /// Enable `--timestamps`
   #[serde(default)]
   pub timestamps: bool,
+  /// Compose files used in the project (required for podman)
+  pub compose_files: Vec<String>,
 }
 
 //