Merge pull request coollabsio#2675 from coollabsio/next

v4.0.0-beta.304

Author: andrasbacsai

app/Models/Service.php

@@ -840,26 +840,26 @@ 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([]);
-            } else {
-                $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) {
-                    if (str($value)->startsWith($env->key)) {
-                        return "{$env->key}={$env->real_value}";
-                    }
-
-                    return $value;
-                });
-            }
-            $envs = $envs->unique();
-            data_set($json, "services.$service.environment", $envs->toArray());
-        }
+        // 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->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)) {
+        //                 return "{$env->key}={$env->real_value}";
+        //             }
+
+        //             return $value;
+        //         });
+        //     }
+        //     $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);
 

config/sentry.php

@@ -7,7 +7,7 @@
 
     // 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.303',
+    'release' => '4.0.0-beta.304',
     // 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.303';
+return '4.0.0-beta.304';

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.303"
+            "version": "4.0.0-beta.304"
         }
     }
 }