dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: Improve Docker Compose parsing for services

Browse Source
This commit is contained in:
Andras Bacsai
2024-05-31 12:09:11 +02:00
parent 0445052898
commit 94de62e503
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bootstrap/helpers/shared.php
View File

@@ -1375,13 +1375,17 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
if ($pull_request_id !== 0) { if ($pull_request_id !== 0) {
$name = $name . "-pr-$pull_request_id"; $name = $name . "-pr-$pull_request_id";
$volume = str("$name:$mount"); $volume = str("$name:$mount");
$topLevelVolumes->put($name, [ if (!$topLevelVolumes->has($name)) {
'name' => $name, $topLevelVolumes->put($name, [
]); 'name' => $name,
]);
}
} else { } else {
$topLevelVolumes->put($name->value(), [ if (!$topLevelVolumes->has($name->value())) {
'name' => $name->value(), $topLevelVolumes->put($name->value(), [
]); 'name' => $name->value(),
]);
}
} }
} }
} else { } else {
@@ -1425,9 +1429,11 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
data_set($volume, 'source', $source . ':' . $target); data_set($volume, 'source', $source . ':' . $target);
} }
if (!str($source)->startsWith('/')) { if (!str($source)->startsWith('/')) {
$topLevelVolumes->put($source, [ if (!$topLevelVolumes->has($source)) {
'name' => $source, $topLevelVolumes->put($source, [
]); 'name' => $source,
]);
}
} }
} }
} }