Skip to content

Commit 9b48a99

Browse files
committed
fix: generate https for minio
1 parent 1322dc9 commit 9b48a99

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

bootstrap/helpers/docker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
229229
}
230230
if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
231231
$MINIO_BROWSER_REDIRECT_URL?->update([
232-
'value' => generateFqdn($server, 'console-'.$uuid),
232+
'value' => generateFqdn($server, 'console-'.$uuid, true),
233233
]);
234234
}
235235
if (is_null($MINIO_SERVER_URL?->value)) {
236236
$MINIO_SERVER_URL?->update([
237-
'value' => generateFqdn($server, 'minio-'.$uuid),
237+
'value' => generateFqdn($server, 'minio-'.$uuid, true),
238238
]);
239239
}
240240
$payload = collect([

bootstrap/helpers/shared.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ function data_get_str($data, $key, $default = null): Stringable
478478
return str($str);
479479
}
480480

481-
function generateFqdn(Server $server, string $random): string
481+
function generateFqdn(Server $server, string $random, bool $forceHttps = false): string
482482
{
483483
$wildcard = data_get($server, 'settings.wildcard_domain');
484484
if (is_null($wildcard) || $wildcard === '') {
@@ -488,6 +488,9 @@ function generateFqdn(Server $server, string $random): string
488488
$host = $url->getHost();
489489
$path = $url->getPath() === '/' ? '' : $url->getPath();
490490
$scheme = $url->getScheme();
491+
if ($forceHttps) {
492+
$scheme = 'https';
493+
}
491494
$finalFqdn = "$scheme://{$random}.$host$path";
492495

493496
return $finalFqdn;

0 commit comments

Comments
 (0)