fix: service env variable ovewritten if it has a default value

This commit is contained in:
Andras Bacsai 2023-12-12 14:28:11 +01:00
parent dfc353ce54
commit 4bc63e283c
4 changed files with 7 additions and 7 deletions

View File

@ -969,10 +969,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
}
}
} else {
$foundEnv = EnvironmentVariable::where([
'key' => $key,
'service_id' => $resource->id,
])->first();
if ($value->contains(':-')) {
$key = $value->before(':');
$defaultValue = $value->after(':-');
@ -989,6 +985,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$key = $value;
$defaultValue = null;
}
$foundEnv = EnvironmentVariable::where([
'key' => $key,
'service_id' => $resource->id,
])->first();
if ($foundEnv) {
$defaultValue = data_get($foundEnv, 'value');
}

View File

@ -7,7 +7,7 @@
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.159',
'release' => '4.0.0-beta.160',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.159';
return '4.0.0-beta.160';

View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.159"
"version": "4.0.0-beta.160"
}
}
}