Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/helpers/shared.php
View File

@ -1375,15 +1375,19 @@ 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");
if (!$topLevelVolumes->has($name)) {
$topLevelVolumes->put($name, [ $topLevelVolumes->put($name, [
'name' => $name, 'name' => $name,
]); ]);
}
} else { } else {
if (!$topLevelVolumes->has($name->value())) {
$topLevelVolumes->put($name->value(), [ $topLevelVolumes->put($name->value(), [
'name' => $name->value(), 'name' => $name->value(),
]); ]);
} }
} }
}
} else { } else {
if ($volume->startsWith('/')) { if ($volume->startsWith('/')) {
$name = $volume->before(':'); $name = $volume->before(':');
@ -1425,6 +1429,7 @@ 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('/')) {
if (!$topLevelVolumes->has($source)) {
$topLevelVolumes->put($source, [ $topLevelVolumes->put($source, [
'name' => $source, 'name' => $source,
]); ]);
@ -1432,6 +1437,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
} }
} }
} }
}
if (is_array($volume)) { if (is_array($volume)) {
return data_get($volume, 'source'); return data_get($volume, 'source');
} }