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

feat(core): Enable magic env variables for compose based applications

Browse Source
This commit is contained in:
Andras Bacsai
2025-04-16 15:26:40 +02:00
parent 89bf1b30cb
commit 618e546966
1 changed files with 141 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bootstrap/helpers/shared.php
View File

@@ -3014,7 +3014,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$savedService->image = $image; $savedService->image = $image;
$savedService->save(); $savedService->save();
} }
}
$environment = collect(data_get($service, 'environment', [])); $environment = collect(data_get($service, 'environment', []));
$buildArgs = collect(data_get($service, 'build.args', [])); $buildArgs = collect(data_get($service, 'build.args', []));
$environment = $environment->merge($buildArgs); $environment = $environment->merge($buildArgs);
@@ -3059,7 +3059,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$port = null; $port = null;
} }
if ($isApplication) { if ($isApplication) {
$fqdn = generateFqdn($server, "{$resource->name}-$uuid"); $fqdn = generateFqdn($server, "$uuid");
} elseif ($isService) { } elseif ($isService) {
if ($fqdnFor) { if ($fqdnFor) {
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
@@ -3129,11 +3129,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
if (str($fqdnFor)->contains('_')) { if (str($fqdnFor)->contains('_')) {
$fqdnFor = str($fqdnFor)->before('_'); $fqdnFor = str($fqdnFor)->before('_');
} }
if ($isApplication) {
$fqdn = generateFqdn($server, "{$resource->name}-$uuid");
} elseif ($isService) {
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
}
$resource->environment_variables()->firstOrCreate([ $resource->environment_variables()->firstOrCreate([
'key' => $key->value(), 'key' => $key->value(),
'resourceable_type' => get_class($resource), 'resourceable_type' => get_class($resource),
@@ -3148,11 +3144,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
if (str($fqdnFor)->contains('_')) { if (str($fqdnFor)->contains('_')) {
$fqdnFor = str($fqdnFor)->before('_'); $fqdnFor = str($fqdnFor)->before('_');
} }
if ($isApplication) {
$fqdn = generateFqdn($server, "{$resource->name}-$uuid");
} elseif ($isService) {
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
}
$fqdn = str($fqdn)->replace('http://', '')->replace('https://', ''); $fqdn = str($fqdn)->replace('http://', '')->replace('https://', '');
$resource->environment_variables()->firstOrCreate([ $resource->environment_variables()->firstOrCreate([
'key' => $key->value(), 'key' => $key->value(),
@@ -3178,7 +3170,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} }
} }
} }
}
$serviceAppsLogDrainEnabledMap = collect([]); $serviceAppsLogDrainEnabledMap = collect([]);
if ($resource instanceof Service) { if ($resource instanceof Service) {