From ca391c97c31083851bfefdd639f73400b5e058bf Mon Sep 17 00:00:00 2001
From: RGJorge <jorgeegonzalezd@gmail.com>
Date: Sun, 3 May 2026 23:47:38 +0000
Subject: [PATCH] v0.0.17

---
 src/server/index.ts | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/server/index.ts b/src/server/index.ts
index 9e761e6..487c00f 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -8,6 +8,27 @@ import { docker, discoverServices, discoverConnections, getContainerLogs, stream
 import { pollStats, watchDockerEvents } from "./watcher";
 import type { Service, WSMessage } from "../shared/types";
 
+/** Build env-file args for docker compose by detecting .env files next to the compose file */
+function findEnvFileArgs(composeFile: string): string[] {
+  const dir = path.dirname(composeFile);
+  const baseName = path.basename(composeFile, path.extname(composeFile)); // e.g. "docker-compose.prod"
+  const candidates: string[] = [];
+
+  // Prefer specific env file matching compose name (e.g. .env.prod for docker-compose.prod.yml)
+  const suffix = baseName.replace(/^docker-compose\.?/, ""); // "prod" or ""
+  if (suffix) {
+    candidates.push(path.join(dir, `.env.${suffix}`));
+  }
+  candidates.push(path.join(dir, ".env"));
+
+  for (const envFile of candidates) {
+    if (fs.existsSync(envFile)) {
+      return ["--env-file", envFile];
+    }
+  }
+  return [];
+}
+
 const app = new Hono();
 
 // ── Compression ──
@@ -126,7 +147,8 @@ app.post("/api/containers/:id/rebuild", async (c) => {
     if (!composeFile || !serviceName) {
       return c.json({ error: "Not a Compose service — rebuild requires docker-compose" }, 400);
     }
-    const proc = Bun.spawn(["docker", "compose", "-f", composeFile, "up", "--build", "-d", serviceName], {
+    const envArgs = findEnvFileArgs(composeFile);
+    const proc = Bun.spawn(["docker", "compose", "-f", composeFile, ...envArgs, "up", "--build", "-d", serviceName], {
       stdout: "pipe",
       stderr: "pipe",
     });
@@ -155,7 +177,8 @@ app.post("/api/containers/:id/remove", async (c) => {
       await container.remove({ force: true });
       return c.json({ ok: true });
     }
-    const proc = Bun.spawn(["docker", "compose", "-f", composeFile, "rm", "-sf", serviceName], {
+    const envArgs = findEnvFileArgs(composeFile);
+    const proc = Bun.spawn(["docker", "compose", "-f", composeFile, ...envArgs, "rm", "-sf", serviceName], {
       stdout: "pipe",
       stderr: "pipe",
     });