mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 08:04:19 +02:00
fix: parser parser
This commit is contained in:
parent
5394223f6b
commit
0f9076562f
@ -126,7 +126,7 @@ protected static function booted()
|
||||
ApplicationSetting::create([
|
||||
'application_id' => $application->id,
|
||||
]);
|
||||
$application->compose_parsing_version = '2';
|
||||
$application->compose_parsing_version = '3';
|
||||
$application->save();
|
||||
});
|
||||
static::forceDeleting(function ($application) {
|
||||
@ -1106,7 +1106,7 @@ public function parseCompose(int $pull_request_id = 0, ?int $preview_id = null)
|
||||
if (! $this->docker_compose_raw) {
|
||||
return collect([]);
|
||||
}
|
||||
if (isDev()) {
|
||||
if ($this->compose_parsing_version === '3') {
|
||||
$compose = dockerComposeParserForApplications($this);
|
||||
|
||||
return $compose;
|
||||
|
@ -1154,36 +1154,9 @@ function dockerComposeParserForApplications(Application $application): Collectio
|
||||
'is_build_time' => false,
|
||||
'is_preview' => false,
|
||||
]);
|
||||
} else {
|
||||
// TODO: Should we add the variable to Coolify's DB? Maybe add a is_hardcoded column
|
||||
$application->environment_variables()->where('key', $key)->where('application_id', $application->id)->firstOrCreate([
|
||||
'key' => $key,
|
||||
'application_id' => $application->id,
|
||||
'is_preview' => false,
|
||||
], [
|
||||
'value' => $value,
|
||||
'is_build_time' => false,
|
||||
'is_preview' => false,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
// ray($environment);
|
||||
$environment = $application->environment_variables()->where('application_id', $application->id)->get()->mapWithKeys(function ($item) {
|
||||
return [$item['key'] => $item['value']];
|
||||
});
|
||||
|
||||
// if ($environment?->count() > 0) {
|
||||
// $environment = $environment->map(function ($value, $key) use ($application) {
|
||||
// $found = $application->environment_variables()->where('key', $key)->where('application_id', $application->id)->first();
|
||||
// if ($found) {
|
||||
// $value = $found->value;
|
||||
// }
|
||||
|
||||
// return $value;
|
||||
// });
|
||||
// }
|
||||
|
||||
// Labels
|
||||
$fqdns = collect([]);
|
||||
if ($application?->serviceType()) {
|
||||
|
@ -254,7 +254,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
|
||||
helper="You need to modify the docker compose file." monacoEditorLanguage="yaml"
|
||||
useMonacoEditor />
|
||||
@else
|
||||
@if (isDev())
|
||||
@if ($application->compose_parsing_version === '3')
|
||||
<x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
|
||||
label="Docker Compose Content (raw)" helper="You need to modify the docker compose file."
|
||||
monacoEditorLanguage="yaml" useMonacoEditor />
|
||||
|
Loading…
Reference in New Issue
Block a user