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

revert(parser): enhance FQDN generation logic for services and applications

Browse Source
This commit is contained in:
Andras Bacsai
2025-07-18 23:10:08 +02:00
parent 43ff38d914
commit 9651e3a7ec
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap/helpers/shared.php
View File

@@ -3049,7 +3049,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
// Get all SERVICE_ variables from keys and values // Get all SERVICE_ variables from keys and values
$key = str($key); $key = str($key);
$value = str($value); $value = str($value);
$regex = '/\$(\{?([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\}?)/'; $regex = '/\$(\{?([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\}?)/';
preg_match_all($regex, $value, $valueMatches); preg_match_all($regex, $value, $valueMatches);
if (count($valueMatches[1]) > 0) { if (count($valueMatches[1]) > 0) {
@@ -3080,8 +3079,11 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} }
} elseif ($isService) { } elseif ($isService) {
if (blank($savedService->fqdn)) { if (blank($savedService->fqdn)) {
// For services, if no explicit FQDN is set, leave SERVICE_FQDN_ variables empty if ($fqdnFor) {
$fqdn = ''; $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
} else {
$fqdn = generateFqdn($server, "{$savedService->name}-$uuid");
}
} else { } else {
$fqdn = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value(); $fqdn = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value();
} }
@@ -3147,10 +3149,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
if ($isApplication && $resource->build_pack === 'dockercompose') { if ($isApplication && $resource->build_pack === 'dockercompose') {
continue; continue;
} }
// For services, only generate FQDN if explicit FQDN is set
if ($isService && blank($savedService->fqdn)) {
continue;
}
$fqdnFor = $key->after('SERVICE_FQDN_')->lower()->value(); $fqdnFor = $key->after('SERVICE_FQDN_')->lower()->value();
if (str($fqdnFor)->contains('_')) { if (str($fqdnFor)->contains('_')) {
$fqdnFor = str($fqdnFor)->before('_'); $fqdnFor = str($fqdnFor)->before('_');