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

fix(docker): update parser version in FQDN generation for service-specific URLs

Browse Source
This commit is contained in:
Andras Bacsai
2025-08-27 17:02:38 +02:00
parent cde528bf5e
commit 21fc1ba254
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap/helpers/docker.php
View File

@@ -256,12 +256,12 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
if (str($MINIO_BROWSER_REDIRECT_URL->value ?? '')->isEmpty()) { if (str($MINIO_BROWSER_REDIRECT_URL->value ?? '')->isEmpty()) {
$MINIO_BROWSER_REDIRECT_URL->update([ $MINIO_BROWSER_REDIRECT_URL->update([
'value' => generateFqdn(server: $server, random: 'console-'.$uuid, parserVersion: $resource->compose_parsing_version, forceHttps: true), 'value' => generateFqdn(server: $server, random: 'console-'.$uuid, parserVersion: $resource->service->compose_parsing_version, forceHttps: true),
]); ]);
} }
if (str($MINIO_SERVER_URL->value ?? '')->isEmpty()) { if (str($MINIO_SERVER_URL->value ?? '')->isEmpty()) {
$MINIO_SERVER_URL->update([ $MINIO_SERVER_URL->update([
'value' => generateFqdn(server: $server, random: 'minio-'.$uuid, parserVersion: $resource->compose_parsing_version, forceHttps: true), 'value' => generateFqdn(server: $server, random: 'minio-'.$uuid, parserVersion: $resource->service->compose_parsing_version, forceHttps: true),
]); ]);
} }
$payload = collect([ $payload = collect([
@@ -279,12 +279,12 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
if (str($LOGTO_ENDPOINT->value ?? '')->isEmpty()) { if (str($LOGTO_ENDPOINT->value ?? '')->isEmpty()) {
$LOGTO_ENDPOINT->update([ $LOGTO_ENDPOINT->update([
'value' => generateFqdn(server: $server, random: 'logto-'.$uuid, parserVersion: $resource->compose_parsing_version), 'value' => generateFqdn(server: $server, random: 'logto-'.$uuid, parserVersion: $resource->service->compose_parsing_version),
]); ]);
} }
if (str($LOGTO_ADMIN_ENDPOINT->value ?? '')->isEmpty()) { if (str($LOGTO_ADMIN_ENDPOINT->value ?? '')->isEmpty()) {
$LOGTO_ADMIN_ENDPOINT->update([ $LOGTO_ADMIN_ENDPOINT->update([
'value' => generateFqdn(server: $server, random: 'logto-admin-'.$uuid, parserVersion: $resource->compose_parsing_version), 'value' => generateFqdn(server: $server, random: 'logto-admin-'.$uuid, parserVersion: $resource->service->compose_parsing_version),
]); ]);
} }
$payload = collect([ $payload = collect([

3
bootstrap/helpers/shared.php
View File

@@ -418,8 +418,9 @@ function generateUrl(Server $server, string $random, bool $forceHttps = false):
return "$scheme://{$random}.$host$path"; return "$scheme://{$random}.$host$path";
} }
function generateFqdn(Server $server, string $random, bool $forceHttps = false, int $parserVersion = 4): string function generateFqdn(Server $server, string $random, bool $forceHttps = false, int $parserVersion = 5): string
{ {
$wildcard = data_get($server, 'settings.wildcard_domain'); $wildcard = data_get($server, 'settings.wildcard_domain');
if (is_null($wildcard) || $wildcard === '') { if (is_null($wildcard) || $wildcard === '') {
$wildcard = sslip($server); $wildcard = sslip($server);