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

refactor(shared): improve error handling in getTopLevelNetworks function to return network name on invalid docker-compose.yml

Browse source
This commit is contained in:
Andras Bacsai 2025-07-07 10:20:54 +02:00
parent 3b7f4bcbbd
commit f732220b8f
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bootstrap/helpers/shared.php
View file

@ -599,7 +599,15 @@ function getTopLevelNetworks(Service|Application $resource)
try { try {
$yaml = Yaml::parse($resource->docker_compose_raw); $yaml = Yaml::parse($resource->docker_compose_raw);
} catch (\Exception $e) { } catch (\Exception $e) {
throw new \RuntimeException($e->getMessage()); // If the docker-compose.yml file is not valid, we will return the network name as the key
$topLevelNetworks = collect([
$resource->uuid => [
'name' => $resource->uuid,
'external' => true,
],
]);
return $topLevelNetworks->keys();
} }
$services = data_get($yaml, 'services'); $services = data_get($yaml, 'services');
$topLevelNetworks = collect(data_get($yaml, 'networks', [])); $topLevelNetworks = collect(data_get($yaml, 'networks', []));
@ -653,9 +661,16 @@ function getTopLevelNetworks(Service|Application $resource)
try { try {
$yaml = Yaml::parse($resource->docker_compose_raw); $yaml = Yaml::parse($resource->docker_compose_raw);
} catch (\Exception $e) { } catch (\Exception $e) {
throw new \RuntimeException($e->getMessage()); // If the docker-compose.yml file is not valid, we will return the network name as the key
$topLevelNetworks = collect([
$resource->uuid => [
'name' => $resource->uuid,
'external' => true,
],
]);
return $topLevelNetworks->keys();
} }
$server = $resource->destination->server;
$topLevelNetworks = collect(data_get($yaml, 'networks', [])); $topLevelNetworks = collect(data_get($yaml, 'networks', []));
$services = data_get($yaml, 'services'); $services = data_get($yaml, 'services');
$definedNetwork = collect([$resource->uuid]); $definedNetwork = collect([$resource->uuid]);