Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

refactor: Update Service model's saveComposeConfigs method

Browse Source
This commit is contained in:
Andras Bacsai 2024-06-24 20:55:12 +02:00
parent f6708f6e47
commit c3fb126a0a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Livewire/Project/Service/StackForm.php
View File

@ -81,7 +81,6 @@ class StackForm extends Component
return handleError($e, $this); return handleError($e, $this);
} finally { } finally {
if (is_null($this->service->config_hash)) { if (is_null($this->service->config_hash)) {
ray('asdf');
$this->service->isConfigurationChanged(true); $this->service->isConfigurationChanged(true);
} else { } else {
$this->dispatch('configurationChanged'); $this->dispatch('configurationChanged');

3
app/Models/Service.php
View File

@ -842,7 +842,7 @@ class Service extends BaseModel
$envs_from_coolify = $this->environment_variables()->get(); $envs_from_coolify = $this->environment_variables()->get();
foreach ($json['services'] as $service => $config) { foreach ($json['services'] as $service => $config) {
$envs = collect($config['environment']); $envs = collect($config['environment']);
$envs->push("COOLIFY_CONTAINER_NAME=$service-{$this->uuid}"); $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}");
foreach ($envs_from_coolify as $env) { foreach ($envs_from_coolify as $env) {
$envs = $envs->map(function ($value) use ($env) { $envs = $envs->map(function ($value) use ($env) {
if (str($value)->startsWith($env->key)) { if (str($value)->startsWith($env->key)) {
@ -855,7 +855,6 @@ class Service extends BaseModel
$envs = $envs->unique(); $envs = $envs->unique();
data_set($json, "services.$service.environment", $envs->toArray()); data_set($json, "services.$service.environment", $envs->toArray());
} }
$this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK); $this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
$docker_compose_base64 = base64_encode($this->docker_compose); $docker_compose_base64 = base64_encode($this->docker_compose);