cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 16:14:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andras Bacsai 2024-08-23 20:55:32 +02:00
parent eece96e717
commit 2a9a2dd7c4
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bootstrap/helpers/shared.php
View File

@ -2113,10 +2113,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
return collect([]); return collect([]);
} }
} elseif ($resource->getMorphClass() === 'App\Models\Application') { } elseif ($resource->getMorphClass() === 'App\Models\Application') {
$isSameDockerComposeFile = false;
if ($resource->dockerComposePrLocation() === $resource->dockerComposeLocation()) {
$isSameDockerComposeFile = true;
}
try { try {
$yaml = Yaml::parse($resource->docker_compose_raw); $yaml = Yaml::parse($resource->docker_compose_raw);
} catch (\Exception $e) { } catch (\Exception $e) {
@ -2831,13 +2827,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
'configs' => $topLevelConfigs->toArray(), 'configs' => $topLevelConfigs->toArray(),
'secrets' => $topLevelSecrets->toArray(), 'secrets' => $topLevelSecrets->toArray(),
]; ];
if ($isSameDockerComposeFile) {
$resource->docker_compose_raw = Yaml::dump($yaml, 10, 2); $resource->docker_compose_raw = Yaml::dump($yaml, 10, 2);
$resource->docker_compose = Yaml::dump($finalServices, 10, 2); $resource->docker_compose = Yaml::dump($finalServices, 10, 2);
} else {
$resource->docker_compose_raw = Yaml::dump($yaml, 10, 2);
$resource->docker_compose = Yaml::dump($finalServices, 10, 2);
}
$resource->save(); $resource->save();
return collect($finalServices); return collect($finalServices);