prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 9595d8d9c6 into 4015e03153

Browse source
This commit is contained in:
Jono 2026-03-04 17:49:13 +01:00 committed by GitHub
commit a7ebd5e9cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bootstrap/helpers/parsers.php
View file

@ -1305,19 +1305,18 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
} }
if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) { if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
$shouldGenerateLabelsExactly = $resource->destination->server->settings->generate_exact_labels; $shouldGenerateLabelsExactly = $resource->destination->server->settings->generate_exact_labels;
$uuid = $resource->uuid; // Use local variable to avoid mutating $uuid which is used for volume paths
$network = data_get($resource, 'destination.network'); $labelUuid = $resource->uuid;
$labelNetwork = data_get($resource, 'destination.network');
if ($isPullRequest) { if ($isPullRequest) {
$uuid = "{$resource->uuid}-{$pullRequestId}"; $labelUuid = "{$resource->uuid}-{$pullRequestId}";
} $labelNetwork = "{$resource->destination->network}-{$pullRequestId}";
if ($isPullRequest) {
$network = "{$resource->destination->network}-{$pullRequestId}";
} }
if ($shouldGenerateLabelsExactly) { if ($shouldGenerateLabelsExactly) {
switch ($server->proxyType()) { switch ($server->proxyType()) {
case ProxyTypes::TRAEFIK->value: case ProxyTypes::TRAEFIK->value:
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik( $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $uuid, uuid: $labelUuid,
domains: $fqdns, domains: $fqdns,
is_force_https_enabled: $originalResource->isForceHttpsEnabled(), is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
serviceLabels: $serviceLabels, serviceLabels: $serviceLabels,
@ -1329,8 +1328,8 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
break; break;
case ProxyTypes::CADDY->value: case ProxyTypes::CADDY->value:
$serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy( $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
network: $network, network: $labelNetwork,
uuid: $uuid, uuid: $labelUuid,
domains: $fqdns, domains: $fqdns,
is_force_https_enabled: $originalResource->isForceHttpsEnabled(), is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
serviceLabels: $serviceLabels, serviceLabels: $serviceLabels,
@ -1344,7 +1343,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
} }
} else { } else {
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik( $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $uuid, uuid: $labelUuid,
domains: $fqdns, domains: $fqdns,
is_force_https_enabled: $originalResource->isForceHttpsEnabled(), is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
serviceLabels: $serviceLabels, serviceLabels: $serviceLabels,
@ -1354,8 +1353,8 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
image: $image image: $image
)); ));
$serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy( $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
network: $network, network: $labelNetwork,
uuid: $uuid, uuid: $labelUuid,
domains: $fqdns, domains: $fqdns,
is_force_https_enabled: $originalResource->isForceHttpsEnabled(), is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
serviceLabels: $serviceLabels, serviceLabels: $serviceLabels,