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

fix: handle array env vars

Browse Source
This commit is contained in:
Andras Bacsai
2024-07-25 12:38:31 +02:00
parent 8756141f1d
commit 192bc0f13b
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
bootstrap/helpers/shared.php
View File

@@ -1058,30 +1058,26 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
data_set($service, 'volumes', $serviceVolumes->toArray()); data_set($service, 'volumes', $serviceVolumes->toArray());
} }
// Add env_file with at least .env to the service
// $envFile = collect(data_get($service, 'env_file', []));
// if ($envFile->count() > 0) {
// if (!$envFile->contains('.env')) {
// $envFile->push('.env');
// }
// } else {
// $envFile = collect(['.env']);
// }
// data_set($service, 'env_file', $envFile->toArray());
// Get variables from the service // Get variables from the service
foreach ($serviceVariables as $variableName => $variable) { foreach ($serviceVariables as $variableName => $variable) {
if (is_numeric($variableName)) { if (is_numeric($variableName)) {
$variable = str($variable); if (is_array($variable)) {
if ($variable->contains('=')) { // - SESSION_SECRET: 123
// - SESSION_SECRET=123 // - SESSION_SECRET:
// - SESSION_SECRET= $key = str(collect($variable)->keys()->first());
$key = $variable->before('='); $value = str(collect($variable)->values()->first());
$value = $variable->after('=');
} else { } else {
// - SESSION_SECRET $variable = str($variable);
$key = $variable; if ($variable->contains('=')) {
$value = null; // - SESSION_SECRET=123
// - SESSION_SECRET=
$key = $variable->before('=');
$value = $variable->after('=');
} else {
// - SESSION_SECRET
$key = $variable;
$value = null;
}
} }
} else { } else {
// SESSION_SECRET: 123 // SESSION_SECRET: 123
@@ -1837,16 +1833,23 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
// Get variables from the service // Get variables from the service
foreach ($serviceVariables as $variableName => $variable) { foreach ($serviceVariables as $variableName => $variable) {
if (is_numeric($variableName)) { if (is_numeric($variableName)) {
$variable = str($variable); if (is_array($variable)) {
if ($variable->contains('=')) { // - SESSION_SECRET: 123
// - SESSION_SECRET=123 // - SESSION_SECRET:
// - SESSION_SECRET= $key = str(collect($variable)->keys()->first());
$key = $variable->before('='); $value = str(collect($variable)->values()->first());
$value = $variable->after('=');
} else { } else {
// - SESSION_SECRET $variable = str($variable);
$key = $variable; if ($variable->contains('=')) {
$value = null; // - SESSION_SECRET=123
// - SESSION_SECRET=
$key = $variable->before('=');
$value = $variable->after('=');
} else {
// - SESSION_SECRET
$key = $variable;
$value = null;
}
} }
} else { } else {
// SESSION_SECRET: 123 // SESSION_SECRET: 123