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

Add file permission change for LocalFileVolume.php and add service_name parameter to fqdnLabelsForTraefik() function

Browse Source
This commit is contained in:
Andras Bacsai
2024-02-21 11:21:11 +01:00
parent 1ca0464957
commit 74b24a0690
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bootstrap/helpers/shared.php
View File

@@ -974,12 +974,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
'is_preview' => false,
]);
}
if (!$isDatabase) {
if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
$savedService->fqdn = $fqdn;
$savedService->save();
}
}
// if (!$isDatabase) {
// ray($savedService,$fqdn);
// if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
// $savedService->fqdn = $fqdn;
// $savedService->save();
// }
// }
} else {
$generatedValue = generateEnvValue($command);
if (!$foundEnv) {
@@ -1039,7 +1040,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$serviceLabels = $serviceLabels->merge($defaultLabels);
if (!$isDatabase && $fqdns->count() > 0) {
if ($fqdns) {
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($resource->uuid, $fqdns, true, serviceLabels: $serviceLabels, is_gzip_enabled: $savedService->isGzipEnabled()));
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($resource->uuid, $fqdns, true, serviceLabels: $serviceLabels, is_gzip_enabled: $savedService->isGzipEnabled(), service_name: $serviceName));
}
}
if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
@@ -1480,7 +1481,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
return $preview_fqdn;
});
}
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($uuid, $fqdns,serviceLabels: $serviceLabels));
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($uuid, $fqdns, serviceLabels: $serviceLabels));
}
}
}