From 8fa1fcf96eb0160ade26c9d20d78ab4eff4b61c3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Aug 2024 13:20:10 +0200
Subject: [PATCH 1/4] refactor: Update Server model getContainers method to use
 collect() for containers and containerReplicates

---
 app/Models/Server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 99dca3ecf..8a7325beb 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -715,8 +715,8 @@ $schema://$host {
         }
 
         return [
-            'containers' => $containers ?? collect([]),
-            'containerReplicates' => $containerReplicates ?? collect([]),
+            'containers' => collect($containers) ?? collect([]),
+            'containerReplicates' => collect($containerReplicates) ?? collect([]),
         ];
     }
 

From d75ed0b20885b48ea4b79732e96bfc493779de7b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Aug 2024 13:20:24 +0200
Subject: [PATCH 2/4] refactor: Import ProxyTypes enum and use TRAEFIK instead
 of TRAEFIK_V2

---
 bootstrap/helpers/proxy.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index f18b09f56..e50983535 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Actions\Proxy\SaveConfiguration;
+use App\Enums\ProxyTypes;
 use App\Models\Application;
 use App\Models\Server;
 use Symfony\Component\Yaml\Yaml;

From 2be92a1d299764af8758d1dc211723fb7adc3056 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Aug 2024 13:20:38 +0200
Subject: [PATCH 3/4] chore: Update version to 4.0.0-beta.322

---
 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 bd1f35f45..9f31246ba 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.321',
+    'release' => '4.0.0-beta.322',
     // 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 51743745b..fe0491e33 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.321';
+return '4.0.0-beta.322';
diff --git a/versions.json b/versions.json
index 25f1a5534..53a69c520 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.321"
+            "version": "4.0.0-beta.322"
         }
     }
 }

From e2726d9dfb11e48392d77e60df300856f1148110 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Aug 2024 13:32:15 +0200
Subject: [PATCH 4/4] fix: manual update process

---
 app/Actions/Server/UpdateCoolify.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php
index 72ce80b6b..8910d6e97 100644
--- a/app/Actions/Server/UpdateCoolify.php
+++ b/app/Actions/Server/UpdateCoolify.php
@@ -4,6 +4,8 @@ namespace App\Actions\Server;
 
 use App\Models\InstanceSettings;
 use App\Models\Server;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Http;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class UpdateCoolify
@@ -25,6 +27,11 @@ class UpdateCoolify
                 return;
             }
             CleanupDocker::dispatch($this->server, false)->onQueue('high');
+            $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
+            if ($response->successful()) {
+                $versions = $response->json();
+                File::put(base_path('versions.json'), json_encode($versions, JSON_PRETTY_PRINT));
+            }
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
             if (! $manual_update) {
@@ -39,6 +46,8 @@ class UpdateCoolify
                 }
             }
             $this->update();
+            $settings->new_version_available = false;
+            $settings->save();
         } catch (\Throwable $e) {
             throw $e;
         }