From f5fa09790ed448391266925c3299bd87dd1d22b2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 10 Nov 2025 14:40:03 +0100
Subject: [PATCH] refactor: improve command handling and ensure correct working
 directory for Docker operations

---
 app/Actions/Service/StartService.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php
index 50011c74f..6b5e1d4ac 100644
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -20,22 +20,23 @@ public function handle(Service $service, bool $pullLatestImages = false, bool $s
         }
         $service->saveComposeConfigs();
         $service->isConfigurationChanged(save: true);
-        $commands[] = 'cd '.$service->workdir();
-        $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
-        // Ensure .env file exists before docker compose tries to load it
+        $workdir = $service->workdir();
+        // $commands[] = "cd {$workdir}";
+        $commands[] = "echo 'Saved configuration files to {$workdir}.'";
+        // Ensure .env exists in the correct directory before docker compose tries to load it
         // This is defensive programming - saveComposeConfigs() already creates it,
         // but we guarantee it here in case of any edge cases or manual deployments
-        $commands[] = 'touch .env';
+        $commands[] = "touch {$workdir}/.env";
         if ($pullLatestImages) {
             $commands[] = "echo 'Pulling images.'";
-            $commands[] = 'docker compose pull';
+            $commands[] = "docker compose --project-directory {$workdir} pull";
         }
         if ($service->networks()->count() > 0) {
             $commands[] = "echo 'Creating Docker network.'";
             $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         }
         $commands[] = 'echo Starting service.';
-        $commands[] = 'docker compose up -d --remove-orphans --force-recreate --build';
+        $commands[] = "docker compose --project-directory {$workdir} -f {$workdir}/docker-compose.yml --project-name {$service->uuid} up -d --remove-orphans --force-recreate --build";
         $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true";
         if (data_get($service, 'connect_to_docker_network')) {
             $compose = data_get($service, 'docker_compose', []);