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

fix(core): Improve label generation and merging for applications and services

Browse Source
This commit is contained in:
Andras Bacsai
2025-02-28 12:44:20 +01:00
parent fb3f5e0a3e
commit 1c21652d5d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -19,6 +19,7 @@ use App\Notifications\Application\DeploymentFailed;
use App\Notifications\Application\DeploymentSuccess; use App\Notifications\Application\DeploymentSuccess;
use App\Traits\ExecuteRemoteCommand; use App\Traits\ExecuteRemoteCommand;
use Carbon\Carbon; use Carbon\Carbon;
use Exception;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;

5
bootstrap/helpers/docker.php
View File

@@ -604,6 +604,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
is_stripprefix_enabled: $application->isStripprefixEnabled(), is_stripprefix_enabled: $application->isStripprefixEnabled(),
redirect_direction: $application->redirect redirect_direction: $application->redirect
); );
$labels = $labels->merge(convertToKeyValueCollection($proxyLabels));
$proxyLabels = fqdnLabelsForCaddy( $proxyLabels = fqdnLabelsForCaddy(
network: $application->destination->network, network: $application->destination->network,
uuid: $appUuid, uuid: $appUuid,
@@ -659,6 +660,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
is_gzip_enabled: $application->isGzipEnabled(), is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled() is_stripprefix_enabled: $application->isStripprefixEnabled()
); );
$labels = $labels->merge(convertToKeyValueCollection($proxyLabels));
$proxyLabels = fqdnLabelsForCaddy( $proxyLabels = fqdnLabelsForCaddy(
network: $application->destination->network, network: $application->destination->network,
uuid: $appUuid, uuid: $appUuid,
@@ -671,6 +673,9 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
$labels = $labels->merge(convertToKeyValueCollection($proxyLabels)); $labels = $labels->merge(convertToKeyValueCollection($proxyLabels));
} }
} }
$labels = $labels->map(function ($value, $key) {
return "$key=$value";
})->values();
return $labels->all(); return $labels->all();
} }

2
bootstrap/helpers/shared.php
View File

@@ -2045,6 +2045,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
service_name: $serviceName, service_name: $serviceName,
image: data_get($service, 'image') image: data_get($service, 'image')
); );
$serviceLabels = $serviceLabels->merge(convertToKeyValueCollection($proxyLabels));
$proxyLabels = fqdnLabelsForCaddy( $proxyLabels = fqdnLabelsForCaddy(
network: $resource->destination->network, network: $resource->destination->network,
uuid: $resource->uuid, uuid: $resource->uuid,
@@ -2818,6 +2819,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
is_gzip_enabled: $resource->isGzipEnabled(), is_gzip_enabled: $resource->isGzipEnabled(),
is_stripprefix_enabled: $resource->isStripprefixEnabled(), is_stripprefix_enabled: $resource->isStripprefixEnabled(),
); );
$serviceLabels = $serviceLabels->merge(convertToKeyValueCollection($proxyLabels));
$proxyLabels = $proxyLabels =
fqdnLabelsForCaddy( fqdnLabelsForCaddy(
network: $resource->destination->network, network: $resource->destination->network,