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

fix(parser): improve FQDN generation and update environment variable handling

Browse Source
This commit is contained in:
Andras Bacsai
2025-06-24 13:28:52 +02:00
parent 8fc79022f3
commit e42c5baedd
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bootstrap/helpers/shared.php
View File

@@ -3060,12 +3060,18 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$port = null; $port = null;
} }
if ($isApplication) { if ($isApplication) {
$fqdn = generateFqdn($server, "$uuid"); $fqdn = $resource->fqdn;
if (blank($resource->fqdn)) {
$fqdn = generateFqdn($server, "$uuid");
}
} elseif ($isService) { } elseif ($isService) {
if ($fqdnFor) { $fqdn = $savedService->fqdn;
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); if (blank($savedService->fqdn)) {
} else { if ($fqdnFor) {
$fqdn = generateFqdn($server, "{$savedService->name}-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
} else {
$fqdn = generateFqdn($server, "{$savedService->name}-$uuid");
}
} }
} }
@@ -3090,7 +3096,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} }
if (substr_count(str($key)->value(), '_') === 2) { if (substr_count(str($key)->value(), '_') === 2) {
$resource->environment_variables()->firstOrCreate([ $resource->environment_variables()->updateOrCreate([
'key' => $key->value(), 'key' => $key->value(),
'resourceable_type' => get_class($resource), 'resourceable_type' => get_class($resource),
'resourceable_id' => $resource->id, 'resourceable_id' => $resource->id,
@@ -3102,7 +3108,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} }
if (substr_count(str($key)->value(), '_') === 3) { if (substr_count(str($key)->value(), '_') === 3) {
$newKey = str($key)->beforeLast('_'); $newKey = str($key)->beforeLast('_');
$resource->environment_variables()->firstOrCreate([ $resource->environment_variables()->updateOrCreate([
'key' => $newKey->value(), 'key' => $newKey->value(),
'resourceable_type' => get_class($resource), 'resourceable_type' => get_class($resource),
'resourceable_id' => $resource->id, 'resourceable_id' => $resource->id,