From c239b8bbba07c0f9b6f9f5507581f2d07853a11a Mon Sep 17 00:00:00 2001
From: Yanluis Fermin <32645451+Jacxk@users.noreply.github.com>
Date: Wed, 30 Jul 2025 13:41:17 -0400
Subject: [PATCH] refactor(api): modify service sub container retrieval filter
 to use coolify.name

---
 app/Http/Controllers/Api/ServicesController.php | 10 ++--------
 bootstrap/helpers/docker.php                    |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index 299af54e0..edec32db5 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -536,14 +536,8 @@ public function logs_by_uuid(Request $request)
             return response()->json(['message' => 'Service not found.'], 404);
         }
 
-        $containers = getCurrentServiceSubContainerStatus($service->destination->server, $service->id, $subServiceName);
-
-        if ($containers->count() == 0) {
-            return response()->json([
-                'message' => 'Service is not running.',
-            ], 400);
-        }
-
+        $name = "{$subServiceName}-{$service->uuid}";
+        $containers = getCurrentServiceSubContainerStatus($service->destination->server, $service->id, $name);
         $container = $containers->first();
 
         if (! $container) {
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 26704060c..87dc47336 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -66,11 +66,11 @@ function getCurrentDatabaseContainerStatus(Server $server, int $id): Collection
     return $containers;
 }
 
-function getCurrentServiceSubContainerStatus(Server $server, int $id, string $subName): Collection
+function getCurrentServiceSubContainerStatus(Server $server, int $id, string $name): Collection
 {
     $containers = collect([]);
     if (! $server->isSwarm()) {
-        $containers = instant_remote_process(["docker ps -a --filter='label=coolify.serviceId={$id}' --filter='label=coolify.service.subName={$subName}' --format '{{json .}}' "], $server);
+        $containers = instant_remote_process(["docker ps -a --filter='label=coolify.serviceId={$id}' --filter='label=coolify.name={$name}' --format '{{json .}}' "], $server);
         $containers = format_docker_command_output_to_json($containers);
 
         return $containers->filter();