Merge branch 'next' into next

app/Console/Commands/CleanupDatabase.php

@@ -18,7 +18,11 @@ class CleanupDatabase extends Command
         } else {
             echo "Running database cleanup in dry-run mode...\n";
         }
+        if (isCloud()) {
             $keep_days = 60;
+        } else {
+            $keep_days = 60;
+        }
         echo "Keep days: $keep_days\n";
         // Cleanup failed jobs table
         $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(1));

app/Models/Application.php

@@ -451,6 +451,11 @@ class Application extends BaseModel
         );
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->startsWith('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/ApplicationPreview.php

@@ -35,6 +35,11 @@ class ApplicationPreview extends BaseModel
         return self::where('application_id', $application_id)->where('pull_request_id', $pull_request_id)->firstOrFail();
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->startsWith('running');
+    }
+
     public function application()
     {
         return $this->belongsTo(Application::class);

app/Models/Service.php

@@ -77,6 +77,11 @@ class Service extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status())->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status())->contains('exited');

bootstrap/helpers/proxy.php

@@ -36,16 +36,23 @@ function collectDockerNetworksByServer(Server $server)
     }
     // Service networks
     foreach ($server->services()->get() as $service) {
+        if ($service->isRunning()) {
             $networks->push($service->networks());
         }
+    }
     // Docker compose based apps
     $docker_compose_apps = $server->dockerComposeBasedApplications();
     foreach ($docker_compose_apps as $app) {
+        if ($app->isRunning()) {
             $networks->push($app->uuid);
         }
+    }
     // Docker compose based preview deployments
     $docker_compose_previews = $server->dockerComposeBasedPreviewDeployments();
     foreach ($docker_compose_previews as $preview) {
+        if (! $preview->isRunning()) {
+            continue;
+        }
         $pullRequestId = $preview->pull_request_id;
         $applicationId = $preview->application_id;
         $application = Application::find($applicationId);

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.319',
+    'release' => '4.0.0-beta.320',
     // 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.319';
+return '4.0.0-beta.320';

versions.json

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