From f6708f6e47e7c640dbe7ae8d827627bcccd848f3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 24 Jun 2024 20:54:53 +0200
Subject: [PATCH 1/2] chore: Update version to 4.0.0-beta.302

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index de47cdebd..9577b3e99 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // 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.301',
+    'release' => '4.0.0-beta.302',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 850674546..561ed5f06 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.301';
+return '4.0.0-beta.302';
diff --git a/versions.json b/versions.json
index a82f5332b..13b3c9775 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.301"
+            "version": "4.0.0-beta.302"
         }
     }
 }
\ No newline at end of file

From c3fb126a0a593cb6e729a1a66e629eeb1fcff20f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 24 Jun 2024 20:55:12 +0200
Subject: [PATCH 2/2] refactor: Update Service model's saveComposeConfigs
 method

---
 app/Livewire/Project/Service/StackForm.php | 1 -
 app/Models/Service.php                     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Livewire/Project/Service/StackForm.php b/app/Livewire/Project/Service/StackForm.php
index a1b613a43..3f62202c8 100644
--- a/app/Livewire/Project/Service/StackForm.php
+++ b/app/Livewire/Project/Service/StackForm.php
@@ -81,7 +81,6 @@ class StackForm extends Component
             return handleError($e, $this);
         } finally {
             if (is_null($this->service->config_hash)) {
-                ray('asdf');
                 $this->service->isConfigurationChanged(true);
             } else {
                 $this->dispatch('configurationChanged');
diff --git a/app/Models/Service.php b/app/Models/Service.php
index c608e38dd..c345b2b8b 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -842,7 +842,7 @@ class Service extends BaseModel
         $envs_from_coolify = $this->environment_variables()->get();
         foreach ($json['services'] as $service => $config) {
             $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) {
                 $envs = $envs->map(function ($value) use ($env) {
                     if (str($value)->startsWith($env->key)) {
@@ -855,7 +855,6 @@ class Service extends BaseModel
             $envs = $envs->unique();
             data_set($json, "services.$service.environment", $envs->toArray());
         }
-
         $this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
         $docker_compose_base64 = base64_encode($this->docker_compose);