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

fix:new parser only in dev

Browse Source
This commit is contained in:
Andras Bacsai
2024-08-22 16:50:29 +02:00
parent 1e24ab9146
commit 5394223f6b
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Application.php
View File

@@ -1106,10 +1106,11 @@ class Application extends BaseModel
if (! $this->docker_compose_raw) { if (! $this->docker_compose_raw) {
return collect([]); return collect([]);
} }
if (isDev()) {
$compose = dockerComposeParserForApplications($this);
// $compose = dockerComposeParserForApplications($this); return $compose;
}
// return $compose;
$isNew = false; $isNew = false;
$isSameDockerComposeFile = false; $isSameDockerComposeFile = false;

13
bootstrap/helpers/shared.php
View File

@@ -1167,10 +1167,23 @@ function dockerComposeParserForApplications(Application $application): Collectio
]); ]);
} }
} }
// ray($environment);
$environment = $application->environment_variables()->where('application_id', $application->id)->get()->mapWithKeys(function ($item) { $environment = $application->environment_variables()->where('application_id', $application->id)->get()->mapWithKeys(function ($item) {
return [$item['key'] => $item['value']]; 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 // Labels
$fqdns = collect([]); $fqdns = collect([]);
if ($application?->serviceType()) { if ($application?->serviceType()) {

8
resources/views/livewire/project/application/general.blade.php
View File

@@ -254,9 +254,11 @@
helper="You need to modify the docker compose file." monacoEditorLanguage="yaml" helper="You need to modify the docker compose file." monacoEditorLanguage="yaml"
useMonacoEditor /> useMonacoEditor />
@else @else
{{-- <x-forms.textarea rows="10" readonly id="application.docker_compose_raw" @if (isDev())
label="Docker Compose Content (raw)" helper="You need to modify the docker compose file." <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
monacoEditorLanguage="yaml" useMonacoEditor /> --}} label="Docker Compose Content (raw)" helper="You need to modify the docker compose file."
monacoEditorLanguage="yaml" useMonacoEditor />
@endif
<x-forms.textarea rows="10" readonly id="application.docker_compose" <x-forms.textarea rows="10" readonly id="application.docker_compose"
label="Docker Compose Content" helper="You need to modify the docker compose file." label="Docker Compose Content" helper="You need to modify the docker compose file."
monacoEditorLanguage="yaml" useMonacoEditor /> monacoEditorLanguage="yaml" useMonacoEditor />