Merge pull request #3031 from coollabsio/next

v4.0.0-beta.323

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;
         }

app/Jobs/ServerCheckJob.php

@@ -43,15 +43,15 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(public Server $server) {}
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))];
-    }
+    // public function middleware(): array
+    // {
+    //     return [(new WithoutOverlapping($this->server->uuid))];
+    // }
 
-    public function uniqueId(): int
-    {
-        return $this->server->uuid;
-    }
+    // public function uniqueId(): int
+    // {
+    //     return $this->server->uuid;
+    // }
 
     public function handle()
     {

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([]),
         ];
     }
 

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;

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.323',
     // 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.321';
+return '4.0.0-beta.323';

versions.json

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