From 144cdd11ec9277ce1ee1b59ec6c7423ecc544385 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 18 Apr 2024 06:55:40 +0200
Subject: [PATCH 1/2] Update version numbers to 4.0.0-beta.264

---
 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 3a1268c48..f3296a6fc 100644
--- a/config/sentry.php
+++ b/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.263',
+    'release' => '4.0.0-beta.264',
     // 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 d9f80bdf3..e3c856795 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.263';
+return '4.0.0-beta.264';
diff --git a/versions.json b/versions.json
index ed99f785f..25e842001 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.263"
+            "version": "4.0.0-beta.264"
         }
     }
 }

From a1b08ca037a96d8ffd30666bc64b5dfafcf42552 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 18 Apr 2024 06:55:47 +0200
Subject: [PATCH 2/2] revert .env changes

---
 app/Jobs/ApplicationDeploymentJob.php | 72 ++++++++++++++-------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index a8ac0aa28..fa5fb7d93 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -741,7 +741,7 @@ private function save_environment_variables()
                 }
             }
         } else {
-            $this->env_filename = ".env-coolify";
+            $this->env_filename = ".env";
             foreach ($this->application->environment_variables as $env) {
                 $real_value = $env->real_value;
                 if ($env->version === '4.0.0-beta.239') {
@@ -785,27 +785,27 @@ private function save_environment_variables()
             $this->env_filename = null;
             return;
         }
-        $this->execute_remote_command([
-            executeInDocker($this->deployment_uuid, "cat $this->workdir/.env 2>/dev/null || true"),
-            "hidden" => true,
-            "save" => "dotenv"
-        ]);
-        if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
-            $base64_dotenv = base64_encode($this->saved_outputs->get('dotenv')->value());
-            $this->execute_remote_command(
-                [
-                    "echo '{$base64_dotenv}' | base64 -d | tee $this->configuration_dir/.env > /dev/null"
-                ]
-            );
-        } else {
-            $this->execute_remote_command(
-                [
-                    "command" => "rm -f $this->configuration_dir/.env",
-                    "hidden" => true,
-                    "ignore_errors" => true
-                ]
-            );
-        }
+        // $this->execute_remote_command([
+        //     executeInDocker($this->deployment_uuid, "cat $this->workdir/.env 2>/dev/null || true"),
+        //     "hidden" => true,
+        //     "save" => "dotenv"
+        // ]);
+        // if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
+        //     $base64_dotenv = base64_encode($this->saved_outputs->get('dotenv')->value());
+        //     $this->execute_remote_command(
+        //         [
+        //             "echo '{$base64_dotenv}' | base64 -d | tee $this->configuration_dir/.env > /dev/null"
+        //         ]
+        //     );
+        // } else {
+        //     $this->execute_remote_command(
+        //         [
+        //             "command" => "rm -f $this->configuration_dir/.env",
+        //             "hidden" => true,
+        //             "ignore_errors" => true
+        //         ]
+        //     );
+        // }
         $envs_base64 = base64_encode($envs->implode("\n"));
         $this->execute_remote_command(
             [
@@ -1281,21 +1281,23 @@ private function generate_compose_file()
                 ]
             ]
         ];
-        if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
-            if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
-                $docker_compose['services'][$this->container_name]['env_file'][] = '.env';
-            } else {
-                $docker_compose['services'][$this->container_name]['env_file'] = ['.env'];
-            }
-        }
+        // if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
+        //     if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
+        //         $docker_compose['services'][$this->container_name]['env_file'][] = '.env';
+        //     } else {
+        //         $docker_compose['services'][$this->container_name]['env_file'] = ['.env'];
+        //     }
+        // }
+        // if ($this->env_filename) {
+        //     if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
+        //         $docker_compose['services'][$this->container_name]['env_file'][] = $this->env_filename;
+        //     } else {
+        //         $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
+        //     }
+        // }
         if ($this->env_filename) {
-            if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
-                $docker_compose['services'][$this->container_name]['env_file'][] = $this->env_filename;
-            } else {
-                $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
-            }
+            $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
         }
-
         if (!$this->custom_healthcheck_found) {
             $docker_compose['services'][$this->container_name]['healthcheck'] = [
                 'test' => [