rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(api): modify service sub container retrieval filter to use coolify.name

Browse source
This commit is contained in:
Yanluis Fermin 2025-07-30 13:41:17 -04:00
parent 28e20473da
commit c239b8bbba
No known key found for this signature in database
GPG key ID: FD070B24B6AD2128
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/ServicesController.php
View file

@ -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) {

4
bootstrap/helpers/docker.php
View file

@ -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();