fix: docker compose apps env rewritten

app/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -65,7 +65,11 @@ class Show extends Component
 
     public function delete()
     {
+        try {
             $this->env->delete();
             $this->dispatch('refreshEnvs');
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
     }
 }

bootstrap/helpers/shared.php

@@ -1330,7 +1330,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 if ($value?->startsWith('$')) {
                     $foundEnv = EnvironmentVariable::where([
                         'key' => $key,
-                        'service_id' => $resource->id,
+                        'application_id' => $resource->id,
+                        'is_preview' => false,
                     ])->first();
                     $value = Str::of(replaceVariables($value));
                     $key = $value;
@@ -1397,17 +1398,25 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $defaultValue = data_get($foundEnv, 'value');
                         }
                         $isBuildTime = data_get($foundEnv, 'is_build_time', false);
-                        EnvironmentVariable::updateOrCreate([
+                        if ($foundEnv) {
-                            'key' => $key->value(),
+                            $foundEnv->update([
+                                'key' => $key,
                                 'application_id' => $resource->id,
-                        ], [
+                                'is_build_time' => $isBuildTime,
+                                'value' => $defaultValue,
+                            ]);
+                        } else {
+                            EnvironmentVariable::create([
+                                'key' => $key,
                                 'value' => $defaultValue,
                                 'is_build_time' => $isBuildTime,
                                 'application_id' => $resource->id,
+                                'is_preview' => false,
                             ]);
                         }
                     }
                 }
+            }
             // Add labels to the service
             if ($resource->serviceType()) {
                 $fqdns = generateServiceSpecificFqdns($resource, forTraefik: true);

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.168',
+    'release' => '4.0.0-beta.169',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.168';
+return '4.0.0-beta.169';

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.168"
+            "version": "4.0.0-beta.169"
         }
     }
 }