Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor fqdnLabelsForCaddy function to handle serviceLabels parameter

Browse Source
This commit is contained in:
Andras Bacsai 2024-03-12 19:08:52 +01:00
parent 7027931095
commit 336d44a5cc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap/helpers/docker.php
View File

@ -219,6 +219,11 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource,
function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null) function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
{ {
$labels = collect([]); $labels = collect([]);
if ($serviceLabels) {
$labels->push("caddy_ingress_network={$uuid}");
} else {
$labels->push("caddy_ingress_network={$network}");
}
foreach ($domains as $loop => $domain) { foreach ($domains as $loop => $domain) {
$loop = $loop; $loop = $loop;
$url = Url::fromString($domain); $url = Url::fromString($domain);
@ -236,14 +241,12 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
$labels->push("caddy_{$loop}.try_files={path} /index.html /index.php"); $labels->push("caddy_{$loop}.try_files={path} /index.html /index.php");
if ($serviceLabels) { if ($serviceLabels) {
$labels->push("caddy_ingress_network={$uuid}");
if ($port) { if ($port) {
$labels->push("caddy_{$loop}.reverse_proxy={{upstreams $port}}"); $labels->push("caddy_{$loop}.reverse_proxy={{upstreams $port}}");
} else { } else {
$labels->push("caddy_{$loop}.reverse_proxy={{upstreams}}"); $labels->push("caddy_{$loop}.reverse_proxy={{upstreams}}");
} }
} else { } else {
$labels->push("caddy_ingress_network={$network}");
if ($port) { if ($port) {
$labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams $port}}"); $labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams $port}}");
} else { } else {