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

fix: generate https for minio

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-16 16:35:47 +02:00
parent 1322dc9c23
commit 9b48a99798
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/helpers/docker.php
View File

@@ -229,12 +229,12 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
} }
if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) { if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
$MINIO_BROWSER_REDIRECT_URL?->update([ $MINIO_BROWSER_REDIRECT_URL?->update([
'value' => generateFqdn($server, 'console-'.$uuid), 'value' => generateFqdn($server, 'console-'.$uuid, true),
]); ]);
} }
if (is_null($MINIO_SERVER_URL?->value)) { if (is_null($MINIO_SERVER_URL?->value)) {
$MINIO_SERVER_URL?->update([ $MINIO_SERVER_URL?->update([
'value' => generateFqdn($server, 'minio-'.$uuid), 'value' => generateFqdn($server, 'minio-'.$uuid, true),
]); ]);
} }
$payload = collect([ $payload = collect([

5
bootstrap/helpers/shared.php
View File

@@ -478,7 +478,7 @@ function data_get_str($data, $key, $default = null): Stringable
return str($str); return str($str);
} }
function generateFqdn(Server $server, string $random): string function generateFqdn(Server $server, string $random, bool $forceHttps = false): 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 === '') {
@@ -488,6 +488,9 @@ function generateFqdn(Server $server, string $random): string
$host = $url->getHost(); $host = $url->getHost();
$path = $url->getPath() === '/' ? '' : $url->getPath(); $path = $url->getPath() === '/' ? '' : $url->getPath();
$scheme = $url->getScheme(); $scheme = $url->getScheme();
if ($forceHttps) {
$scheme = 'https';
}
$finalFqdn = "$scheme://{$random}.$host$path"; $finalFqdn = "$scheme://{$random}.$host$path";
return $finalFqdn; return $finalFqdn;