From 4bc63e283c8d83dae9629d87013b516de613eeb4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 12 Dec 2023 14:28:11 +0100
Subject: [PATCH] fix: service env variable ovewritten if it has a default
 value

---
 bootstrap/helpers/shared.php | 8 ++++----
 config/sentry.php            | 2 +-
 config/version.php           | 2 +-
 versions.json                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index d9cec50d5..5e30e0f21 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -969,10 +969,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 }
                             }
                         } else {
-                            $foundEnv = EnvironmentVariable::where([
-                                'key' => $key,
-                                'service_id' => $resource->id,
-                            ])->first();
                             if ($value->contains(':-')) {
                                 $key = $value->before(':');
                                 $defaultValue = $value->after(':-');
@@ -989,6 +985,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 $key = $value;
                                 $defaultValue = null;
                             }
+                            $foundEnv = EnvironmentVariable::where([
+                                'key' => $key,
+                                'service_id' => $resource->id,
+                            ])->first();
                             if ($foundEnv) {
                                 $defaultValue = data_get($foundEnv, 'value');
                             }
diff --git a/config/sentry.php b/config/sentry.php
index aecb822f0..bf81a36eb 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.159',
+    'release' => '4.0.0-beta.160',
     // 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 bdc652e8f..13035a86a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.159';
+return '4.0.0-beta.160';
diff --git a/versions.json b/versions.json
index 88f9860e4..aea4751ec 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.159"
+            "version": "4.0.0-beta.160"
         }
     }
 }