From b59799dc2bd03fbf473118c608d68597e25fc982 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 24 Jun 2024 20:58:54 +0200 Subject: [PATCH 1/2] refactor: Add default environment to Service model's saveComposeConfigs method --- app/Models/Service.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Models/Service.php b/app/Models/Service.php index c345b2b8b..82e1b6c8f 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -841,6 +841,9 @@ public function saveComposeConfigs() $json = Yaml::parse($this->docker_compose); $envs_from_coolify = $this->environment_variables()->get(); foreach ($json['services'] as $service => $config) { + if (data_get($config, 'environment') === null) { + data_set($json, "services.$service.environment", []); + } $envs = collect($config['environment']); $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}"); foreach ($envs_from_coolify as $env) { From feadc60b14c217ace067855b5c1da89d1a74e144 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 24 Jun 2024 20:59:24 +0200 Subject: [PATCH 2/2] refactor: Improve handling of default environment in Service model's saveComposeConfigs method --- app/Models/Service.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Models/Service.php b/app/Models/Service.php index 82e1b6c8f..36d7aa9c3 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -843,8 +843,10 @@ public function saveComposeConfigs() foreach ($json['services'] as $service => $config) { if (data_get($config, 'environment') === null) { data_set($json, "services.$service.environment", []); + $envs = collect([]); + } else { + $envs = collect($config['environment']); } - $envs = collect($config['environment']); $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}"); foreach ($envs_from_coolify as $env) { $envs = $envs->map(function ($value) use ($env) {