Merge pull request #1811 from coollabsio/next

v4.0.0-beta.235

README.md

@@ -10,6 +10,17 @@ No vendor lock-in, which means that all the configuration for your applications/
 
 For more information, take a look at our landing page [here](https://coolify.io).
 
+# Installation
+
+```bash
+curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
+```
+You can find the installation script source [here](./scripts/install.sh).
+
+# Support
+
+Contact us [here](https://coolify.io/docs/contact).
+
 # Donations
 To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
 
@@ -22,7 +33,9 @@ Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and
 <a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
 <a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
 
-## Github Sponsors ($15+)
+## Github Sponsors ($40+)
+<a href="https://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
+<a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
 <a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
 <a href="https://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
@@ -66,16 +79,6 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
 - Better support
 - Less maintenance for you
 
-# Installation
-
-```bash
-curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
-```
-You can find the installation script source [here](./scripts/install.sh).
-
-# Support
-
-Contact us [here](https://coolify.io/docs/contact).
 
 # Recognitions
 

app/Actions/Application/StopApplication.php

@@ -3,6 +3,8 @@
 namespace App\Actions\Application;
 
 use App\Models\Application;
+use App\Models\StandaloneDocker;
+use App\Notifications\Application\StatusChanged;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopApplication
@@ -10,13 +12,20 @@ class StopApplication
     use AsAction;
     public function handle(Application $application)
     {
-        $server = $application->destination->server;
-        if (!$server->isFunctional()) {
-            return 'Server is not functional';
+        if ($application->destination->server->isSwarm()) {
+            instant_remote_process(["docker stack rm {$application->uuid}"], $application->destination->server);
+            return;
         }
-        if ($server->isSwarm()) {
-            instant_remote_process(["docker stack rm {$application->uuid}" ], $server);
-        } else {
+
+        $servers = collect([]);
+        $servers->push($application->destination->server);
+        $application->additional_servers->map(function ($server) use ($servers) {
+            $servers->push($server);
+        });
+        foreach ($servers as $server) {
+            if (!$server->isFunctional()) {
+                return 'Server is not functional';
+            }
             $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
             if ($containers->count() > 0) {
                 foreach ($containers as $container) {
@@ -28,20 +37,7 @@ class StopApplication
                         );
                     }
                 }
-                // TODO: make notification for application
-                // $application->environment->project->team->notify(new StatusChanged($application));
-            }
-            // Delete Preview Deployments
-            $previewDeployments = $application->previews;
-            foreach ($previewDeployments as $previewDeployment) {
-                $containers = getCurrentApplicationContainerStatus($server, $application->id, $previewDeployment->pull_request_id);
-                foreach ($containers as $container) {
-                    $name = str_replace('/', '', $container['Names']);
-                    instant_remote_process(["docker rm -f $name"], $application->destination->server, throwError: false);
-                }
             }
         }
-
-
     }
 }

app/Actions/Application/StopApplicationOneServer.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Actions\Application;
+
+use App\Models\Application;
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopApplicationOneServer
+{
+    use AsAction;
+    public function handle(Application $application, Server $server)
+    {
+        if ($application->destination->server->isSwarm()) {
+            return;
+        }
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
+        try {
+            $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerName = data_get($container, 'Names');
+                    if ($containerName) {
+                        instant_remote_process(
+                            ["docker rm -f {$containerName}"],
+                            $server
+                        );
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            ray($e->getMessage());
+            return $e->getMessage();
+        }
+    }
+}

app/Actions/Database/StartMariadb.php

@@ -106,7 +106,7 @@ class StartMariadb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartMongodb.php

@@ -122,7 +122,7 @@ class StartMongodb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartMysql.php

@@ -106,7 +106,7 @@ class StartMysql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartPostgresql.php

@@ -128,7 +128,7 @@ class StartPostgresql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartRedis.php

@@ -117,7 +117,7 @@ class StartRedis
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Proxy/StartProxy.php

@@ -15,6 +15,9 @@ class StartProxy
     {
         try {
             $proxyType = $server->proxyType();
+            if ($proxyType === 'NONE') {
+                return 'OK';
+            }
             $commands = collect([]);
             $proxy_path = get_proxy_path();
             $configuration = CheckConfiguration::run($server);

app/Actions/Server/InstallLogDrain.php

@@ -128,9 +128,9 @@ class InstallLogDrain
             if ($type !== 'custom') {
                 $parsers = base64_encode("
 [PARSER]
-Name        empty_line_skipper
-Format      regex
-Regex       /^(?!\s*$).+/
+    Name        empty_line_skipper
+    Format      regex
+    Regex       /^(?!\s*$).+/
 ");
             }
             $compose = base64_encode("
@@ -198,7 +198,7 @@ Files:
             }
             $restart_command = [
                 "echo 'Stopping old Fluent Bit'",
-                "cd $config_path && docker rm -f coolify-log-drain || true",
+                "cd $config_path && docker compose down --remove-orphans || true",
                 "echo 'Starting Fluent Bit'",
                 "cd $config_path && docker compose up -d --remove-orphans",
             ];

app/Actions/Server/UpdateCoolify.php

@@ -25,7 +25,6 @@ class UpdateCoolify
             CleanupDocker::run($this->server, false);
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
-            ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);
             if ($settings->next_channel) {
                 ray('next channel enabled');
                 $this->latestVersion = 'next';
@@ -44,7 +43,7 @@ class UpdateCoolify
                 }
                 $this->update();
             }
-            send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
+            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
         } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());

app/Actions/Service/DeleteService.php

@@ -45,6 +45,9 @@ class DeleteService
             foreach ($service->databases()->get() as $database) {
                 $database->forceDelete();
             }
+            foreach ($service->scheduled_tasks as $task) {
+                $task->delete();
+            }
             $service->tags()->detach();
         }
     }

app/Actions/Service/StartService.php

@@ -16,8 +16,8 @@ class StartService
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
         $commands[] = "echo 'Creating Docker network.'";
-        $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid >/dev/null 2>&1 || true";
-        $commands[] = "echo 'Starting service $service->name on {$service->server->name}.'";
+        $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
+        $commands[] = "echo Starting service.";
         $commands[] = "echo 'Pulling images.'";
         $commands[] = "docker compose pull";
         $commands[] = "echo 'Starting containers.'";

app/Actions/Service/StopService.php

@@ -10,24 +10,31 @@ class StopService
     use AsAction;
     public function handle(Service $service)
     {
-        $server = $service->destination->server;
-        if (!$server->isFunctional()) {
-            return 'Server is not functional';
+        try {
+            $server = $service->destination->server;
+            if (!$server->isFunctional()) {
+                return 'Server is not functional';
+            }
+            ray('Stopping service: ' . $service->name);
+            $applications = $service->applications()->get();
+            foreach ($applications as $application) {
+                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
+                $application->update(['status' => 'exited']);
+            }
+            $dbs = $service->databases()->get();
+            foreach ($dbs as $db) {
+                instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
+                $db->update(['status' => 'exited']);
+            }
+            instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+            instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+            // TODO: make notification for databases
+            // $service->environment->project->team->notify(new StatusChanged($service));
+        } catch (\Exception $e) {
+            echo $e->getMessage();
+            ray($e->getMessage());
+            return $e->getMessage();
         }
-        ray('Stopping service: ' . $service->name);
-        $applications = $service->applications()->get();
-        foreach ($applications as $application) {
-            instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
-            $application->update(['status' => 'exited']);
-        }
-        $dbs = $service->databases()->get();
-        foreach ($dbs as $db) {
-            instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
-            $db->update(['status' => 'exited']);
-        }
-        instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
-        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
-        // TODO: make notification for databases
-        // $service->environment->project->team->notify(new StatusChanged($service));
+
     }
 }

app/Actions/Shared/ComplexStatusCheck.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Actions\Shared;
+
+use App\Models\Application;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ComplexStatusCheck
+{
+    use AsAction;
+    public function handle(Application $application)
+    {
+        $servers = $application->additional_servers;
+        $servers->push($application->destination->server);
+        foreach ($servers as $server) {
+            $is_main_server = $application->destination->server->id === $server->id;
+            if (!$server->isFunctional()) {
+                if ($is_main_server) {
+                    $application->update(['status' => 'exited:unhealthy']);
+                    continue;
+                } else {
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    continue;
+                }
+            }
+            $container = instant_remote_process(["docker container inspect $(docker container ls -q --filter 'label=coolify.applicationId={$application->id}' --filter 'label=coolify.pullRequestId=0') --format '{{json .}}'"], $server, false);
+            $container = format_docker_command_output_to_json($container);
+            if ($container->count() === 1) {
+                $container = $container->first();
+                $containerStatus = data_get($container, 'State.Status');
+                $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
+                if ($is_main_server) {
+                    $statusFromDb = $application->status;
+                    if ($statusFromDb !== $containerStatus) {
+                        $application->update(['status' => "$containerStatus:$containerHealth"]);
+                    }
+                } else {
+                    $additional_server = $application->additional_servers()->wherePivot('server_id', $server->id);
+                    $statusFromDb = $additional_server->first()->pivot->status;
+                    if ($statusFromDb !== $containerStatus) {
+                        $additional_server->updateExistingPivot($server->id, ['status' => "$containerStatus:$containerHealth"]);
+                    }
+                }
+            } else {
+                if ($is_main_server) {
+                    $application->update(['status' => 'exited:unhealthy']);
+                    continue;
+                } else {
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    continue;
+                }
+            }
+        }
+    }
+}

app/Console/Commands/CleanupApplicationDeploymentQueue.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\ApplicationDeploymentQueue;
+use Illuminate\Console\Command;
+
+class CleanupApplicationDeploymentQueue extends Command
+{
+    protected $signature = 'cleanup:application-deployment-queue {--team-id=}';
+    protected $description = 'CleanupApplicationDeploymentQueue';
+
+    public function handle()
+    {
+        $team_id = $this->option('team-id');
+        $servers = \App\Models\Server::where('team_id', $team_id)->get();
+        foreach ($servers as $server) {
+            $deployments = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->where("server_id", $server->id)->get();
+            foreach ($deployments as $deployment) {
+                $deployment->update(['status' => 'failed']);
+                instant_remote_process(['docker rm -f ' . $deployment->deployment_uuid], $server, false);
+            }
+        }
+    }
+}

app/Console/Commands/CleanupDatabase.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class CleanupDatabase extends Command
+{
+    protected $signature = 'cleanup:database {--yes}';
+    protected $description = 'Cleanup database';
+
+    public function handle()
+    {
+        echo "Running database cleanup...\n";
+        $keep_days = 60;
+
+        // Cleanup failed jobs table
+        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7));
+        $count = $failed_jobs->count();
+        echo "Delete $count entries from failed_jobs.\n";
+        if ($this->option('yes')) {
+            $failed_jobs->delete();
+        }
+
+        // Cleanup sessions table
+        $sessions = DB::table('sessions')->where('last_activity', '<', now()->subDays($keep_days)->timestamp);
+        $count = $sessions->count();
+        echo "Delete $count entries from sessions.\n";
+        if ($this->option('yes')) {
+            $sessions->delete();
+        }
+
+        // Cleanup activity_log table
+        $activity_log = DB::table('activity_log')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $activity_log->count();
+        echo "Delete $count entries from activity_log.\n";
+        if ($this->option('yes')) {
+            $activity_log->delete();
+        }
+
+        // Cleanup application_deployment_queues table
+        $application_deployment_queues = DB::table('application_deployment_queues')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $application_deployment_queues->count();
+        echo "Delete $count entries from application_deployment_queues.\n";
+        if ($this->option('yes')) {
+            $application_deployment_queues->delete();
+        }
+
+        // Cleanup webhooks table
+        $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $webhooks->count();
+        echo "Delete $count entries from webhooks.\n";
+        if ($this->option('yes')) {
+            $webhooks->delete();
+        }
+
+    }
+}

app/Console/Commands/CleanupStuckedResources.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\Application;
+use App\Models\ScheduledTask;
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
@@ -20,7 +21,8 @@ class CleanupStuckedResources extends Command
 
     public function handle()
     {
-        echo "Running cleanup stucked...\n";
+        ray('Running cleanup stucked resources.');
+        echo "Running cleanup stucked resources.\n";
         $this->cleanup_stucked_resources();
     }
     private function cleanup_stucked_resources()
@@ -107,24 +109,35 @@ class CleanupStuckedResources extends Command
         } catch (\Throwable $e) {
             echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
         }
+        try {
+            $scheduled_tasks = ScheduledTask::all();
+            foreach ($scheduled_tasks as $scheduled_task) {
+                if (!$scheduled_task->service && !$scheduled_task->application) {
+                    echo "Deleting stuck scheduledtask: {$scheduled_task->name}\n";
+                    $scheduled_task->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck scheduledtasks: {$e->getMessage()}\n";
+        }
 
         // Cleanup any resources that are not attached to any environment or destination or server
         try {
             $applications = Application::all();
             foreach ($applications as $application) {
                 if (!data_get($application, 'environment')) {
-                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without environment: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
                 if (!$application->destination()) {
-                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without destination: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
                 if (!data_get($application, 'destination.server')) {
-                    echo 'Application without server: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without server: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
             }
@@ -135,18 +148,18 @@ class CleanupStuckedResources extends Command
             $postgresqls = StandalonePostgresql::all()->where('id', '!=', 0);
             foreach ($postgresqls as $postgresql) {
                 if (!data_get($postgresql, 'environment')) {
-                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without environment: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
                 if (!$postgresql->destination()) {
-                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without destination: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
                 if (!data_get($postgresql, 'destination.server')) {
-                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without server: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
             }
@@ -157,18 +170,18 @@ class CleanupStuckedResources extends Command
             $redis = StandaloneRedis::all();
             foreach ($redis as $redis) {
                 if (!data_get($redis, 'environment')) {
-                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without environment: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
                 if (!$redis->destination()) {
-                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without destination: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
                 if (!data_get($redis, 'destination.server')) {
-                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without server: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
             }
@@ -180,18 +193,18 @@ class CleanupStuckedResources extends Command
             $mongodbs = StandaloneMongodb::all();
             foreach ($mongodbs as $mongodb) {
                 if (!data_get($mongodb, 'environment')) {
-                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without environment: ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
                 if (!$mongodb->destination()) {
-                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without destination: ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
                 if (!data_get($mongodb, 'destination.server')) {
-                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without server:  ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
             }
@@ -203,18 +216,18 @@ class CleanupStuckedResources extends Command
             $mysqls = StandaloneMysql::all();
             foreach ($mysqls as $mysql) {
                 if (!data_get($mysql, 'environment')) {
-                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without environment: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
                 if (!$mysql->destination()) {
-                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without destination: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
                 if (!data_get($mysql, 'destination.server')) {
-                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without server: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
             }
@@ -226,18 +239,18 @@ class CleanupStuckedResources extends Command
             $mariadbs = StandaloneMariadb::all();
             foreach ($mariadbs as $mariadb) {
                 if (!data_get($mariadb, 'environment')) {
-                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without environment: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
                 if (!$mariadb->destination()) {
-                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without destination: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
                 if (!data_get($mariadb, 'destination.server')) {
-                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without server: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
             }
@@ -249,18 +262,18 @@ class CleanupStuckedResources extends Command
             $services = Service::all();
             foreach ($services as $service) {
                 if (!data_get($service, 'environment')) {
-                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without environment: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
                 if (!$service->destination()) {
-                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without destination: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
                 if (!data_get($service, 'server')) {
-                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without server: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }
@@ -271,8 +284,8 @@ class CleanupStuckedResources extends Command
             $serviceApplications = ServiceApplication::all();
             foreach ($serviceApplications as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'ServiceApplication without service: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }
@@ -283,8 +296,8 @@ class CleanupStuckedResources extends Command
             $serviceDatabases = ServiceDatabase::all();
             foreach ($serviceDatabases as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'ServiceDatabase without service: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }

app/Console/Commands/CleanupUnreachableServers.php

@@ -8,15 +8,16 @@ use Illuminate\Console\Command;
 class CleanupUnreachableServers extends Command
 {
     protected $signature = 'cleanup:unreachable-servers';
-    protected $description = 'Cleanup Unreachable Servers (3 days)';
+    protected $description = 'Cleanup Unreachable Servers (7 days)';
 
     public function handle()
     {
         echo "Running unreachable server cleanup...\n";
-        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(3))->get();
+        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
         if ($servers->count() > 0) {
             foreach ($servers as $server) {
                 echo "Cleanup unreachable server ($server->id) with name $server->name";
+                send_internal_notification("Server $server->name is unreachable for 7 days. Cleaning up...");
                 $server->update([
                     'ip' => '1.2.3.4'
                 ]);

app/Console/Commands/Emails.php

@@ -2,10 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\DatabaseBackupStatusJob;
 use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
@@ -15,6 +17,7 @@ use App\Notifications\Application\DeploymentSuccess;
 use App\Notifications\Application\StatusChanged;
 use App\Notifications\Database\BackupFailed;
 use App\Notifications\Database\BackupSuccess;
+use App\Notifications\Database\DailyBackup;
 use App\Notifications\Test;
 use Exception;
 use Illuminate\Console\Command;
@@ -54,6 +57,8 @@ class Emails extends Command
             options: [
                 'updates' => 'Send Update Email to all users',
                 'emails-test' => 'Test',
+                'database-backup-statuses-daily' => 'Database - Backup Statuses (Daily)',
+                'application-deployment-success-daily' => 'Application - Deployment Success (Daily)',
                 'application-deployment-success' => 'Application - Deployment Success',
                 'application-deployment-failed' => 'Application - Deployment Failed',
                 'application-status-changed' => 'Application - Status Changed',
@@ -67,8 +72,12 @@ class Emails extends Command
             ],
         );
         $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
-        if (!in_array($type, $emailsGathered)) {
-            $this->email = text('Email Address to send to');
+        if (isDev()) {
+            $this->email = "test@example.com";
+        } else {
+            if (!in_array($type, $emailsGathered)) {
+                $this->email = text('Email Address to send to:');
+            }
         }
         set_transanctional_email_settings();
 
@@ -102,7 +111,7 @@ class Emails extends Command
                         $unsubscribeUrl = route('unsubscribe.marketing.emails', [
                             'token' => encrypt($email),
                         ]);
-                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->mail->view('emails.updates', ["unsubscribeUrl" => $unsubscribeUrl]);
                         $this->sendEmail($email);
                     }
                 }
@@ -111,6 +120,35 @@ class Emails extends Command
                 $this->mail = (new Test())->toMail();
                 $this->sendEmail();
                 break;
+            case 'database-backup-statuses-daily':
+                $scheduled_backups = ScheduledDatabaseBackup::all();
+                $databases = collect();
+                foreach ($scheduled_backups as $scheduled_backup) {
+                    $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+                    if ($last_days_backups->isEmpty()) {
+                        continue;
+                    }
+                    $failed = $last_days_backups->where('status', 'failed');
+                    $database = $scheduled_backup->database;
+                    $databases->put($database->name, [
+                        'failed_count' => $failed->count(),
+                    ]);
+                }
+                $this->mail = (new DailyBackup($databases))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-success-daily':
+                $applications = Application::all();
+                foreach ($applications as $application) {
+                    $deployments = $application->get_last_days_deployments();
+                    ray($deployments);
+                    if ($deployments->isEmpty()) {
+                        continue;
+                    }
+                    $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();
+                    $this->sendEmail();
+                }
+                break;
             case 'application-deployment-success':
                 $application = Application::all()->first();
                 $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();

app/Console/Commands/Init.php

@@ -14,39 +14,44 @@ use Illuminate\Support\Facades\Http;
 
 class Init extends Command
 {
-    protected $signature = 'app:init {--cleanup}';
+    protected $signature = 'app:init {--full-cleanup} {--cleanup-deployments}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
         $this->alive();
-        $cleanup = $this->option('cleanup');
-        if ($cleanup) {
-            echo "Running cleanups...\n";
-            $this->call('cleanup:stucked-resources');
+        $full_cleanup = $this->option('full-cleanup');
+        $cleanup_deployments = $this->option('cleanup-deployments');
+        if ($cleanup_deployments) {
+            echo "Running cleanup deployments.\n";
+            $this->cleanup_in_progress_application_deployments();
+            return;
+        }
+        if ($full_cleanup) {
             // Required for falsely deleted coolify db
             $this->restore_coolify_db_backup();
-
-            // $this->cleanup_ssh();
-        }
-        $this->cleanup_in_progress_application_deployments();
-        $this->cleanup_stucked_helper_containers();
-
-        try {
-            setup_dynamic_configuration();
-        } catch (\Throwable $e) {
-            echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
-        }
-
-        $settings = InstanceSettings::get();
-        if (!is_null(env('AUTOUPDATE', null))) {
-            if (env('AUTOUPDATE') == true) {
-                $settings->update(['is_auto_update_enabled' => true]);
-            } else {
-                $settings->update(['is_auto_update_enabled' => false]);
+            $this->cleanup_in_progress_application_deployments();
+            $this->cleanup_stucked_helper_containers();
+            $this->call('cleanup:queue');
+            $this->call('cleanup:stucked-resources');
+            try {
+                setup_dynamic_configuration();
+            } catch (\Throwable $e) {
+                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
             }
+
+            $settings = InstanceSettings::get();
+            if (!is_null(env('AUTOUPDATE', null))) {
+                if (env('AUTOUPDATE') == true) {
+                    $settings->update(['is_auto_update_enabled' => true]);
+                } else {
+                    $settings->update(['is_auto_update_enabled' => false]);
+                }
+            }
+            return;
         }
-        $this->call('cleanup:queue');
+        $this->cleanup_stucked_helper_containers();
+        $this->call('cleanup:stucked-resources');
     }
     private function restore_coolify_db_backup()
     {
@@ -120,8 +125,13 @@ class Init extends Command
         // Cleanup any failed deployments
 
         try {
-            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', ApplicationDeploymentStatus::IN_PROGRESS)->where('status', '==', ApplicationDeploymentStatus::QUEUED)->get();
-            foreach ($halted_deployments as $deployment) {
+            if (isCloud()) {
+                return;
+            }
+            $queued_inprogress_deployments = ApplicationDeploymentQueue::whereIn('status', [ApplicationDeploymentStatus::IN_PROGRESS->value, ApplicationDeploymentStatus::QUEUED->value])->get();
+            foreach ($queued_inprogress_deployments as $deployment) {
+                ray($deployment->id, $deployment->status);
+                echo "Cleaning up deployment: {$deployment->id}\n";
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
@@ -129,5 +139,4 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-
 }

app/Console/Commands/ServicesGenerate.php

@@ -73,6 +73,18 @@ class ServicesGenerate extends Command
         } else {
             $slogan = str($file)->headline()->value();
         }
+        $logo = collect(preg_grep('/^# logo:/', explode("\n", $content)))->values();
+        if ($logo->count() > 0) {
+            $logo = str($logo[0])->after('# logo:')->trim()->value();
+        } else {
+            $logo = 'svgs/unknown.svg';
+        }
+        $minversion = collect(preg_grep('/^# minversion:/', explode("\n", $content)))->values();
+        if ($minversion->count() > 0) {
+            $minversion = str($minversion[0])->after('# minversion:')->trim()->value();
+        } else {
+            $minversion = '0.0.0';
+        }
         $env_file = collect(preg_grep('/^# env_file:/', explode("\n", $content)))->values();
         if ($env_file->count() > 0) {
             $env_file = str($env_file[0])->after('# env_file:')->trim()->value();
@@ -96,6 +108,8 @@ class ServicesGenerate extends Command
             'slogan' => $slogan,
             'compose' => $yaml,
             'tags' => $tags,
+            'logo' => $logo,
+            'minversion' => $minversion,
         ];
         if ($env_file) {
             $env_file_content = file_get_contents(base_path("templates/compose/$env_file"));

app/Console/Kernel.php

@@ -47,6 +47,10 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
+
+            if (!isCloud()) {
+                $schedule->command('cleanup:database --yes')->daily();
+            }
         }
     }
     private function pull_helper_image($schedule)
@@ -76,6 +80,35 @@ class Kernel extends ConsoleKernel
         foreach ($servers as $server) {
             $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
         }
+        // Delayed Jobs
+        // foreach ($containerServers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ContainerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             ray('dispatching container status job in ' . $randomSeconds . ' seconds');
+        //             dispatch($job);
+        //         })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
+        //     if ($server->isLogDrainEnabled()) {
+        //         $schedule
+        //             ->call(function () use ($server) {
+        //                 $randomSeconds = rand(1, 40);
+        //                 $job = new CheckLogDrainContainerJob($server);
+        //                 $job->delay($randomSeconds);
+        //                 dispatch($job);
+        //             })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
+        //     }
+        // }
+        // foreach ($servers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ServerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             dispatch($job);
+        //         })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
+        // }
     }
     private function instance_auto_update($schedule)
     {
@@ -91,7 +124,6 @@ class Kernel extends ConsoleKernel
     {
         $scheduled_backups = ScheduledDatabaseBackup::all();
         if ($scheduled_backups->isEmpty()) {
-            ray('no scheduled backups');
             return;
         }
         foreach ($scheduled_backups as $scheduled_backup) {
@@ -117,12 +149,11 @@ class Kernel extends ConsoleKernel
     {
         $scheduled_tasks = ScheduledTask::all();
         if ($scheduled_tasks->isEmpty()) {
-            ray('no scheduled tasks');
             return;
         }
         foreach ($scheduled_tasks as $scheduled_task) {
-            $service = $scheduled_task->service()->get();
-            $application = $scheduled_task->application()->get();
+            $service = $scheduled_task->service;
+            $application = $scheduled_task->application;
 
             if (!$application && !$service) {
                 ray('application/service attached to scheduled task does not exist');

app/Exceptions/Handler.php

@@ -77,6 +77,9 @@ class Handler extends ExceptionHandler
                     );
                 }
             );
+            if (str($e->getMessage())->contains('No space left on device')) {
+                return;
+            }
             ray('reporting to sentry');
             Integration::captureUnhandledException($e);
         });

app/Http/Controllers/Api/Deploy.php

@@ -18,8 +18,7 @@ class Deploy extends Controller
 {
     public function deploy(Request $request)
     {
-        $token = auth()->user()->currentAccessToken();
-        $teamId = data_get($token, 'team_id');
+        $teamId = get_team_id_from_token();
         $uuids = $request->query->get('uuid');
         $tags = $request->query->get('tag');
         $force = $request->query->get('force') ?? false;
@@ -73,8 +72,8 @@ class Deploy extends Controller
                 $message->push("Tag {$tag} not found.");
                 continue;
             }
-            $applications = $found_tag->applications();
-            $services = $found_tag->services();
+            $applications = $found_tag->applications()->get();
+            $services = $found_tag->services()->get();
             if ($applications->count() === 0 && $services->count() === 0) {
                 $message->push("No resources found for tag {$tag}.");
                 continue;
@@ -97,7 +96,10 @@ class Deploy extends Controller
     public function deploy_resource($resource, bool $force = false): Collection
     {
         $message = collect([]);
-        $type = $resource->getMorphClass();
+        if (gettype($resource) !== 'object') {
+            return $message->push("Resource ($resource) not found.");
+        }
+        $type = $resource?->getMorphClass();
         if ($type === 'App\Models\Application') {
             queue_application_deployment(
                 application: $resource,

app/Http/Controllers/Api/Project.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Project as ModelsProject;
+use Illuminate\Http\Request;
+
+class Project extends Controller
+{
+    public function projects(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $projects = ModelsProject::whereTeamId($teamId)->select('id', 'name', 'uuid')->get();
+        return response()->json($projects);
+    }
+    public function project_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first()->load(['environments']);
+        return response()->json($project);
+    }
+    public function environment_details(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        $environment = $project->environments()->whereName(request()->environment_name)->first()->load(['applications', 'postgresqls', 'redis', 'mongodbs', 'mysqls', 'mariadbs', 'services']);
+        return response()->json($environment);
+    }
+}

app/Http/Controllers/Api/Server.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Server as ModelsServer;
+use Illuminate\Http\Request;
+
+class Server extends Controller
+{
+    public function servers(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $servers = ModelsServer::whereTeamId($teamId)->select('id', 'name', 'uuid', 'ip', 'user', 'port')->get()->load(['settings'])->map(function ($server) {
+            $server['is_reachable'] = $server->settings->is_reachable;
+            $server['is_usable'] = $server->settings->is_usable;
+            return $server;
+        });
+        ray($servers);
+        return response()->json($servers);
+    }
+    public function server_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $server = ModelsServer::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        if (is_null($server)) {
+            return response()->json(['error' => 'Server not found.'], 404);
+        }
+        $server->load(['settings']);
+        $server['resources'] = $server->definedResources()->map(function ($resource) {
+            $payload = [
+                'id' => $resource->id,
+                'uuid' => $resource->uuid,
+                'name' => $resource->name,
+                'type' => $resource->type(),
+                'created_at' => $resource->created_at,
+                'updated_at' => $resource->updated_at,
+            ];
+            if ($resource->type() === 'service') {
+                $payload['status'] = $resource->status();
+            } else {
+                $payload['status'] = $resource->status;
+            }
+            return $payload;
+        });
+        return response()->json($server);
+    }
+}

app/Http/Controllers/Webhook/Bitbucket.php

@@ -0,0 +1,186 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Livewire\Project\Service\Storage;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Visus\Cuid2\Cuid2;
+
+class Bitbucket extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Bitbicket::manual_bitbucket", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_bitbucket_token = data_get($headers, 'x-hub-signature.0', "");
+            $x_bitbucket_event = data_get($headers, 'x-event-key.0', "");
+            $handled_events = collect(['repo:push', 'pullrequest:created', 'pullrequest:rejected', 'pullrequest:fulfilled']);
+            if (!$handled_events->contains($x_bitbucket_event)) {
+                return response([
+                    'status' => 'failed',
+                    'message' => 'Nothing to do. Event not handled.',
+                ]);
+            }
+            if ($x_bitbucket_event === 'repo:push') {
+                $branch = data_get($payload, 'push.changes.0.new.name');
+                $full_name = data_get($payload, 'repository.full_name');
+
+                if (!$branch) {
+                    return response([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                }
+                ray('Manual webhook bitbucket push event with branch: ' . $branch);
+            }
+            if ($x_bitbucket_event === 'pullrequest:created' || $x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                $branch = data_get($payload, 'pullrequest.destination.branch.name');
+                $base_branch = data_get($payload, 'pullrequest.source.branch.name');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'pullrequest.id');
+                $pull_request_html_url = data_get($payload, 'pullrequest.links.html.href');
+                $commit = data_get($payload, 'pullrequest.source.commit.hash');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            $applications = $applications->where('git_branch', $branch)->get();
+            if ($applications->isEmpty()) {
+                return response([
+                    'status' => 'failed',
+                    'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                ]);
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_bitbucket');
+                $payload = $request->getContent();
+
+                list($algo, $hash) = explode('=', $x_bitbucket_token, 2);
+                $payloadHash = hash_hmac($algo, $payload, $webhook_secret);
+                if (!hash_equals($hash, $payloadHash) && !isDev()) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_bitbucket_event === 'repo:push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Auto deployment disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:created') {
+                    if ($application->isPRDeployable()) {
+                        ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                        $deployment_uuid = new Cuid2(7);
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if (!$found) {
+                            ApplicationPreview::create([
+                                'git_type' => 'bitbucket',
+                                'application_id' => $application->id,
+                                'pull_request_id' => $pull_request_id,
+                                'pull_request_html_url' => $pull_request_html_url,
+                            ]);
+                        }
+                        queue_application_deployment(
+                            application: $application,
+                            pull_request_id: $pull_request_id,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            commit: $commit,
+                            is_webhook: true,
+                            git_type: 'bitbucket'
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Preview deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                    ray('Pull request rejected');
+                    $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                    if ($found) {
+                        $found->delete();
+                        $container_name = generateApplicationContainerName($application, $pull_request_id);
+                        instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment closed.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No preview deployment found.',
+                        ]);
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e);
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Github.php

@@ -0,0 +1,459 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Enums\ProcessStatus;
+use App\Http\Controllers\Controller;
+use App\Jobs\ApplicationPullRequestUpdateJob;
+use App\Jobs\GithubAppPermissionJob;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\GithubApp;
+use App\Models\PrivateKey;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Github extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            ray($request);
+            $return_payloads = collect([]);
+            $x_github_delivery = request()->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::manual_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $content_type = $request->header('Content-Type');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+
+            if ($content_type !== 'application/json') {
+                $payload = json_decode(data_get($payload, 'payload'), true);
+            }
+            if ($x_github_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'repository.full_name');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                ray('Manual Webhook GitHub Push Event with branch: ' . $branch);
+            }
+            if ($x_github_event === 'pull_request') {
+                $action = data_get($payload, 'action');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$branch) {
+                return response('Nothing to do. No branch found in the request.');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_github');
+                $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+                if (!hash_equals($x_hub_signature_256, $hmac) && !isDev()) {
+                    ray('Invalid signature');
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true,
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function normal(Request $request)
+    {
+        try {
+            $return_payloads = collect([]);
+            $id = null;
+            $x_github_delivery = $request->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::normal_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_github_hook_installation_target_id = $request->header('X-GitHub-Hook-Installation-Target-Id');
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+            $github_app = GithubApp::where('app_id', $x_github_hook_installation_target_id)->first();
+            if (is_null($github_app)) {
+                return response('Nothing to do. No GitHub App found.');
+            }
+            $webhook_secret = data_get($github_app, 'webhook_secret');
+            $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+            if (config('app.env') !== 'local') {
+                if (!hash_equals($x_hub_signature_256, $hmac)) {
+                    return response('Invalid signature.');
+                }
+            }
+            if ($x_github_event === 'installation' || $x_github_event === 'installation_repositories') {
+                // Installation handled by setup redirect url. Repositories queried on-demand.
+                $action = data_get($payload, 'action');
+                if ($action === 'new_permissions_accepted') {
+                    GithubAppPermissionJob::dispatch($github_app);
+                }
+                return response('cool');
+            }
+            if ($x_github_event === 'push') {
+                $id = data_get($payload, 'repository.id');
+                $branch = data_get($payload, 'ref');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                ray('Webhook GitHub Push Event: ' . $id . ' with branch: ' . $branch);
+            }
+            if ($x_github_event === 'pull_request') {
+                $action = data_get($payload, 'action');
+                $id = data_get($payload, 'repository.id');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event: ' . $id . ' with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$id || !$branch) {
+                return response('Nothing to do. No id or branch found.');
+            }
+            $applications = Application::where('repository_project_id', $id)->whereRelation('source', 'is_public', false);
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$branch'.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+
+            foreach ($applications as $application) {
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            ApplicationPullRequestUpdateJob::dispatchSync(application: $application, preview: $found, status: ProcessStatus::CLOSED);
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function redirect(Request $request)
+    {
+        try {
+            $code = $request->get('code');
+            $state = $request->get('state');
+            $github_app = GithubApp::where('uuid', $state)->firstOrFail();
+            $api_url = data_get($github_app, 'api_url');
+            $data = Http::withBody(null)->accept('application/vnd.github+json')->post("$api_url/app-manifests/$code/conversions")->throw()->json();
+            $id = data_get($data, 'id');
+            $slug = data_get($data, 'slug');
+            $client_id = data_get($data, 'client_id');
+            $client_secret = data_get($data, 'client_secret');
+            $private_key = data_get($data, 'pem');
+            $webhook_secret = data_get($data, 'webhook_secret');
+            $private_key = PrivateKey::create([
+                'name' => $slug,
+                'private_key' => $private_key,
+                'team_id' => $github_app->team_id,
+                'is_git_related' => true,
+            ]);
+            $github_app->name = $slug;
+            $github_app->app_id = $id;
+            $github_app->client_id = $client_id;
+            $github_app->client_secret = $client_secret;
+            $github_app->webhook_secret = $webhook_secret;
+            $github_app->private_key_id = $private_key->id;
+            $github_app->save();
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+    public function install(Request $request)
+    {
+        try {
+            $installation_id = $request->get('installation_id');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::install_{$installation_id}", $json);
+                return;
+            }
+            $source = $request->get('source');
+            $setup_action = $request->get('setup_action');
+            $github_app = GithubApp::where('uuid', $source)->firstOrFail();
+            if ($setup_action === 'install') {
+                $github_app->installation_id = $installation_id;
+                $github_app->save();
+            }
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Gitlab.php

@@ -0,0 +1,202 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Gitlab extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitlab::manual_gitlab", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_gitlab_token = data_get($headers, 'x-gitlab-token.0');
+            $x_gitlab_event = data_get($payload, 'object_kind');
+            if ($x_gitlab_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    return response($return_payloads);
+                }
+                ray('Manual Webhook GitLab Push Event with branch: ' . $branch);
+            }
+            if ($x_gitlab_event === 'merge_request') {
+                $action = data_get($payload, 'object_attributes.action');
+                $branch = data_get($payload, 'object_attributes.source_branch');
+                $base_branch = data_get($payload, 'object_attributes.target_branch');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                $pull_request_id = data_get($payload, 'object_attributes.iid');
+                $pull_request_html_url = data_get($payload, 'object_attributes.url');
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    return response($return_payloads);
+                }
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_gitlab_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            if ($x_gitlab_event === 'merge_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with branch '$base_branch'.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_gitlab');
+                if ($webhook_secret !== $x_gitlab_token) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_gitlab_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled',
+                        ]);
+                        ray('Deployments disabled for ' . $application->name);
+                    }
+                }
+                if ($x_gitlab_event === 'merge_request') {
+                    if ($action === 'open' || $action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'gitlab',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'gitlab'
+                            );
+                            ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment queued',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled',
+                            ]);
+                            ray('Preview deployments disabled for ' . $application->name);
+                        }
+                    } else if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment closed',
+                            ]);
+                            return response($return_payloads);
+                        }
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No Preview Deployment found',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No action found. Contact us for debugging.',
+                        ]);
+                    }
+                }
+            }
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Stripe.php

@@ -0,0 +1,258 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Jobs\ServerLimitCheckJob;
+use App\Jobs\SubscriptionInvoiceFailedJob;
+use App\Jobs\SubscriptionTrialEndedJob;
+use App\Jobs\SubscriptionTrialEndsSoonJob;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\Webhook;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Sleep;
+use Illuminate\Support\Str;
+
+class Stripe extends Controller
+{
+    public function events(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
+                return;
+            }
+            $webhookSecret = config('subscription.stripe_webhook_secret');
+            $signature = $request->header('Stripe-Signature');
+            $excludedPlans = config('subscription.stripe_excluded_plans');
+            $event = \Stripe\Webhook::constructEvent(
+                $request->getContent(),
+                $signature,
+                $webhookSecret
+            );
+            $webhook = Webhook::create([
+                'type' => 'stripe',
+                'payload' => $request->getContent()
+            ]);
+            $type = data_get($event, 'type');
+            $data = data_get($event, 'data.object');
+            switch ($type) {
+                case 'checkout.session.completed':
+                    $clientReferenceId = data_get($data, 'client_reference_id');
+                    if (is_null($clientReferenceId)) {
+                        send_internal_notification('Checkout session completed without client reference id.');
+                        break;
+                    }
+                    $userId = Str::before($clientReferenceId, ':');
+                    $teamId = Str::after($clientReferenceId, ':');
+                    $subscriptionId = data_get($data, 'subscription');
+                    $customerId = data_get($data, 'customer');
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (!$found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                        throw new Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        send_internal_notification('Old subscription activated for team: ' . $teamId);
+                        $subscription->update([
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        send_internal_notification('New subscription for team: ' . $teamId);
+                        Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    }
+                    break;
+                case 'invoice.paid':
+                    $customerId = data_get($data, 'customer');
+                    $planId = data_get($data, 'lines.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    }
+                    $subscription->update([
+                        'stripe_invoice_paid' => true,
+                    ]);
+                    break;
+                case 'invoice.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: ' . $customerId);
+                        return response('No team found in Coolify.');
+                    }
+                    if (!$subscription->stripe_invoice_paid) {
+                        SubscriptionInvoiceFailedJob::dispatch($team);
+                        send_internal_notification('Invoice payment failed: ' . $customerId);
+                    } else {
+                        send_internal_notification('Invoice payment failed but already paid: ' . $customerId);
+                    }
+                    break;
+                case 'payment_intent.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    if ($subscription->stripe_invoice_paid) {
+                        send_internal_notification('payment_intent.payment_failed but invoice is active for customer: ' . $customerId);
+                        return;
+                    }
+                    send_internal_notification('Subscription payment failed for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.updated':
+                    $customerId = data_get($data, 'customer');
+                    $status = data_get($data, 'status');
+                    $subscriptionId = data_get($data, 'items.data.0.subscription');
+                    $planId = data_get($data, 'items.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    }
+                    if (!$subscription) {
+                        send_internal_notification('No subscription found for: ' . $customerId);
+                        return response("No subscription found", 400);
+                    }
+                    $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
+                    $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
+                    $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
+                    $feedback = data_get($data, 'cancellation_details.feedback');
+                    $comment = data_get($data, 'cancellation_details.comment');
+                    $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                    if (str($lookup_key)->contains('ultimate')) {
+                        $quantity = data_get($data, 'items.data.0.quantity', 10);
+                        $team = data_get($subscription, 'team');
+                        $team->update([
+                            'custom_server_limit' => $quantity,
+                        ]);
+                        ServerLimitCheckJob::dispatch($team);
+                    }
+                    $subscription->update([
+                        'stripe_feedback' => $feedback,
+                        'stripe_comment' => $comment,
+                        'stripe_plan_id' => $planId,
+                        'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
+                    ]);
+                    if ($status === 'paused' || $status === 'incomplete_expired') {
+                        $subscription->update([
+                            'stripe_invoice_paid' => false,
+                        ]);
+                        send_internal_notification('Subscription paused or incomplete for customer: ' . $customerId);
+                    }
+
+                    // Trial ended but subscribed, reactive servers
+                    if ($trialEndedAlready && $status === 'active') {
+                        $team = data_get($subscription, 'team');
+                        $team->trialEndedButSubscribed();
+                    }
+
+                    if ($feedback) {
+                        $reason = "Cancellation feedback for {$customerId}: '" . $feedback . "'";
+                        if ($comment) {
+                            $reason .= ' with comment: \'' . $comment . "'";
+                        }
+                        send_internal_notification($reason);
+                    }
+                    if ($alreadyCancelAtPeriodEnd !== $cancelAtPeriodEnd) {
+                        if ($cancelAtPeriodEnd) {
+                            // send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
+                        } else {
+                            send_internal_notification('customer.subscription.updated for customer: ' . $customerId);
+                        }
+                    }
+                    break;
+                case 'customer.subscription.deleted':
+                    // End subscription
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_subscription_id' => null,
+                        'stripe_plan_id' => null,
+                        'stripe_cancel_at_period_end' => false,
+                        'stripe_invoice_paid' => false,
+                        'stripe_trial_already_ended' => true,
+                    ]);
+                    send_internal_notification('customer.subscription.deleted for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.trial_will_end':
+                    // Not used for now
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    SubscriptionTrialEndsSoonJob::dispatch($team);
+                    break;
+                case 'customer.subscription.paused':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_trial_already_ended' => true,
+                        'stripe_invoice_paid' => false,
+                    ]);
+                    SubscriptionTrialEndedJob::dispatch($team);
+                    send_internal_notification('Subscription paused for customer: ' . $customerId);
+                    break;
+                default:
+                    // Unhandled event type
+            }
+        } catch (Exception $e) {
+            if ($type !== 'payment_intent.payment_failed') {
+                send_internal_notification("Subscription webhook ($type) failed: " . $e->getMessage());
+            }
+            $webhook->update([
+                'status' => 'failed',
+                'failure_reason' => $e->getMessage(),
+            ]);
+            return response($e->getMessage(), 400);
+        }
+    }
+}

app/Http/Controllers/Webhook/Waitlist.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Waitlist as ModelsWaitlist;
+use Exception;
+use Illuminate\Http\Request;
+
+class Waitlist extends Controller
+{
+    public function confirm(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        ray($email, $confirmation_code);
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found) {
+                if (!$found->verified) {
+                    if ($found->created_at > now()->subMinutes(config('constants.waitlist.expiration'))) {
+                        $found->verified = true;
+                        $found->save();
+                        send_internal_notification('Waitlist confirmed: ' . $email);
+                        return 'Thank you for confirming your email address. We will notify you when you are next in line.';
+                    } else {
+                        $found->delete();
+                        send_internal_notification('Waitlist expired: ' . $email);
+                        return 'Your confirmation code has expired. Please sign up again.';
+                    }
+                }
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist confirmation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+    public function cancel(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found && !$found->verified) {
+                $found->delete();
+                send_internal_notification('Waitlist cancelled: ' . $email);
+                return 'Your email address has been removed from the waitlist.';
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist cancellation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+}

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -12,6 +12,10 @@ class DecideWhatToDoWithUser
 {
     public function handle(Request $request, Closure $next): Response
     {
+        if (auth()?->user()?->teams?->count() === 0) {
+            $currentTeam = auth()->user()?->recreate_personal_team();
+            refreshSession($currentTeam);
+        }
         if(auth()?->user()?->currentTeam()){
             refreshSession(auth()->user()->currentTeam());
         }
@@ -44,7 +48,7 @@ class DecideWhatToDoWithUser
         if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
             return redirect(RouteServiceProvider::HOME);
         }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
+        if (isSubscriptionActive() && $request->routeIs('subscription.index')) {
             return redirect(RouteServiceProvider::HOME);
         }
         return $next($request);

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -12,6 +12,7 @@ class PreventRequestsDuringMaintenance extends Middleware
      * @var array<int, string>
      */
     protected $except = [
-        //
+        'webhooks/*',
+        '/api/health'
     ];
 }

app/Jobs/ApplicationDeploymentJob.php

@@ -66,6 +66,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private Server $mainServer;
     private ?ApplicationPreview $preview = null;
     private ?string $git_type = null;
+    private bool $only_this_server = false;
 
     private string $container_name;
     private ?string $currently_running_container_name = null;
@@ -115,6 +116,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->commit = $this->application_deployment_queue->commit;
         $this->force_rebuild = $this->application_deployment_queue->force_rebuild;
         $this->restart_only = $this->application_deployment_queue->restart_only;
+        $this->only_this_server = $this->application_deployment_queue->only_this_server;
 
         $this->git_type = data_get($this->application_deployment_queue, 'git_type');
 
@@ -123,6 +125,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->source = $source->getMorphClass()::where('id', $this->application->source->id)->first();
         }
         $this->server = Server::find($this->application_deployment_queue->server_id);
+        $this->timeout = $this->server->settings->dynamic_timeout;
         $this->destination = $this->server->destinations()->where('id', $this->application_deployment_queue->destination_id)->first();
         $this->server = $this->mainServer = $this->destination->server;
         $this->serverUser = $this->server->user;
@@ -132,6 +135,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
         $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
+        ray('New container name: ', $this->container_name);
+
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
@@ -162,65 +167,71 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->application->is_github_based()) {
                 ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::IN_PROGRESS);
             }
+            if ($this->application->build_pack === 'dockerfile') {
+                if (data_get($this->application, 'dockerfile_location')) {
+                    $this->dockerfile_location = $this->application->dockerfile_location;
+                }
+            }
         }
     }
 
     public function handle(): void
     {
-        // Generate custom host<->ip mapping
-        $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
-        if (!is_null($allContainers)) {
-            $allContainers = format_docker_command_output_to_json($allContainers);
-            $ips = collect([]);
-            if (count($allContainers) > 0) {
-                $allContainers = $allContainers[0];
-                $allContainers = collect($allContainers)->sort()->values();
-                foreach ($allContainers as $container) {
-                    $containerName = data_get($container, 'Name');
-                    if ($containerName === 'coolify-proxy') {
-                        continue;
-                    }
-                    if (preg_match('/-(\d{12})/', $containerName)) {
-                        continue;
-                    }
-                    $containerIp = data_get($container, 'IPv4Address');
-                    if ($containerName && $containerIp) {
-                        $containerIp = str($containerIp)->before('/');
-                        $ips->put($containerName, $containerIp->value());
+        try {
+            // Generate custom host<->ip mapping
+            $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
+
+            if (!is_null($allContainers)) {
+                $allContainers = format_docker_command_output_to_json($allContainers);
+                $ips = collect([]);
+                if (count($allContainers) > 0) {
+                    $allContainers = $allContainers[0];
+                    $allContainers = collect($allContainers)->sort()->values();
+                    foreach ($allContainers as $container) {
+                        $containerName = data_get($container, 'Name');
+                        if ($containerName === 'coolify-proxy') {
+                            continue;
+                        }
+                        if (preg_match('/-(\d{12})/', $containerName)) {
+                            continue;
+                        }
+                        $containerIp = data_get($container, 'IPv4Address');
+                        if ($containerName && $containerIp) {
+                            $containerIp = str($containerIp)->before('/');
+                            $ips->put($containerName, $containerIp->value());
+                        }
                     }
                 }
+                $this->addHosts = $ips->map(function ($ip, $name) {
+                    return "--add-host $name:$ip";
+                })->implode(' ');
             }
-            $this->addHosts = $ips->map(function ($ip, $name) {
-                return "--add-host $name:$ip";
-            })->implode(' ');
-        }
 
-        if ($this->application->dockerfile_target_build) {
-            $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
-        }
+            if ($this->application->dockerfile_target_build) {
+                $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
+            }
 
-        // Check custom port
-        ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
+            // Check custom port
+            ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
 
-        if (data_get($this->application, 'settings.is_build_server_enabled')) {
-            $teamId = data_get($this->application, 'environment.project.team.id');
-            $buildServers = Server::buildServers($teamId)->get();
-            if ($buildServers->count() === 0) {
-                $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+            if (data_get($this->application, 'settings.is_build_server_enabled')) {
+                $teamId = data_get($this->application, 'environment.project.team.id');
+                $buildServers = Server::buildServers($teamId)->get();
+                if ($buildServers->count() === 0) {
+                    $this->application_deployment_queue->addLogEntry("No suitable build server found. Using the deployment server.");
+                    $this->build_server = $this->server;
+                    $this->original_server = $this->server;
+                } else {
+                    $this->build_server = $buildServers->random();
+                    $this->application_deployment_queue->addLogEntry("Found a suitable build server ({$this->build_server->name}).");
+                    $this->original_server = $this->server;
+                    $this->use_build_server = true;
+                }
+            } else {
+                // Set build server & original_server to the same as deployment server
                 $this->build_server = $this->server;
                 $this->original_server = $this->server;
-            } else {
-                $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
-                $this->build_server = $buildServers->random();
-                $this->original_server = $this->server;
-                $this->use_build_server = true;
             }
-        } else {
-            // Set build server & original_server to the same as deployment server
-            $this->build_server = $this->server;
-            $this->original_server = $this->server;
-        }
-        try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
                 if ($this->server->isProxyShouldRun()) {
@@ -248,9 +259,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 dispatch(new ContainerStatusJob($this->server));
             }
             // Otherwise built image needs to be pushed before from the build server.
-            if (!$this->use_build_server) {
-                $this->push_to_docker_registry();
-            }
+            // ray($this->use_build_server);
+            // if (!$this->use_build_server) {
+            //     if ($this->application->additional_servers->count() > 0) {
+            //         $this->push_to_docker_registry(forceFail: true);
+            //     } else {
+            //         $this->push_to_docker_registry();
+            //     }
+            // }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
             if ($this->pull_request_id !== 0) {
                 if ($this->application->is_github_based()) {
@@ -288,6 +304,241 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
+    private function deploy_simple_dockerfile()
+    {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $dockerfile_base64 = base64_encode($this->application->dockerfile);
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name} to {$this->server->name}.");
+        $this->prepare_builder_image();
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > {$this->workdir}{$this->dockerfile_location}")
+            ],
+        );
+        $this->generate_image_names();
+        if (!$this->force_rebuild) {
+            $this->check_image_locally_or_remotely();
+            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+                $this->create_workdir();
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+                $this->generate_compose_file();
+                $this->push_to_docker_registry();
+                $this->rolling_update();
+                return;
+            }
+        }
+        $this->generate_compose_file();
+        $this->generate_build_env_variables();
+        $this->add_build_env_variables_to_dockerfile();
+        $this->build_image();
+        $this->push_to_docker_registry();
+        $this->rolling_update();
+    }
+    private function deploy_dockerimage_buildpack()
+    {
+        $this->dockerImage = $this->application->docker_registry_image_name;
+        if (str($this->application->docker_registry_image_tag)->isEmpty()) {
+            $this->dockerImageTag = 'latest';
+        } else {
+            $this->dockerImageTag = $this->application->docker_registry_image_tag;
+        }
+        ray("echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag} to {$this->server->name}.'");
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->dockerImage}:{$this->dockerImageTag} to {$this->server->name}.");
+        $this->generate_image_names();
+        $this->prepare_builder_image();
+        $this->generate_compose_file();
+        $this->rolling_update();
+    }
+    private function deploy_docker_compose_buildpack()
+    {
+        if (data_get($this->application, 'docker_compose_location')) {
+            $this->docker_compose_location = $this->application->docker_compose_location;
+        }
+        if (data_get($this->application, 'docker_compose_custom_start_command')) {
+            $this->docker_compose_custom_start_command = $this->application->docker_compose_custom_start_command;
+        }
+        if (data_get($this->application, 'docker_compose_custom_build_command')) {
+            $this->docker_compose_custom_build_command = $this->application->docker_compose_custom_build_command;
+        }
+        if ($this->pull_request_id === 0) {
+            $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name} to {$this->server->name}.");
+        } else {
+            $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
+        }
+        $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
+        $this->clone_repository();
+        $this->generate_image_names();
+        $this->cleanup_git();
+        $this->application->loadComposeFile(isInit: false);
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $this->application->parseRawCompose();
+            $yaml = $composeFile = $this->application->docker_compose_raw;
+        } else {
+            $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
+            $yaml = Yaml::dump($composeFile->toArray(), 10);
+        }
+        $this->docker_compose_base64 = base64_encode($yaml);
+        $this->execute_remote_command([
+            executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}{$this->docker_compose_location}"), "hidden" => true
+        ]);
+        $this->save_environment_variables();
+        // Build new container to limit downtime.
+        $this->application_deployment_queue->addLogEntry("Pulling & building required images.");
+
+        if ($this->docker_compose_custom_build_command) {
+            $this->execute_remote_command(
+                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_build_command}"), "hidden" => true],
+            );
+        } else {
+            $this->execute_remote_command(
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+            );
+        }
+
+        $this->stop_running_container(force: true);
+
+        $networkId = $this->application->uuid;
+        if ($this->pull_request_id !== 0) {
+            $networkId = "{$this->application->uuid}-{$this->pull_request_id}";
+        }
+        if ($this->server->isSwarm()) {
+            // TODO
+        } else {
+            $this->execute_remote_command([
+                "docker network create --attachable '{$networkId}' >/dev/null || true", "hidden" => true, "ignore_errors" => true
+            ], [
+                "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
+            ]);
+        }
+        $this->write_deployment_configurations();
+
+        // Start compose file
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            if ($this->docker_compose_custom_start_command) {
+                $this->execute_remote_command(
+                    ["cd {$this->basedir} && {$this->docker_compose_custom_start_command}", "hidden" => true],
+                );
+            } else {
+                $server_workdir = $this->application->workdir();
+                ray("SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d");
+                $this->execute_remote_command(
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d", "hidden" => true],
+                );
+            }
+        } else {
+            if ($this->docker_compose_custom_start_command) {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
+                );
+            } else {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                );
+            }
+        }
+
+
+        $this->application_deployment_queue->addLogEntry("New container started.");
+    }
+    private function deploy_dockerfile_buildpack()
+    {
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        if (data_get($this->application, 'dockerfile_location')) {
+            $this->dockerfile_location = $this->application->dockerfile_location;
+        }
+        $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
+        $this->set_base_dir();
+        $this->generate_image_names();
+        if (!$this->force_rebuild) {
+            $this->check_image_locally_or_remotely();
+            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+                $this->create_workdir();
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+                $this->generate_compose_file();
+                $this->push_to_docker_registry();
+                $this->rolling_update();
+                return;
+            }
+        }
+        $this->clone_repository();
+        $this->cleanup_git();
+        $this->generate_compose_file();
+        $this->generate_build_env_variables();
+        $this->add_build_env_variables_to_dockerfile();
+        $this->build_image();
+        $this->push_to_docker_registry();
+        $this->rolling_update();
+    }
+    private function deploy_nixpacks_buildpack()
+    {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
+        $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
+        $this->set_base_dir();
+        $this->generate_image_names();
+        if (!$this->force_rebuild) {
+            $this->check_image_locally_or_remotely();
+            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+                $this->create_workdir();
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+                $this->generate_compose_file();
+                ray('pushing to docker registry');
+                $this->push_to_docker_registry();
+                $this->rolling_update();
+                return;
+            }
+            if ($this->application->isConfigurationChanged()) {
+                $this->application_deployment_queue->addLogEntry("Configuration changed. Rebuilding image.");
+            }
+        }
+        $this->clone_repository();
+        $this->cleanup_git();
+        $this->generate_nixpacks_confs();
+        $this->generate_compose_file();
+        $this->generate_build_env_variables();
+        $this->build_image();
+        $this->push_to_docker_registry();
+        $this->rolling_update();
+    }
+    private function deploy_static_buildpack()
+    {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
+        $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
+        $this->set_base_dir();
+        $this->generate_image_names();
+        if (!$this->force_rebuild) {
+            $this->check_image_locally_or_remotely();
+            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+                $this->create_workdir();
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+                $this->generate_compose_file();
+                $this->push_to_docker_registry();
+                $this->rolling_update();
+                return;
+            }
+        }
+        $this->clone_repository();
+        $this->cleanup_git();
+        $this->generate_compose_file();
+        $this->build_image();
+        $this->push_to_docker_registry();
+        $this->rolling_update();
+    }
+
     private function write_deployment_configurations()
     {
         if (isset($this->docker_compose_base64)) {
@@ -295,9 +546,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->server = $this->original_server;
             }
             $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-            $composeFileName = "$this->configuration_dir/docker-compose.yml";
-            if ($this->pull_request_id !== 0) {
+            if ($this->pull_request_id === 0) {
+                $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            } else {
                 $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+                $this->docker_compose_location = "/docker-compose-pr-{$this->pull_request_id}.yml";
             }
             $this->execute_remote_command(
                 [
@@ -315,44 +568,66 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
     }
-    private function push_to_docker_registry($forceFail = false)
+    private function push_to_docker_registry()
     {
-        if (
-            $this->application->docker_registry_image_name &&
-            $this->application->build_pack !== 'dockerimage' &&
-            !$this->application->destination->server->isSwarm() &&
-            !$this->restart_only &&
-            !(str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged())
-        ) {
-            try {
-                instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
-                $this->application_deployment_queue->addLogEntry("----------------------------------------");
-                $this->application_deployment_queue->addLogEntry("Pushing image to docker registry ({$this->production_image_name}).");
+        $forceFail = true;
+        if (str($this->application->docker_registry_image_name)->isEmpty()) {
+            ray('empty docker_registry_image_name');
+            return;
+        }
+        if ($this->restart_only) {
+            ray('restart_only');
+            return;
+        }
+        if ($this->application->build_pack === 'dockerimage') {
+            ray('dockerimage');
+            return;
+        }
+        if ($this->use_build_server) {
+            ray('use_build_server');
+            $forceFail = true;
+        }
+        if ($this->server->isSwarm() && $this->build_pack !== 'dockerimage') {
+            ray('isSwarm');
+            $forceFail = true;
+        }
+        if ($this->application->additional_servers->count() > 0) {
+            ray('additional_servers');
+            $forceFail = true;
+        }
+        if ($this->application->additional_servers()->wherePivot('server_id', $this->server->id)->count() > 0) {
+            ray('this is an additional_servers, no pushy pushy');
+            return;
+        }
+        ray('push_to_docker_registry noww: ' . $this->production_image_name);
+        try {
+            instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+            $this->application_deployment_queue->addLogEntry("----------------------------------------");
+            $this->application_deployment_queue->addLogEntry("Pushing image to docker registry ({$this->production_image_name}).");
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
+                ],
+            );
+            if ($this->application->docker_registry_image_tag) {
+                // Tag image with latest
+                $this->application_deployment_queue->addLogEntry("Tagging and pushing image with latest tag.");
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
+                        executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                    ],
+                    [
+                        executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
                     ],
                 );
-                if ($this->application->docker_registry_image_tag) {
-                    // Tag image with latest
-                    $this->application_deployment_queue->addLogEntry("Tagging and pushing image with latest tag.");
-                    $this->execute_remote_command(
-                        [
-                            executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
-                        ],
-                        [
-                            executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
-                        ],
-                    );
-                }
-                $this->application_deployment_queue->addLogEntry("Image pushed to docker registry.");
-            } catch (Exception $e) {
-                $this->application_deployment_queue->addLogEntry("Failed to push image to docker registry. Please check debug logs for more information.");
-                if ($forceFail) {
-                    throw $e;
-                }
-                ray($e);
             }
+            $this->application_deployment_queue->addLogEntry("Image pushed to docker registry.");
+        } catch (Exception $e) {
+            $this->application_deployment_queue->addLogEntry("Failed to push image to docker registry. Please check debug logs for more information.");
+            if ($forceFail) {
+                throw new RuntimeException($e->getMessage(), 69420);
+            }
+            ray($e);
         }
     }
     private function generate_image_names()
@@ -377,6 +652,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         } else {
             $this->dockerImageTag = str($this->commit)->substr(0, 128);
+            if ($this->application->docker_registry_image_tag) {
+                $this->dockerImageTag = $this->application->docker_registry_image_tag;
+            }
             if ($this->application->docker_registry_image_name) {
                 $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:{$this->dockerImageTag}-build");
                 $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:{$this->dockerImageTag}");
@@ -388,7 +666,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function just_restart()
     {
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -437,181 +715,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         );
     }
 
-    private function deploy_simple_dockerfile()
-    {
-        if ($this->use_build_server) {
-            $this->server = $this->build_server;
-        }
-        $dockerfile_base64 = base64_encode($this->application->dockerfile);
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
-        $this->prepare_builder_image();
-        $this->execute_remote_command(
-            [
-                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > {$this->workdir}{$this->dockerfile_location}")
-            ],
-        );
-        $this->generate_image_names();
-        $this->generate_compose_file();
-        $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
-        $this->build_image();
-        $this->rolling_update();
-    }
-
-    private function deploy_dockerimage_buildpack()
-    {
-        $this->dockerImage = $this->application->docker_registry_image_name;
-        $this->dockerImageTag = $this->application->docker_registry_image_tag;
-        ray("echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'");
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.");
-        $this->generate_image_names();
-        $this->prepare_builder_image();
-        $this->generate_compose_file();
-        $this->rolling_update();
-    }
-    private function deploy_docker_compose_buildpack()
-    {
-        if (data_get($this->application, 'docker_compose_location')) {
-            $this->docker_compose_location = $this->application->docker_compose_location;
-        }
-        if (data_get($this->application, 'docker_compose_custom_start_command')) {
-            $this->docker_compose_custom_start_command = $this->application->docker_compose_custom_start_command;
-        }
-        if (data_get($this->application, 'docker_compose_custom_build_command')) {
-            $this->docker_compose_custom_build_command = $this->application->docker_compose_custom_build_command;
-        }
-        if ($this->pull_request_id === 0) {
-            $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
-        } else {
-            $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
-        }
-        $this->prepare_builder_image();
-        $this->check_git_if_build_needed();
-        $this->clone_repository();
-        $this->generate_image_names();
-        $this->cleanup_git();
-        $this->application->loadComposeFile(isInit: false);
-        if ($this->application->settings->is_raw_compose_deployment_enabled) {
-            $yaml = $composeFile = $this->application->docker_compose_raw;
-        } else {
-            $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
-            $yaml = Yaml::dump($composeFile->toArray(), 10);
-        }
-        $this->docker_compose_base64 = base64_encode($yaml);
-        $this->execute_remote_command([
-            executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}{$this->docker_compose_location}"), "hidden" => true
-        ]);
-        $this->save_environment_variables();
-        // Build new container to limit downtime.
-        $this->application_deployment_queue->addLogEntry("Pulling & building required images.");
-
-        if ($this->docker_compose_custom_build_command) {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_build_command}"), "hidden" => true],
-            );
-        } else {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
-            );
-        }
-
-        $this->stop_running_container(force: true);
-
-        $networkId = $this->application->uuid;
-        if ($this->pull_request_id !== 0) {
-            $networkId = "{$this->application->uuid}-{$this->pull_request_id}";
-        }
-        if ($this->server->isSwarm()) {
-            // TODO
-        } else {
-            $this->execute_remote_command([
-                "docker network create --attachable '{$networkId}' >/dev/null || true", "hidden" => true, "ignore_errors" => true
-            ], [
-                "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
-            ]);
-        }
-        $this->write_deployment_configurations();
-        // Start compose file
-        if ($this->docker_compose_custom_start_command) {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
-            );
-        } else {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
-            );
-        }
-        $this->application_deployment_queue->addLogEntry("New container started.");
-    }
-    private function deploy_dockerfile_buildpack()
-    {
-        if ($this->use_build_server) {
-            $this->server = $this->build_server;
-        }
-        if (data_get($this->application, 'dockerfile_location')) {
-            $this->dockerfile_location = $this->application->dockerfile_location;
-        }
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
-        $this->prepare_builder_image();
-        $this->check_git_if_build_needed();
-        $this->clone_repository();
-        $this->set_base_dir();
-        $this->generate_image_names();
-        $this->cleanup_git();
-        $this->generate_compose_file();
-        $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
-        $this->build_image();
-        $this->rolling_update();
-    }
-    private function deploy_nixpacks_buildpack()
-    {
-        if ($this->use_build_server) {
-            $this->server = $this->build_server;
-        }
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
-        $this->prepare_builder_image();
-        $this->check_git_if_build_needed();
-        $this->set_base_dir();
-        $this->generate_image_names();
-        if (!$this->force_rebuild) {
-            $this->check_image_locally_or_remotely();
-            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
-                $this->create_workdir();
-                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
-                $this->generate_compose_file();
-                $this->rolling_update();
-                return;
-            }
-            if ($this->application->isConfigurationChanged()) {
-                $this->application_deployment_queue->addLogEntry("Configuration changed. Rebuilding image.");
-            }
-        }
-        $this->clone_repository();
-        $this->cleanup_git();
-        $this->generate_nixpacks_confs();
-        $this->generate_compose_file();
-        $this->generate_build_env_variables();
-        // $this->add_build_env_variables_to_dockerfile();
-        $this->build_image();
-        $this->rolling_update();
-    }
-    private function deploy_static_buildpack()
-    {
-        if ($this->use_build_server) {
-            $this->server = $this->build_server;
-        }
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
-        $this->prepare_builder_image();
-        $this->check_git_if_build_needed();
-        $this->set_base_dir();
-        $this->generate_image_names();
-        $this->clone_repository();
-        $this->cleanup_git();
-        $this->build_image();
-        $this->generate_compose_file();
-        $this->rolling_update();
-    }
 
     private function framework_based_notification()
     {
@@ -630,9 +733,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function rolling_update()
     {
         if ($this->server->isSwarm()) {
-            if ($this->build_pack !== 'dockerimage') {
-                $this->push_to_docker_registry(forceFail: true);
-            }
             $this->application_deployment_queue->addLogEntry("Rolling update started.");
             $this->execute_remote_command(
                 [
@@ -642,13 +742,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->application_deployment_queue->addLogEntry("Rolling update completed.");
         } else {
             if ($this->use_build_server) {
-                $this->push_to_docker_registry(forceFail: true);
                 $this->write_deployment_configurations();
                 $this->server = $this->original_server;
             }
-            if (count($this->application->ports_mappings_array) > 0) {
+            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->pull_request_id !== 0) {
                 $this->application_deployment_queue->addLogEntry("----------------------------------------");
-                $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
+                if (count($this->application->ports_mappings_array) > 0) {
+                    $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
+                }
+                if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
+                    $this->application_deployment_queue->addLogEntry("Consistent container name feature enabled, rolling update is not supported.");
+                }
+                if ($this->pull_request_id !== 0) {
+                    $this->application->settings->is_consistent_container_name_enabled = true;
+                    $this->application_deployment_queue->addLogEntry("Pull request deployment, rolling update is not supported.");
+                }
                 $this->stop_running_container(force: true);
                 $this->start_by_compose_file();
             } else {
@@ -726,26 +834,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->add_build_env_variables_to_dockerfile();
         }
         $this->build_image();
-        $this->stop_running_container();
-        if ($this->application->destination->server->isSwarm()) {
-            $this->push_to_docker_registry();
-            $this->execute_remote_command(
-                [
-                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}-{$this->pull_request_id}")
-                ],
-            );
-        } else {
-            $this->application_deployment_queue->addLogEntry("Starting preview deployment.");
-            if ($this->use_build_server) {
-                $this->execute_remote_command(
-                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
-                );
-            } else {
-                $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
-                );
-            }
-        }
+        $this->push_to_docker_registry();
+        // $this->stop_running_container();
+        $this->rolling_update();
     }
     private function create_workdir()
     {
@@ -787,10 +878,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_to_additional_destinations()
     {
-        if (str($this->application->additional_destinations)->isEmpty()) {
+        if ($this->application->additional_networks->count() === 0) {
             return;
         }
-        $destination_ids = collect(str($this->application->additional_destinations)->explode(','));
+        $destination_ids = $this->application->additional_networks->pluck('id');
         if ($this->server->isSwarm()) {
             $this->application_deployment_queue->addLogEntry("Additional destinations are not supported in swarm mode.");
             return;
@@ -815,7 +906,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 destination: $destination,
                 no_questions_asked: true,
             );
-            $this->application_deployment_queue->addLogEntry("Deploying to additional server: {$server->name}. Click here to see the deployment status: " . route('project.application.deployment.show', [
+            $this->application_deployment_queue->addLogEntry("Deployment to {$server->name}. Logs: " . route('project.application.deployment.show', [
                 'project_uuid' => data_get($this->application, 'environment.project.uuid'),
                 'application_uuid' => data_get($this->application, 'uuid'),
                 'deployment_uuid' => $deployment_uuid,
@@ -950,11 +1041,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_nixpacks_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                if (!is_null($env->real_value)) {
+                    $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                }
             }
         } else {
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                if (!is_null($env->real_value)) {
+                    $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                }
             }
         }
 
@@ -965,11 +1060,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->env_args->put($env->key, $env->real_value);
+                if (!is_null($env->real_value)) {
+                    $this->env_args->put($env->key, $env->real_value);
+                }
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->env_args->put($env->key, $env->real_value);
+                if (!is_null($env->real_value)) {
+                    $this->env_args->put($env->key, $env->real_value);
+                }
             }
         }
         $this->env_args->put('SOURCE_COMMIT', $this->commit);
@@ -1134,13 +1233,46 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         //     ];
         // }
 
-        $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
-
-        data_forget($docker_compose, 'services.' . $this->container_name);
-
-        $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
-        if (count($custom_compose) > 0) {
-            $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
+        if ($this->pull_request_id === 0) {
+            if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
+                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
+                if (count($custom_compose) > 0) {
+                    $ipv4 = data_get($custom_compose, 'ip.0');
+                    $ipv6 = data_get($custom_compose, 'ip6.0');
+                    data_forget($custom_compose, 'ip');
+                    data_forget($custom_compose, 'ip6');
+                    if ($ipv4 || $ipv6) {
+                        data_forget($docker_compose['services'][$this->container_name], 'networks');
+                    }
+                    if ($ipv4) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                    }
+                    if ($ipv6) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                    }
+                    $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
+                }
+            } else {
+                $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
+                data_forget($docker_compose, 'services.' . $this->container_name);
+                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
+                if (count($custom_compose) > 0) {
+                    $ipv4 = data_get($custom_compose, 'ip.0');
+                    $ipv6 = data_get($custom_compose, 'ip6.0');
+                    data_forget($custom_compose, 'ip');
+                    data_forget($custom_compose, 'ip6');
+                    if ($ipv4 || $ipv6) {
+                        data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                    }
+                    if ($ipv4) {
+                        $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                    }
+                    if ($ipv6) {
+                        $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                    }
+                    $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
+                }
+            }
         }
 
         $this->docker_compose = Yaml::dump($docker_compose, 10);
@@ -1416,22 +1548,27 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
             if ($this->pull_request_id === 0) {
                 $containers = $containers->filter(function ($container) {
-                    return data_get($container, 'Names') !== $this->container_name;
+                    return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== $this->container_name . '-pr-' . $this->pull_request_id;
                 });
             }
             $containers->each(function ($container) {
                 $containerName = data_get($container, 'Names');
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                    ["docker rm -f $containerName >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
                 );
             });
+            if ($this->application->settings->is_consistent_container_name_enabled) {
+                $this->execute_remote_command(
+                    ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
+                );
+            }
         } else {
             $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
             $this->application_deployment_queue->update([
                 'status' => ApplicationDeploymentStatus::FAILED->value,
             ]);
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
             );
         }
     }
@@ -1529,25 +1666,32 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             return;
         }
         if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-            // $this->deploy_to_additional_destinations();
+            if (!$this->only_this_server) {
+                $this->deploy_to_additional_destinations();
+            }
             $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 
     public function failed(Throwable $exception): void
     {
+
+        $this->next(ApplicationDeploymentStatus::FAILED->value);
         $this->application_deployment_queue->addLogEntry("Oops something is not okay, are you okay? 😢", 'stderr');
         if (str($exception->getMessage())->isNotEmpty()) {
             $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');
         }
 
         if ($this->application->build_pack !== 'dockercompose') {
-            $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
-            );
+            $code = $exception->getCode();
+            ray($code);
+            if ($code !== 69420) {
+                // 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one
+                $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
+                $this->execute_remote_command(
+                    ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true]
+                );
+            }
         }
-
-        $this->next(ApplicationDeploymentStatus::FAILED->value);
     }
 }

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -30,6 +30,9 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
+            if ($this->application->is_public_repository()) {
+                return;
+            }
             if ($this->status === ProcessStatus::CLOSED) {
                 $this->delete_comment();
                 return;

app/Jobs/ContainerStatusJob.php

@@ -5,6 +5,7 @@ namespace App\Jobs;
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
+use App\Actions\Shared\ComplexStatusCheck;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
@@ -45,6 +46,21 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         if (!$this->server->isFunctional()) {
             return 'Server is not ready.';
         };
+
+        $applications = $this->server->applications();
+        $skip_these_applications = collect([]);
+        foreach ($applications as $application) {
+            if ($application->additional_servers->count() > 0) {
+                $skip_these_applications->push($application);
+                ComplexStatusCheck::run($application);
+                $applications = $applications->filter(function ($value, $key) use ($application) {
+                    return $value->id !== $application->id;
+                });
+            }
+        }
+        $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
+            return !$skip_these_applications->pluck('id')->contains($value->id);
+        });
         try {
             if ($this->server->isSwarm()) {
                 $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
@@ -83,7 +99,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     });
                 }
             }
-            $applications = $this->server->applications();
             $databases = $this->server->databases();
             $services = $this->server->services()->get();
             $previews = $this->server->previews();
@@ -160,10 +175,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                             // Notify user that this container should not be there.
                         }
                     }
-                    if (data_get($container,'Name') === '/coolify-db') {
+                    if (data_get($container, 'Name') === '/coolify-db') {
                         $foundDatabases[] = 0;
                     }
-
                 }
                 $serviceLabelId = data_get($labels, 'coolify.serviceId');
                 if ($serviceLabelId) {
@@ -209,7 +223,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             }
             $exitedServices = $exitedServices->unique('id');
             foreach ($exitedServices as $exitedService) {
-                if ($exitedService->status === 'exited') {
+                if (str($exitedService->status)->startsWith('exited')) {
                     continue;
                 }
                 $name = data_get($exitedService, 'name');
@@ -231,7 +245,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
             foreach ($notRunningApplications as $applicationId) {
                 $application = $applications->where('id', $applicationId)->first();
-                if ($application->status === 'exited') {
+                if (str($application->status)->startsWith('exited')) {
                     continue;
                 }
                 $application->update(['status' => 'exited']);
@@ -256,7 +270,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
             foreach ($notRunningApplicationPreviews as $previewId) {
                 $preview = $previews->where('id', $previewId)->first();
-                if ($preview->status === 'exited') {
+                if (str($preview->status)->startsWith('exited')) {
                     continue;
                 }
                 $preview->update(['status' => 'exited']);
@@ -281,7 +295,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
             foreach ($notRunningDatabases as $database) {
                 $database = $databases->where('id', $database)->first();
-                if ($database->status === 'exited') {
+                if (str($database->status)->startsWith('exited')) {
                     continue;
                 }
                 $database->update(['status' => 'exited']);

app/Jobs/DatabaseBackupJob.php

@@ -51,6 +51,9 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
+        if (is_null($this->team)) {
+            return;
+        }
         if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
             $this->database = data_get($this->backup, 'database');
             $this->server = $this->database->service->server;
@@ -316,7 +319,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
-            $url = $this->database->getDbUrl(useInternal: true);
+            $url = $this->database->get_db_url(useInternal: true);
             if ($databaseWithCollections === 'all') {
                 $commands[] = "mkdir -p " . $this->backup_dir;
                 $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";

app/Jobs/DatabaseBackupStatusJob.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\Team;
+use App\Notifications\Database\DailyBackup;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class DatabaseBackupStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public function __construct()
+    {
+    }
+
+    public function handle()
+    {
+        // $teams = Team::all();
+        // foreach ($teams as $team) {
+        //     $scheduled_backups = $team->scheduledDatabaseBackups()->get();
+        //     if ($scheduled_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     foreach ($scheduled_backups as $scheduled_backup) {
+        //         $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //         if ($last_days_backups->isEmpty()) {
+        //             continue;
+        //         }
+        //         $failed = $last_days_backups->where('status', 'failed');
+        //     }
+        // }
+
+
+
+
+
+
+
+
+        // $scheduled_backups = ScheduledDatabaseBackup::all();
+        // $databases = collect();
+        // $teams = collect();
+        // foreach ($scheduled_backups as $scheduled_backup) {
+        //     $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //     if ($last_days_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     $failed = $last_days_backups->where('status', 'failed');
+        //     $database = $scheduled_backup->database;
+        //     $team = $database->team();
+        //     $teams->put($team->id, $team);
+        //     $databases->put("{$team->id}:{$database->name}", [
+        //         'failed_count' => $failed->count(),
+        //     ]);
+        // }
+        // foreach ($databases as $name => $database) {
+        //     [$team_id, $name] = explode(':', $name);
+        //     $team = $teams->get($team_id);
+        //     $team?->notify(new DailyBackup($databases));
+        // }
+    }
+}

app/Jobs/DeleteResourceJob.php

@@ -19,6 +19,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Artisan;
 
 class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -49,8 +50,11 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                     break;
             }
         } catch (\Throwable $e) {
+            ray($e->getMessage());
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
+        } finally {
+            Artisan::queue('cleanup:stucked-resources');
         }
     }
 }

app/Jobs/DockerCleanupJob.php

@@ -4,6 +4,7 @@ namespace App\Jobs;
 
 use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
+use App\Notifications\Server\DockerCleanup;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -47,8 +48,9 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
                 CleanupDocker::run($this->server);
                 $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
-                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    $this->server->team?->notify(new DockerCleanup($this->server, 'Saved ' . ($this->usageBefore - $usageAfter) . '% disk space.'));
+                    // ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    // send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
                     Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);

app/Jobs/GithubAppPermissionJob.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\GithubApp;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+
+class GithubAppPermissionJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public GithubApp $github_app)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->github_app->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->github_app->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $github_access_token = generate_github_jwt_token($this->github_app);
+            $response = Http::withHeaders([
+                'Authorization' => "Bearer $github_access_token",
+                'Accept' => 'application/vnd.github+json'
+            ])->get("{$this->github_app->api_url}/app");
+            $response = $response->json();
+            $permissions = data_get($response, 'permissions');
+            $this->github_app->contents = data_get($permissions, 'contents');
+            $this->github_app->metadata = data_get($permissions, 'metadata');
+            $this->github_app->pull_requests = data_get($permissions, 'pull_requests');
+            $this->github_app->administration = data_get($permissions, 'administration');
+            $this->github_app->save();
+            $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
+        } catch (\Throwable $e) {
+            send_internal_notification('GithubAppPermissionJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/ServerLimitCheckJob.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use App\Notifications\Server\ForceDisabled;
+use App\Notifications\Server\ForceEnabled;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerLimitCheckJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public Team $team)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->team->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->team->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $servers = $this->team->servers;
+            $servers_count = $servers->count();
+            $limit = $this->team->limits['serverLimit'];
+            $number_of_servers_to_disable = $servers_count - $limit;
+            ray('ServerLimitCheckJob', $this->team->uuid, $servers_count, $limit, $number_of_servers_to_disable);
+            if ($number_of_servers_to_disable > 0) {
+                ray('Disabling servers');
+                $servers = $servers->sortbyDesc('created_at');
+                $servers_to_disable = $servers->take($number_of_servers_to_disable);
+                $servers_to_disable->each(function ($server) {
+                    $server->forceDisableServer();
+                    $this->team->notify(new ForceDisabled($server));
+                });
+            } else if ($number_of_servers_to_disable === 0) {
+                $servers->each(function ($server) {
+                    if ($server->isForceDisabled()) {
+                        $server->forceEnableServer();
+                        $this->team->notify(new ForceEnabled($server));
+                    }
+                });
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerLimitCheckJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Jobs/ServerStatusJob.php

@@ -16,7 +16,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public ?int $disk_usage = null;
+    public int|string|null $disk_usage = null;
     public $tries = 4;
     public function backoff(): int
     {

app/Listeners/MaintenanceModeDisabledNotification.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Foundation\Events\MaintenanceModeDisabled as EventsMaintenanceModeDisabled;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
+
+class MaintenanceModeDisabledNotification
+{
+    public function __construct()
+    {
+    }
+
+    public function handle(EventsMaintenanceModeDisabled $event): void
+    {
+        ray('Maintenance mode disabled!');
+        $files = Storage::disk('webhooks-during-maintenance')->files();
+        $files = collect($files);
+        $files = $files->sort();
+        foreach ($files as $file) {
+            $content = Storage::disk('webhooks-during-maintenance')->get($file);
+            $data = json_decode($content, true);
+            $symfonyRequest = new SymfonyRequest(
+                $data['query'],
+                $data['request'],
+                $data['attributes'],
+                $data['cookies'],
+                $data['files'],
+                $data['server'],
+                $data['content']
+            );
+
+            foreach ($data['headers'] as $key => $value) {
+                $symfonyRequest->headers->set($key, $value);
+            }
+            $request = Request::createFromBase($symfonyRequest);
+            $endpoint = str($file)->after('_')->beforeLast('_')->value();
+            $class =  "App\Http\Controllers\Webhook\\" . ucfirst(str($endpoint)->before('::')->value());
+            $method = str($endpoint)->after('::')->value();
+            try {
+                $instance = new $class();
+                $instance->$method($request);
+            } catch (\Throwable $th) {
+                ray($th);
+            } finally {
+                Storage::disk('webhooks-during-maintenance')->delete($file);
+            }
+        }
+    }
+}

app/Listeners/MaintenanceModeEnabledNotification.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\MaintenanceModeEnabled;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Events\MaintenanceModeEnabled as EventsMaintenanceModeEnabled;
+use Illuminate\Queue\InteractsWithQueue;
+
+class MaintenanceModeEnabledNotification
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(EventsMaintenanceModeEnabled $event): void
+    {
+        ray('Maintenance mode enabled!');
+    }
+}

app/Livewire/Admin/Index.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Livewire\Admin;
+
+use App\Models\User;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Crypt;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $users = [];
+    public function mount()
+    {
+        if (!isCloud()) {
+            return redirect()->route('dashboard');
+        }
+        if (auth()->user()->id !== 0) {
+            return redirect()->route('dashboard');
+        }
+        $this->users = User::whereHas('teams', function ($query) {
+            $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+        })->get()->filter(function ($user) {
+            return $user->id !== 0;
+        });
+    }
+    public function switchUser(int $user_id)
+    {
+        if (auth()->user()->id !== 0) {
+            return redirect()->route('dashboard');
+        }
+        $user = User::find($user_id);
+        $team_to_switch_to = $user->teams->first();
+        Cache::forget("team:{$user->id}");
+        auth()->login($user);
+        refreshSession($team_to_switch_to);
+        return redirect(request()->header('Referer'));
+    }
+    public function render()
+    {
+        return view('livewire.admin.index');
+    }
+}

app/Livewire/Boarding/Index.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Boarding;
 
 use App\Actions\Server\InstallDocker;
+use App\Enums\ProxyTypes;
 use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
@@ -121,15 +122,16 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
         $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->validateServer();
+        $this->currentState = 'validate-server';
     }
     public function getProxyType()
     {
-        $proxyTypeSet = $this->createdServer->proxy->type;
-        if (!$proxyTypeSet) {
-            $this->currentState = 'select-proxy';
-            return;
-        }
+        $this->selectProxy(ProxyTypes::TRAEFIK_V2->value);
+        // $proxyTypeSet = $this->createdServer->proxy->type;
+        // if (!$proxyTypeSet) {
+        //     $this->currentState = 'select-proxy';
+        //     return;
+        // }
         $this->getProjects();
     }
     public function selectExistingPrivateKey()
@@ -193,7 +195,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->createdServer->settings->is_cloudflare_tunnel = $this->isCloudflareTunnel;
         $this->createdServer->settings->save();
         $this->createdServer->addInitialNetwork();
-        $this->validateServer();
+        $this->currentState = 'validate-server';
     }
     public function installServer()
     {
@@ -204,7 +206,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         try {
             config()->set('coolify.mux_enabled', false);
 
-            instant_remote_process(['uptime'], $this->createdServer, true);
+            // EC2 does not have `uptime` command, lol
+            instant_remote_process(['ls /'], $this->createdServer, true);
 
             $this->createdServer->settings()->update([
                 'is_reachable' => true,
@@ -219,7 +222,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
             if (is_null($dockerVersion)) {
-                $this->currentState = 'install-docker';
+                $this->currentState = 'validate-server';
                 throw new \Exception('Docker not found or old version is installed.');
             }
             $this->createdServer->settings()->update([
@@ -227,27 +230,10 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             ]);
             $this->getProxyType();
         } catch (\Throwable $e) {
-            // $this->dockerInstallationStarted = false;
             return handleError(error: $e, livewire: $this);
         }
     }
-    public function installDocker()
-    {
-        try {
-            $this->dockerInstallationStarted = true;
-            $activity = InstallDocker::run($this->createdServer);
-            $this->dispatch('installDocker');
-            $this->dispatch('activityMonitor', $activity->id);
-        } catch (\Throwable $e) {
-            $this->dockerInstallationStarted = false;
-            return handleError(error: $e, livewire: $this);
-        }
-    }
-    public function dockerInstalledOrSkipped()
-    {
-        $this->validateServer();
-    }
-    public function selectProxy(string|null $proxyType = null)
+    public function selectProxy(?string $proxyType = null)
     {
         if (!$proxyType) {
             return $this->getProjects();

app/Livewire/Dashboard.php

@@ -6,6 +6,7 @@ use App\Models\ApplicationDeploymentQueue;
 use App\Models\Project;
 use App\Models\Server;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Artisan;
 use Livewire\Component;
 
 class Dashboard extends Component
@@ -19,6 +20,13 @@ class Dashboard extends Component
         $this->projects = Project::ownedByCurrentTeam()->get();
         $this->get_deployments();
     }
+    public function cleanup_queue()
+    {
+        $this->dispatch('success', 'Cleanup started.');
+        Artisan::queue('cleanup:application-deployment-queue', [
+            '--team-id' => currentTeam()->id
+        ]);
+    }
     public function get_deployments()
     {
         $this->deployments_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn("server_id", $this->servers->pluck("id"))->get([

app/Livewire/Help.php

@@ -2,8 +2,10 @@
 
 namespace App\Livewire;
 
+use App\Models\InstanceSettings;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 
@@ -28,9 +30,8 @@ class Help extends Component
     public function submit()
     {
         try {
-            $this->rateLimit(3, 60);
+            $this->rateLimit(3, 30);
             $this->validate();
-            $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
             $debug = "Route: {$this->path}";
             $mail = new MailMessage();
             $mail->view(
@@ -40,9 +41,21 @@ class Help extends Component
                     'debug' => $debug
                 ]
             );
-            $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
-            send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
-            $this->dispatch('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
+            $mail->subject("[HELP]: {$this->subject}");
+            $settings = InstanceSettings::get();
+            $type = set_transanctional_email_settings($settings);
+            if (!$type) {
+                $url = "https://app.coolify.io/api/feedback";
+                if (isDev()) {
+                    $url = "http://localhost:80/api/feedback";
+                }
+                Http::post($url, [
+                    'content' => "User: `" . auth()->user()?->email . "` with subject: `" . $this->subject . "` has the following problem: `" . $this->description . "`"
+                ]);
+            } else {
+                send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
+            }
+            $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/LayoutPopups.php

@@ -4,7 +4,7 @@ namespace App\Livewire;
 
 use Livewire\Component;
 
-class Sponsorship extends Component
+class LayoutPopups extends Component
 {
     public function getListeners()
     {
@@ -23,6 +23,6 @@ class Sponsorship extends Component
     }
     public function render()
     {
-        return view('livewire.sponsorship');
+        return view('livewire.layout-popups');
     }
 }

app/Livewire/Notifications/EmailSettings.php

@@ -63,7 +63,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -71,7 +71,7 @@ class EmailSettings extends Component
     public function sendTestNotification()
     {
         $this->team?->notify(new Test($this->emails));
-        $this->dispatch('success', 'Test Email sent successfully.');
+        $this->dispatch('success', 'Test Email sent.');
     }
     public function instantSaveInstance()
     {
@@ -83,7 +83,7 @@ class EmailSettings extends Component
             $this->team->resend_enabled = false;
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -131,7 +131,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return handleError($e, $this);
@@ -148,7 +148,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             $this->team->resend_enabled = false;
             return handleError($e, $this);

app/Livewire/Profile/Index.php

@@ -27,7 +27,7 @@ class Index extends Component
                 'name' => $this->name,
             ]);
 
-            $this->dispatch('success', 'Profile updated successfully.');
+            $this->dispatch('success', 'Profile updated');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Application/Advanced.php

@@ -8,20 +8,31 @@ use Livewire\Component;
 class Advanced extends Component
 {
     public Application $application;
+    public bool $is_force_https_enabled;
+    public bool $is_gzip_enabled;
+    public bool $is_stripprefix_enabled;
     protected $rules = [
         'application.settings.is_git_submodules_enabled' => 'boolean|required',
         'application.settings.is_git_lfs_enabled' => 'boolean|required',
         'application.settings.is_preview_deployments_enabled' => 'boolean|required',
         'application.settings.is_auto_deploy_enabled' => 'boolean|required',
-        'application.settings.is_force_https_enabled' => 'boolean|required',
+        'is_force_https_enabled' => 'boolean|required',
         'application.settings.is_log_drain_enabled' => 'boolean|required',
         'application.settings.is_gpu_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
+        'application.settings.is_consistent_container_name_enabled' => 'boolean|required',
+        'application.settings.is_gzip_enabled' => 'boolean|required',
+        'application.settings.is_stripprefix_enabled' => 'boolean|required',
         'application.settings.gpu_driver' => 'string|required',
         'application.settings.gpu_count' => 'string|required',
         'application.settings.gpu_device_ids' => 'string|required',
         'application.settings.gpu_options' => 'string|required',
     ];
+    public function mount() {
+        $this->is_force_https_enabled = $this->application->isForceHttpsEnabled();
+        $this->is_gzip_enabled = $this->application->isGzipEnabled();
+        $this->is_stripprefix_enabled = $this->application->isStripprefixEnabled();
+    }
     public function instantSave()
     {
         if ($this->application->isLogDrainEnabled()) {
@@ -31,7 +42,16 @@ class Advanced extends Component
                 return;
             }
         }
-        if ($this->application->settings->is_force_https_enabled) {
+        if ($this->application->settings->is_force_https_enabled !== $this->is_force_https_enabled) {
+            $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
+        if ($this->application->settings->is_gzip_enabled !== $this->is_gzip_enabled) {
+            $this->application->settings->is_gzip_enabled = $this->is_gzip_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
+        if ($this->application->settings->is_stripprefix_enabled !== $this->is_stripprefix_enabled) {
+            $this->application->settings->is_stripprefix_enabled = $this->is_stripprefix_enabled;
             $this->dispatch('resetDefaultLabels', false);
         }
         $this->application->settings->save();

app/Livewire/Project/Application/Configuration.php

@@ -10,7 +10,7 @@ class Configuration extends Component
 {
     public Application $application;
     public $servers;
-    protected $listeners = ['build_pack_updated' => '$refresh'];
+    protected $listeners = ['buildPackUpdated' => '$refresh'];
 
     public function mount()
     {

app/Livewire/Project/Application/DeploymentNavbar.php

@@ -48,6 +48,8 @@ class DeploymentNavbar extends Component
     {
         try {
             $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
+            $server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
+            $server = Server::find($server_id);
             if ($this->application_deployment_queue->logs) {
                 $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
 
@@ -63,8 +65,8 @@ class DeploymentNavbar extends Component
                 $this->application_deployment_queue->update([
                     'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
                 ]);
-                instant_remote_process([$kill_command], $this->server);
             }
+            instant_remote_process([$kill_command], $server);
         } catch (\Throwable $e) {
             ray($e);
             return handleError($e, $this);

app/Livewire/Project/Application/General.php

@@ -126,7 +126,6 @@ class General extends Component
             $this->application->save();
         }
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
-        $this->checkLabelUpdates();
     }
     public function instantSave()
     {
@@ -164,6 +163,7 @@ class General extends Component
         }
         return $domain;
     }
+
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
@@ -182,17 +182,8 @@ class General extends Component
             $this->resetDefaultLabels(false);
         }
         $this->submit();
-        $this->dispatch('build_pack_updated');
+        $this->dispatch('buildPackUpdated');
     }
-    public function checkLabelUpdates()
-    {
-        if (md5($this->application->custom_labels) !== md5(implode("|", generateLabelsApplication($this->application)))) {
-            $this->labelsChanged = true;
-        } else {
-            $this->labelsChanged = false;
-        }
-    }
-
     public function getWildcardDomain()
     {
         $server = data_get($this->application, 'destination.server');
@@ -212,6 +203,13 @@ class General extends Component
 
     public function updatedApplicationFqdn()
     {
+        $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+        $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
+        $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+            return str($domain)->trim()->lower();
+        });
+        $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+        $this->application->save();
         $this->resetDefaultLabels(false);
         // $this->dispatch('success', 'Labels reset to default!');
     }
@@ -234,24 +232,20 @@ class General extends Component
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
-                    'application.docker_registry_image_tag' => 'required',
                 ]);
             }
             if (data_get($this->application, 'fqdn')) {
-                $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
-                $domains = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return str($domain)->trim()->lower();
-                });
-                $domains = $domains->unique();
-                foreach ($domains as $domain) {
-                    if (!validate_dns_entry($domain, $this->application->destination->server)) {
-                        $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.","Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                $domains = str($this->application->fqdn)->trim()->explode(',');
+                if ($this->application->additional_servers->count() === 0) {
+                    foreach ($domains as $domain) {
+                        if (!validate_dns_entry($domain, $this->application->destination->server)) {
+                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                        }
                     }
                 }
                 check_fqdn_usage($this->application);
                 $this->application->fqdn = $domains->implode(',');
             }
-
             if (data_get($this->application, 'custom_docker_run_options')) {
                 $this->application->custom_docker_run_options = str($this->application->custom_docker_run_options)->trim();
             }
@@ -269,7 +263,11 @@ class General extends Component
             }
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-                $this->parsedServices = $this->application->parseCompose();
+                if ($this->application->settings->is_raw_compose_deployment_enabled) {
+                    $this->application->parseRawCompose();
+                } else {
+                    $this->parsedServices = $this->application->parseCompose();
+                }
             }
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
@@ -277,7 +275,6 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {
-            $this->checkLabelUpdates();
             $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         }
     }

app/Livewire/Project/Application/Heading.php

@@ -3,6 +3,8 @@
 namespace App\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
+use App\Events\ApplicationStatusChanged;
+use App\Jobs\ComplexContainerStatusJob;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\Application;
@@ -31,14 +33,11 @@ class Heading extends Component
     {
         if ($this->application->destination->server->isFunctional()) {
             dispatch(new ContainerStatusJob($this->application->destination->server));
-            $this->application->refresh();
-            $this->application->previews->each(function ($preview) {
-                $preview->refresh();
-            });
         } else {
             dispatch(new ServerStatusJob($this->application->destination->server));
         }
-        if ($showNotification) $this->dispatch('success', "Application status updated.");
+
+        if ($showNotification) $this->dispatch('success', "Success", "Application status updated.");
     }
 
     public function force_deploy_without_cache()
@@ -49,15 +48,19 @@ class Heading extends Component
     public function deploy(bool $force_rebuild = false)
     {
         if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
-            $this->dispatch('error', 'Please load a Compose file first.');
+            $this->dispatch('error', 'Failed to deploy', 'Please load a Compose file first.');
             return;
         }
-        if ($this->application->destination->server->isSwarm() && is_null($this->application->docker_registry_image_name)) {
-            $this->dispatch('error', 'To deploy to a Swarm cluster you must set a Docker image name first.');
+        if ($this->application->destination->server->isSwarm() && str($this->application->docker_registry_image_name)->isEmpty()) {
+            $this->dispatch('error', 'Failed to deploy.', 'To deploy to a Swarm cluster you must set a Docker image name first.');
             return;
         }
-        if (data_get($this->application, 'settings.is_build_server_enabled') && is_null($this->application->docker_registry_image_name)) {
-            $this->dispatch('error', 'To use a build server you must set a Docker image name first.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
+        if (data_get($this->application, 'settings.is_build_server_enabled') && str($this->application->docker_registry_image_name)->isEmpty()) {
+            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
+            return;
+        }
+        if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();
@@ -85,26 +88,20 @@ class Heading extends Component
         StopApplication::run($this->application);
         $this->application->status = 'exited';
         $this->application->save();
-        $this->application->refresh();
-    }
-    public function restartNew()
-    {
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application: $this->application,
-            deployment_uuid: $this->deploymentUuid,
-            restart_only: true,
-            is_new_deployment: true,
-        );
-        return redirect()->route('project.application.deployment.show', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
+        if ($this->application->additional_servers->count() > 0) {
+            $this->application->additional_servers->each(function ($server) {
+                $server->pivot->status = "exited:unhealthy";
+                $server->pivot->save();
+            });
+        }
+        ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
     }
     public function restart()
     {
+        if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
+            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            return;
+        }
         $this->setDeploymentUuid();
         queue_application_deployment(
             application: $this->application,

app/Livewire/Project/Application/Preview/Form.php

@@ -46,7 +46,7 @@ class Form extends Component
         $this->validate();
         $this->application->preview_url_template = str_replace(' ', '', $this->application->preview_url_template);
         $this->application->save();
-        $this->dispatch('success', 'Preview url template updated successfully.');
+        $this->dispatch('success', 'Preview url template updated.');
         $this->generate_real_url();
     }
 }

app/Livewire/Project/Database/BackupExecutions.php

@@ -33,7 +33,7 @@ class BackupExecutions extends Component
             delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
         }
         $execution->delete();
-        $this->dispatch('success', 'Backup deleted successfully.');
+        $this->dispatch('success', 'Backup deleted.');
         $this->dispatch('refreshBackupExecutions');
     }
     public function download($exeuctionId)

app/Livewire/Project/Database/Import.php

@@ -29,8 +29,8 @@ class Import extends Component
     public string $container;
     public array $importCommands = [];
     public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
-    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p $MYSQL_PASSWORD $MYSQL_DATABASE';
-    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p $MARIADB_PASSWORD $MARIADB_DATABASE';
+    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
+    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
 
     public function getListeners()
     {

app/Livewire/Project/Database/Mariadb/General.php

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -59,7 +59,7 @@ class General extends Component
                 return;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
@@ -73,7 +73,7 @@ class General extends Component
             }
             $this->validate();
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }
@@ -93,7 +93,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Mongodb/General.php

@@ -44,9 +44,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -58,7 +58,7 @@ class General extends Component
                 return;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
@@ -75,7 +75,7 @@ class General extends Component
             }
             $this->validate();
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }
@@ -95,7 +95,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Mysql/General.php

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -60,7 +60,7 @@ class General extends Component
                 return;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
@@ -74,7 +74,7 @@ class General extends Component
             }
             $this->validate();
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }
@@ -94,7 +94,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Postgresql/General.php

@@ -53,9 +53,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -66,7 +66,7 @@ class General extends Component
                 return;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
@@ -87,7 +87,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
@@ -105,7 +105,7 @@ class General extends Component
         $this->database->init_scripts = filter($this->database->init_scripts, fn ($s) => $s['filename'] !== $script['filename']);
         $this->database->init_scripts = array_merge($this->database->init_scripts, [$script]);
         $this->database->save();
-        $this->dispatch('success', 'Init script saved successfully.');
+        $this->dispatch('success', 'Init script saved.');
     }
 
     public function delete_init_script($script)
@@ -116,7 +116,7 @@ class General extends Component
             $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
             $this->database->save();
             $this->refresh();
-            $this->dispatch('success', 'Init script deleted successfully.');
+            $this->dispatch('success', 'Init script deleted.');
             return;
         }
     }
@@ -148,7 +148,7 @@ class General extends Component
             ]
         ]);
         $this->database->save();
-        $this->dispatch('success', 'Init script added successfully.');
+        $this->dispatch('success', 'Init script added.');
         $this->new_content = '';
         $this->new_filename = '';
     }
@@ -161,7 +161,7 @@ class General extends Component
             }
             $this->validate();
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Database/Redis/General.php

@@ -39,9 +39,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -52,7 +52,7 @@ class General extends Component
                 return;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
@@ -66,7 +66,7 @@ class General extends Component
                 $this->database->redis_conf = null;
             }
             $this->database->save();
-            $this->dispatch('success', 'Database updated successfully.');
+            $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }
@@ -86,7 +86,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/ScheduledBackups.php

@@ -38,7 +38,7 @@ class ScheduledBackups extends Component
     public function delete($scheduled_backup_id): void
     {
         $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
-        $this->dispatch('success', 'Scheduled backup deleted successfully.');
+        $this->dispatch('success', 'Scheduled backup deleted.');
         $this->refreshScheduledBackups();
     }
 

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -79,7 +79,10 @@ class GithubPrivateRepository extends Component
                 $this->loadRepositoryByPage();
             }
         }
-        $this->selected_repository_id = $this->repositories[0]['id'];
+        $this->repositories = $this->repositories->sortBy('name');
+        if ($this->repositories->count() > 0) {
+            $this->selected_repository_id = data_get($this->repositories->first(), 'id');
+        }
         $this->current_step = 'repository';
     }
 

app/Livewire/Project/New/Select.php

@@ -71,10 +71,10 @@ class Select extends Component
     //     }
     // }
 
-    public function loadServices()
+    public function loadServices(bool $force = false)
     {
         try {
-            if (count($this->allServices) > 0) {
+            if (count($this->allServices) > 0 && !$force) {
                 if (!$this->search) {
                     $this->services = $this->allServices;
                     return;

app/Livewire/Project/Resource/Create.php

@@ -10,7 +10,8 @@ use Livewire\Component;
 class Create extends Component
 {
     public $type;
-    public function mount() {
+    public function mount()
+    {
         $services = getServiceTemplates();
         $type = str(request()->query('type'));
         $destination_uuid = request()->query('destination');
@@ -70,7 +71,7 @@ class Create extends Component
                         $generatedValue = $value;
                         if ($value->contains('SERVICE_')) {
                             $command = $value->after('SERVICE_')->beforeLast('_');
-                            $generatedValue = generateEnvValue($command->value());
+                            $generatedValue = generateEnvValue($command->value(), $service);
                         }
                         EnvironmentVariable::create([
                             'key' => $key,

app/Livewire/Project/Resource/Index.php

@@ -29,7 +29,8 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
-        $this->applications = $environment->applications->load(['tags']);
+
+        $this->applications = $this->environment->applications->load(['tags']);
         $this->applications = $this->applications->map(function ($application) {
             if (data_get($application, 'environment.project.uuid')) {
                 $application->hrefLink = route('project.application.configuration', [
@@ -40,8 +41,7 @@ class Index extends Component
             }
             return $application;
         });
-        ray($this->applications);
-        $this->postgresqls = $environment->postgresqls->load(['tags'])->sortBy('name');
+        $this->postgresqls = $this->environment->postgresqls->load(['tags'])->sortBy('name');
         $this->postgresqls = $this->postgresqls->map(function ($postgresql) {
             if (data_get($postgresql, 'environment.project.uuid')) {
                 $postgresql->hrefLink = route('project.database.configuration', [
@@ -52,7 +52,7 @@ class Index extends Component
             }
             return $postgresql;
         });
-        $this->redis = $environment->redis->load(['tags'])->sortBy('name');
+        $this->redis = $this->environment->redis->load(['tags'])->sortBy('name');
         $this->redis = $this->redis->map(function ($redis) {
             if (data_get($redis, 'environment.project.uuid')) {
                 $redis->hrefLink = route('project.database.configuration', [
@@ -63,7 +63,7 @@ class Index extends Component
             }
             return $redis;
         });
-        $this->mongodbs = $environment->mongodbs->load(['tags'])->sortBy('name');
+        $this->mongodbs = $this->environment->mongodbs->load(['tags'])->sortBy('name');
         $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
             if (data_get($mongodb, 'environment.project.uuid')) {
                 $mongodb->hrefLink = route('project.database.configuration', [
@@ -74,7 +74,7 @@ class Index extends Component
             }
             return $mongodb;
         });
-        $this->mysqls = $environment->mysqls->load(['tags'])->sortBy('name');
+        $this->mysqls = $this->environment->mysqls->load(['tags'])->sortBy('name');
         $this->mysqls = $this->mysqls->map(function ($mysql) {
             if (data_get($mysql, 'environment.project.uuid')) {
                 $mysql->hrefLink = route('project.database.configuration', [
@@ -85,7 +85,7 @@ class Index extends Component
             }
             return $mysql;
         });
-        $this->mariadbs = $environment->mariadbs->load(['tags'])->sortBy('name');
+        $this->mariadbs = $this->environment->mariadbs->load(['tags'])->sortBy('name');
         $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
             if (data_get($mariadb, 'environment.project.uuid')) {
                 $mariadb->hrefLink = route('project.database.configuration', [
@@ -96,7 +96,7 @@ class Index extends Component
             }
             return $mariadb;
         });
-        $this->services = $environment->services->load(['tags'])->sortBy('name');
+        $this->services = $this->environment->services->load(['tags'])->sortBy('name');
         $this->services = $this->services->map(function ($service) {
             if (data_get($service, 'environment.project.uuid')) {
                 $service->hrefLink = route('project.service.configuration', [
@@ -104,7 +104,7 @@ class Index extends Component
                     'environment_name' => data_get($service, 'environment.name'),
                     'service_uuid' => data_get($service, 'uuid')
                 ]);
-                $service->status = serviceStatus($service);
+                $service->status = $service->status();
             }
             return $service;
         });

app/Livewire/Project/Service/Configuration.php

@@ -17,9 +17,8 @@ class Configuration extends Component
     {
         $userId = auth()->user()->id;
         return [
-            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
-            "refreshStacks",
-            "checkStatus",
+            "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status',
+            "check_status"
         ];
     }
     public function render()
@@ -37,21 +36,10 @@ class Configuration extends Component
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
-    public function checkStatus()
+    public function check_status()
     {
         dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->refreshStacks();
+        $this->dispatch('refresh')->self();
         $this->dispatch('serviceStatusChanged');
     }
-    public function refreshStacks()
-    {
-        $this->applications = $this->service->applications->sort();
-        $this->applications->each(function ($application) {
-            $application->refresh();
-        });
-        $this->databases = $this->service->databases->sort();
-        $this->databases->each(function ($database) {
-            $database->refresh();
-        });
-    }
 }

app/Livewire/Project/Service/Database.php

@@ -77,7 +77,7 @@ class Database extends Component
             $this->validate();
             $this->database->save();
             updateCompose($this->database);
-            $this->dispatch('success', 'Database saved successfully.');
+            $this->dispatch('success', 'Database saved.');
         } catch (\Throwable $e) {
             ray($e);
         } finally {

app/Livewire/Project/Service/FileStorage.php

@@ -41,8 +41,8 @@ class FileStorage extends Component
                 $this->fileStorage->content = null;
             }
             $this->fileStorage->save();
-            $this->fileStorage->saveStorageOnServer($this->service);
-            $this->dispatch('success', 'File updated successfully.');
+            $this->fileStorage->saveStorageOnServer();
+            $this->dispatch('success', 'File updated.');
         } catch (\Throwable $e) {
             $this->fileStorage->setRawAttributes($original);
             $this->fileStorage->save();

app/Livewire/Project/Service/Index.php

@@ -27,12 +27,12 @@ class Index extends Component
             $this->parameters = get_route_parameters();
             $this->query = request()->query();
             $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            $service = $this->service->applications()->whereUuid($this->parameters['stack_service_uuid'])->first();
             if ($service) {
                 $this->serviceApplication = $service;
                 $this->serviceApplication->getFilesFromServer();
             } else {
-                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase = $this->service->databases()->whereUuid($this->parameters['stack_service_uuid'])->first();
                 $this->serviceDatabase->getFilesFromServer();
             }
             $this->s3s = currentTeam()->s3s;

app/Livewire/Project/Service/Navbar.php

@@ -6,7 +6,6 @@ use App\Actions\Shared\PullImage;
 use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
 use App\Events\ServiceStatusChanged;
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
@@ -17,7 +16,24 @@ class Navbar extends Component
     public array $parameters;
     public array $query;
     public $isDeploymentProgress = false;
-
+    public function getListeners()
+    {
+        return [
+            "serviceStatusChanged"
+        ];
+    }
+    public function serviceStatusChanged()
+    {
+        $this->dispatch('refresh')->self();
+    }
+    public function check_status() {
+        $this->dispatch('check_status');
+        $this->dispatch('success', 'Service status updated.');
+    }
+    public function render()
+    {
+        return view('livewire.project.service.navbar');
+    }
     public function checkDeployments()
     {
         $activity = Activity::where('properties->type_uuid', $this->service->uuid)->latest()->first();
@@ -28,26 +44,6 @@ class Navbar extends Component
             $this->isDeploymentProgress = false;
         }
     }
-    public function getListeners()
-    {
-        return [
-            "serviceStatusChanged"
-        ];
-    }
-    public function serviceStatusChanged()
-    {
-        $this->service->refresh();
-    }
-    public function render()
-    {
-        return view('livewire.project.service.navbar');
-    }
-    public function check_status($showNotification = false)
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->destination->server));
-        $this->service->refresh();
-        if ($showNotification) $this->dispatch('success', 'Service status updated.');
-    }
     public function deploy()
     {
         $this->checkDeployments();
@@ -62,11 +58,10 @@ class Navbar extends Component
     public function stop(bool $forceCleanup = false)
     {
         StopService::run($this->service);
-        $this->service->refresh();
         if ($forceCleanup) {
-            $this->dispatch('success', 'Force cleanup service successfully.');
+            $this->dispatch('success', 'Containers cleaned up.');
         } else {
-            $this->dispatch('success', 'Service stopped successfully.');
+            $this->dispatch('success', 'Service stopped.');
         }
         ServiceStatusChanged::dispatch();
     }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -17,6 +17,8 @@ class ServiceApplicationView extends Component
         'application.exclude_from_status' => 'required|boolean',
         'application.required_fqdn' => 'required|boolean',
         'application.is_log_drain_enabled' => 'nullable|boolean',
+        'application.is_gzip_enabled' => 'nullable|boolean',
+        'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
     public function render()
     {
@@ -40,7 +42,7 @@ class ServiceApplicationView extends Component
     {
         try {
             $this->application->delete();
-            $this->dispatch('success', 'Application deleted successfully.');
+            $this->dispatch('success', 'Application deleted.');
             return redirect()->route('project.service.configuration', $this->parameters);
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -57,7 +59,7 @@ class ServiceApplicationView extends Component
             $this->validate();
             $this->application->save();
             updateCompose($this->application);
-            $this->dispatch('success', 'Application saved successfully.');
+            $this->dispatch('success', 'Application saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Livewire/Project/Service/StackForm.php

@@ -45,8 +45,10 @@ class StackForm extends Component
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
-    public function instantSave() {
+    public function instantSave()
+    {
         $this->service->save();
+        $this->dispatch('success', 'Service  settings saved.');
     }
 
     public function submit()
@@ -60,7 +62,7 @@ class StackForm extends Component
             $this->service->saveComposeConfigs();
             $this->dispatch('refreshStacks');
             $this->dispatch('refreshEnvs');
-            $this->dispatch('success', 'Service saved successfully.');
+            $this->dispatch('success', 'Service saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/Destination.php

@@ -2,11 +2,115 @@
 
 namespace App\Livewire\Project\Shared;
 
+use App\Actions\Application\StopApplicationOneServer;
+use App\Events\ApplicationStatusChanged;
+use App\Jobs\ContainerStatusJob;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class Destination extends Component
 {
     public $resource;
-    public $servers = [];
-    public $additional_servers = [];
+    public $networks = [];
+
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+        return [
+            "echo-private:team.{$teamId},ApplicationStatusChanged" => 'loadData',
+        ];
+    }
+    public function mount()
+    {
+        $this->loadData();
+    }
+    public function loadData()
+    {
+        $all_networks = collect([]);
+        $all_networks = $all_networks->push($this->resource->destination);
+        $all_networks = $all_networks->merge($this->resource->additional_networks);
+
+        $this->networks = Server::isUsable()->get()->map(function ($server) {
+            return $server->standaloneDockers;
+        })->flatten();
+        $this->networks = $this->networks->reject(function ($network) use ($all_networks) {
+            return $all_networks->pluck('id')->contains($network->id);
+        });
+        $this->networks = $this->networks->reject(function ($network) {
+            return $this->resource->destination->server->id == $network->server->id;
+        });
+        if ($this->resource?->additional_servers?->count() > 0) {
+            $this->networks = $this->networks->reject(function ($network) {
+                return $this->resource->additional_servers->pluck('id')->contains($network->server->id);
+            });
+        }
+    }
+    public function stop(int $server_id)
+    {
+        $server = Server::find($server_id);
+        StopApplicationOneServer::run($this->resource, $server);
+        $this->refreshServers();
+    }
+    public function redeploy(int $network_id, int $server_id)
+    {
+        if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            return;
+        }
+        $deployment_uuid = new Cuid2(7);
+        $server = Server::find($server_id);
+        $destination = StandaloneDocker::find($network_id);
+        queue_application_deployment(
+            deployment_uuid: $deployment_uuid,
+            application: $this->resource,
+            server: $server,
+            destination: $destination,
+            only_this_server: true,
+            no_questions_asked: true,
+        );
+        return redirect()->route('project.application.deployment.show', [
+            'project_uuid' => data_get($this->resource, 'environment.project.uuid'),
+            'application_uuid' => data_get($this->resource, 'uuid'),
+            'deployment_uuid' => $deployment_uuid,
+            'environment_name' => data_get($this->resource, 'environment.name'),
+        ]);
+    }
+    public function promote(int $network_id, int $server_id)
+    {
+        $main_destination = $this->resource->destination;
+        $this->resource->update([
+            'destination_id' => $network_id,
+            'destination_type' => StandaloneDocker::class,
+        ]);
+        $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+        $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
+        $this->refreshServers();
+    }
+    public function refreshServers()
+    {
+        ContainerStatusJob::dispatchSync($this->resource->destination->server);
+        $this->loadData();
+        $this->dispatch('refresh');
+        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+    }
+    public function addServer(int $network_id, int $server_id)
+    {
+        $this->resource->additional_networks()->attach($network_id, ['server_id' => $server_id]);
+        $this->loadData();
+        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+    }
+    public function removeServer(int $network_id, int $server_id)
+    {
+        if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
+            $this->dispatch('error', 'You cannot remove this destination server.', 'You are trying to remove the main server.');
+            return;
+        }
+        $server = Server::find($server_id);
+        StopApplicationOneServer::run($this->resource, $server);
+        $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+        $this->loadData();
+        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+    }
 }

app/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -120,9 +120,9 @@ class All extends Component
             }
         }
         if ($isPreview) {
-            $this->dispatch('success', 'Preview environment variables updated successfully.');
+            $this->dispatch('success', 'Preview environment variables updated.');
         } else {
-            $this->dispatch('success', 'Environment variables updated successfully.');
+            $this->dispatch('success', 'Environment variables updated.');
         }
         $this->refreshEnvs();
     }
@@ -171,7 +171,7 @@ class All extends Component
             }
             $environment->save();
             $this->refreshEnvs();
-            $this->dispatch('success', 'Environment variable added successfully.');
+            $this->dispatch('success', 'Environment variable added.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -90,7 +90,7 @@ class Show extends Component
             }
             $this->serialize();
             $this->env->save();
-            $this->dispatch('success', 'Environment variable updated successfully.');
+            $this->dispatch('success', 'Environment variable updated.');
             $this->dispatch('refreshEnvs');
         } catch (\Exception $e) {
             return handleError($e);

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -10,29 +10,21 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
 {
     public string $command;
     public string $container;
-    public $containers;
+    public Collection $containers;
     public $parameters;
     public $resource;
     public string $type;
     public string $workDir = '';
     public Server $server;
-    public $servers = [];
-    public function getListeners()
-    {
-        return [
-            "serviceStatusChanged",
-        ];
-    }
-    public function serviceStatusChanged()
-    {
-        $this->getContainers();
-    }
+    public Collection $servers;
+
     protected $rules = [
         'server' => 'required',
         'container' => 'required',
@@ -43,20 +35,18 @@ class ExecuteContainerCommand extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->getContainers();
-    }
-    public function getContainers()
-    {
         $this->containers = collect();
+        $this->servers = collect();
         if (data_get($this->parameters, 'application_uuid')) {
             $this->type = 'application';
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
-            if ($containers->count() > 0) {
-                $containers->each(function ($container) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
-                });
+            if ($this->resource->destination->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->destination->server);
+            }
+            foreach ($this->resource->additional_servers as $server) {
+                if ($server->isFunctional()) {
+                    $this->servers = $this->servers->push($server);
+                }
             }
         } else if (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
@@ -77,44 +67,85 @@ class ExecuteContainerCommand extends Component
                 }
             }
             $this->resource = $resource;
-            $this->server = $this->resource->destination->server;
+            if ($this->resource->destination->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->destination->server);
+            }
             $this->container = $this->resource->uuid;
-            // if (!str(data_get($this,'resource.status'))->startsWith('exited')) {
-                $this->containers->push($this->container);
-            // }
+            $this->containers->push($this->container);
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                // if (str(data_get($application, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
             $this->resource->databases()->get()->each(function ($database) {
-                // if (str(data_get($database, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
-
-            $this->server = $this->resource->server;
+            if ($this->resource->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->server);
+            }
         }
         if ($this->containers->count() > 0) {
             $this->container = $this->containers->first();
         }
     }
+    public function loadContainers()
+    {
+        foreach ($this->servers as $server) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                if ($server->isSwarm()) {
+                    $containers = collect([
+                        [
+                            'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
+                        ]
+                    ]);
+                } else {
+                    $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
+                }
+                foreach ($containers as $container) {
+                    $payload = [
+                        'server' => $server,
+                        'container' => $container,
+                    ];
+                    $this->containers = $this->containers->push($payload);
+                }
+            } 
+        }
+        if ($this->containers->count() > 0) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->container = data_get($this->containers->first(), 'container.Names');
+            } elseif (data_get($this->parameters, 'database_uuid')) {
+                $this->container = $this->containers->first();
+            } elseif (data_get($this->parameters, 'service_uuid')) {
+                $this->container = $this->containers->first();
+            }
+        }
+    }
 
     public function runCommand()
     {
-        $this->validate();
         try {
-            // Wrap command to prevent escaped execution in the host.
+            if (data_get($this->parameters, 'application_uuid')) {
+                $container = $this->containers->where('container.Names', $this->container)->first();
+                $container_name = data_get($container, 'container.Names');
+                if (is_null($container)) {
+                    throw new \RuntimeException('Container not found.');
+                }
+                $server = data_get($container, 'server');
+            } else {
+                $container_name = $this->container;
+                $server = $this->servers->first();
+            }
+            if ($server->isForceDisabled()) {
+                throw new \RuntimeException('Server is disabled.');
+            }
             $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
-                $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
+                $exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}";
             } else {
-                $exec = "docker exec {$this->container} {$cmd}";
+                $exec = "docker exec {$container_name} {$cmd}";
             }
-            $activity = remote_process([$exec], $this->server, ignore_errors: true);
+            $activity = remote_process([$exec], $server, ignore_errors: true);
             $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Project/Shared/GetLogs.php

@@ -23,6 +23,7 @@ class GetLogs extends Component
     public ServiceApplication|ServiceDatabase|null $servicesubtype = null;
     public Server $server;
     public ?string $container = null;
+    public ?string $pull_request = null;
     public ?bool $streamLogs = false;
     public ?bool $showTimeStamps = true;
     public int $numberOfLines = 100;
@@ -70,7 +71,14 @@ class GetLogs extends Component
     }
     public function getLogs($refresh = false)
     {
-        if (!$refresh && $this->resource?->getMorphClass() === 'App\Models\Service') return;
+        if ($this->resource?->getMorphClass() === 'App\Models\Application') {
+            if (str($this->container)->contains('-pr-')) {
+                $this->pull_request = "Pull Request: " . str($this->container)->afterLast('-pr-')->beforeLast('_')->value();
+            } else {
+                $this->pull_request = 'branch';
+            }
+        }
+        if (!$refresh && ($this->resource?->getMorphClass() === 'App\Models\Service' || str($this->container)->contains('-pr-'))) return;
         if ($this->container) {
             if ($this->showTimeStamps) {
                 if ($this->server->isSwarm()) {

app/Livewire/Project/Shared/Logs.php

@@ -10,84 +10,99 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Logs extends Component
 {
     public ?string $type = null;
     public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
-    public Server $server;
+    public Collection $servers;
+    public Collection $containers;
     public $container = [];
-    public $containers;
     public $parameters;
     public $query;
     public $status;
     public $serviceSubType;
 
-    public function mount()
+    public function loadContainers($server_id)
     {
-        $this->containers = collect();
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        if (data_get($this->parameters, 'application_uuid')) {
-            $this->type = 'application';
-            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            if ($this->server->isSwarm()) {
+        try {
+            $server = $this->servers->firstWhere('id', $server_id);
+            if ($server->isSwarm()) {
                 $containers = collect([
                     [
                         'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
                     ]
                 ]);
             } else {
-                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+                $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
             }
-            if ($containers->count() > 0) {
-                $containers->each(function ($container) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
-                });
-            }
-        } else if (data_get($this->parameters, 'database_uuid')) {
-            $this->type = 'database';
-            $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
-            if (is_null($resource)) {
-                $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+            $server->containers = $containers;
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        try {
+            $this->containers = collect();
+            $this->servers = collect();
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->type = 'application';
+                $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
+                }
+                foreach ($this->resource->additional_servers as $server) {
+                    if ($server->isFunctional()) {
+                        $this->servers = $this->servers->push($server);
+                    }
+                }
+            } else if (data_get($this->parameters, 'database_uuid')) {
+                $this->type = 'database';
+                $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
                 if (is_null($resource)) {
-                    $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                    $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
                     if (is_null($resource)) {
-                        $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                        $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
                         if (is_null($resource)) {
-                            $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                            $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
                             if (is_null($resource)) {
-                                abort(404);
+                                $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                                if (is_null($resource)) {
+                                    abort(404);
+                                }
                             }
                         }
                     }
                 }
-            }
-            $this->resource = $resource;
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            $this->container = $this->resource->uuid;
-            // if (str(data_get($this, 'resource.status'))->startsWith('running')) {
+                $this->resource = $resource;
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
+                }
+                $this->container = $this->resource->uuid;
                 $this->containers->push($this->container);
-            // }
-        } else if (data_get($this->parameters, 'service_uuid')) {
-            $this->type = 'service';
-            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-            $this->resource->applications()->get()->each(function ($application) {
-                // if (str(data_get($application, 'status'))->contains('running')) {
+            } else if (data_get($this->parameters, 'service_uuid')) {
+                $this->type = 'service';
+                $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+                $this->resource->applications()->get()->each(function ($application) {
                     $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
-            });
-            $this->resource->databases()->get()->each(function ($database) {
-                // if (str(data_get($database, 'status'))->contains('running')) {
+                });
+                $this->resource->databases()->get()->each(function ($database) {
                     $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
-            });
+                });
 
-            $this->server = $this->resource->server;
+                if ($this->resource->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->server);
+                }
+            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
     }
 

app/Livewire/Project/Shared/ResourceLimits.php

@@ -52,7 +52,7 @@ class ResourceLimits extends Component
             }
             $this->validate();
             $this->resource->save();
-            $this->dispatch('success', 'Resource limits updated successfully.');
+            $this->dispatch('success', 'Resource limits updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/ScheduledTask/All.php

@@ -48,7 +48,7 @@ class All extends Component
             }
             $task->save();
             $this->refreshTasks();
-            $this->dispatch('success', 'Scheduled task added successfully.');
+            $this->dispatch('success', 'Scheduled task added.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/ScheduledTask/Show.php

@@ -49,7 +49,7 @@ class Show extends Component
     {
         $this->validate();
         $this->task->save();
-        $this->dispatch('success', 'Scheduled task updated successfully.');
+        $this->dispatch('success', 'Scheduled task updated.');
         $this->dispatch('refreshTasks');
     }
 

app/Livewire/Server/Create.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Server;
 
 use App\Models\PrivateKey;
+use App\Models\Team;
 use Livewire\Component;
 
 class Create extends Component
@@ -16,11 +17,7 @@ class Create extends Component
             $this->limit_reached = false;
             return;
         }
-        $team = currentTeam();
-        $servers = $team->servers->count();
-        ['serverLimit' => $serverLimit] = $team->limits;
-
-        $this->limit_reached = $servers >= $serverLimit;
+        $this->limit_reached = Team::serverLimitReached();
     }
     public function render()
     {

app/Livewire/Server/Form.php

@@ -13,8 +13,9 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
+    public bool $revalidate = false;
 
-    protected $listeners = ['serverInstalled'];
+    protected $listeners = ['serverInstalled', 'revalidate' => '$refresh'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -28,6 +29,7 @@ class Form extends Component
         'server.settings.is_swarm_worker' => 'required|boolean',
         'server.settings.is_build_server' => 'required|boolean',
         'server.settings.concurrent_builds' => 'required|integer|min:1',
+        'server.settings.dynamic_timeout' => 'required|integer|min:1',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -42,6 +44,8 @@ class Form extends Component
         'server.settings.is_swarm_worker' => 'Swarm Worker',
         'server.settings.is_build_server' => 'Build Server',
         'server.settings.concurrent_builds' => 'Concurrent Builds',
+        'server.settings.dynamic_timeout' => 'Dynamic Timeout',
+
     ];
 
     public function mount()
@@ -60,11 +64,15 @@ class Form extends Component
             refresh_server_connection($this->server->privateKey);
             $this->validateServer(false);
             $this->server->settings->save();
-            $this->dispatch('success', 'Server updated successfully.');
+            $this->dispatch('success', 'Server updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
+    public function revalidate()
+    {
+        $this->revalidate = true;
+    }
     public function checkLocalhostConnection()
     {
         $uptime = $this->server->validateConnection();
@@ -80,7 +88,7 @@ class Form extends Component
     }
     public function validateServer($install = true)
     {
-        $this->dispatch('validateServer', $install);
+        $this->dispatch('init', $install);
     }
 
     public function submit()
@@ -105,6 +113,6 @@ class Form extends Component
         $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage;
         $this->server->settings->save();
         $this->server->save();
-        $this->dispatch('success', 'Server updated successfully.');
+        $this->dispatch('success', 'Server updated.');
     }
 }

app/Livewire/Server/LogDrains.php

@@ -60,7 +60,7 @@ class LogDrains extends Component
                 return;
             }
             $this->dispatch('serverRefresh');
-            $this->dispatch('success', 'Log drain service started successfully.');
+            $this->dispatch('success', 'Log drain service started.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -126,7 +126,7 @@ class LogDrains extends Component
                 ]);
             }
             $this->server->settings->save();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
             return true;
         } catch (\Throwable $e) {
             if ($type === 'newrelic') {

app/Livewire/Server/New/ByIp.php

@@ -5,6 +5,7 @@ namespace App\Livewire\Server\New;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Models\Server;
+use App\Models\Team;
 use Livewire\Component;
 
 class ByIp extends Component
@@ -76,6 +77,9 @@ class ByIp extends Component
             if (is_null($this->private_key_id)) {
                 return $this->dispatch('error', 'You must select a private key');
             }
+            if (Team::serverLimitReached()) {
+                return $this->dispatch('error', 'You have reached the server limit for your subscription.');
+            }
             $payload = [
                 'name' => $this->name,
                 'description' => $this->description,

app/Livewire/Server/Proxy.php

@@ -4,6 +4,7 @@ namespace App\Livewire\Server;
 
 use App\Actions\Proxy\CheckConfiguration;
 use App\Actions\Proxy\SaveConfiguration;
+use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
 use Illuminate\Support\Str;
@@ -26,7 +27,7 @@ class Proxy extends Component
 
     public function proxyStatusUpdated()
     {
-        $this->server->refresh();
+        $this->dispatch('refresh')->self();
     }
 
     public function change_proxy()
@@ -41,6 +42,9 @@ class Proxy extends Component
         $this->server->proxy->set('type', $proxy_type);
         $this->server->save();
         $this->selectedProxy = $this->server->proxy->type;
+        if ($this->selectedProxy !== 'NONE') {
+            StartProxy::run($this->server, false);
+        }
         $this->dispatch('proxyStatusUpdated');
     }
 

app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class DynamicConfigurationNavbar extends Component
+{
+    public $server_id;
+    public $fileName = '';
+    public $value = '';
+    public $newFile = false;
+    public function delete(string $fileName)
+    {
+        $server = Server::ownedByCurrentTeam()->whereId($this->server_id)->first();
+        $proxy_path = get_proxy_path();
+        $file = str_replace('|', '.', $fileName);
+        instant_remote_process(["rm -f {$proxy_path}/dynamic/{$file}"], $server);
+        $this->dispatch('success', 'File deleted.');
+        $this->dispatch('loadDynamicConfigurations');
+        $this->dispatch('refresh');
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.dynamic-configuration-navbar');
+    }
+}

app/Livewire/Server/Proxy/DynamicConfigurations.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class DynamicConfigurations extends Component
+{
+    public ?Server $server = null;
+    public $parameters = [];
+    public Collection $contents;
+    protected $listeners = ['loadDynamicConfigurations', 'refresh' => '$refresh'];
+    protected $rules = [
+        'contents.*' => 'nullable|string',
+    ];
+    public function loadDynamicConfigurations()
+    {
+        $proxy_path = get_proxy_path();
+        $files = instant_remote_process(["mkdir -p $proxy_path/dynamic && ls -1 {$proxy_path}/dynamic"], $this->server);
+        $files = collect(explode("\n", $files))->filter(fn ($file) => !empty($file));
+        $files = $files->map(fn ($file) => trim($file));
+        $files = $files->sort();
+        if ($files->contains('coolify.yaml')) {
+            $files = $files->filter(fn ($file) => $file !== 'coolify.yaml')->prepend('coolify.yaml');
+        }
+        $contents = collect([]);
+        foreach ($files as $file) {
+            $without_extension = str_replace('.', '|', $file);
+            $contents[$without_extension] = instant_remote_process(["cat {$proxy_path}/dynamic/{$file}"], $this->server);
+        }
+        $this->contents = $contents;
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.index');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.dynamic-configurations');
+    }
+}

app/Livewire/Server/Proxy/NewDynamicConfiguration.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Illuminate\Routing\Route;
+use Livewire\Component;
+use Symfony\Component\Yaml\Yaml;
+
+class NewDynamicConfiguration extends Component
+{
+    public string $fileName = '';
+    public string $value = '';
+    public bool $newFile = false;
+    public Server $server;
+    public $server_id;
+    public $parameters = [];
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        if ($this->fileName !== '') {
+            $this->fileName = str_replace('|', '.', $this->fileName);
+        }
+    }
+    public function addDynamicConfiguration()
+    {
+        try {
+            $this->validate([
+                'fileName' => 'required',
+                'value' => 'required',
+            ]);
+
+            if (data_get($this->parameters, 'server_uuid')) {
+                $this->server = Server::ownedByCurrentTeam()->whereUuid(data_get($this->parameters, 'server_uuid'))->first();
+            }
+            if (!is_null($this->server_id)) {
+                $this->server = Server::ownedByCurrentTeam()->whereId($this->server_id)->first();
+            }
+            if (is_null($this->server)) {
+                return redirect()->route('server.index');
+            }
+            if (!str($this->fileName)->endsWith('.yaml') && !str($this->fileName)->endsWith('.yml')) {
+                $this->fileName = "{$this->fileName}.yaml";
+            }
+            if ($this->fileName === 'coolify.yaml') {
+                $this->dispatch('error', 'File name is reserved.');
+                return;
+            }
+            $proxy_path = get_proxy_path();
+            $file = "{$proxy_path}/dynamic/{$this->fileName}";
+            if ($this->newFile) {
+                $exists = instant_remote_process(["test -f $file && echo 1 || echo 0"], $this->server);
+                if ($exists == 1) {
+                    $this->dispatch('error', 'File already exists');
+                    return;
+                }
+            }
+            $yaml = Yaml::parse($this->value);
+            $yaml = Yaml::dump($yaml, 10, 2);
+            $this->value = $yaml;
+            $base64_value = base64_encode($this->value);
+            instant_remote_process(["echo '{$base64_value}' | base64 -d > {$file}"], $this->server);
+            $this->dispatch('loadDynamicConfigurations');
+            $this->dispatch('dynamic-configuration-added');
+            $this->dispatch('success', 'Dynamic configuration saved.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.new-dynamic-configuration');
+    }
+}

app/Livewire/Server/Proxy/Status.php

@@ -12,7 +12,7 @@ class Status extends Component
     public Server $server;
     public bool $polling = false;
     public int $numberOfPolls = 0;
-    protected $listeners = ['proxyStatusUpdated', 'startProxyPolling'];
+    protected $listeners = ['proxyStatusUpdated' => '$refresh', 'startProxyPolling'];
 
     public function startProxyPolling()
     {

app/Livewire/Server/Resources.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Resources extends Component
+{
+    use AuthorizesRequests;
+    public ?Server $server = null;
+    public $parameters = [];
+    public Collection $unmanagedContainers;
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+        return [
+            "echo-private:team.{$teamId},ApplicationStatusChanged" => 'refreshStatus',
+        ];
+    }
+
+    public function startUnmanaged($id) {
+        $this->server->startUnmanaged($id);
+        $this->dispatch('success', 'Container started.');
+        $this->loadUnmanagedContainers();
+    }
+    public function restartUnmanaged($id) {
+        $this->server->restartUnmanaged($id);
+        $this->dispatch('success', 'Container restarted.');
+        $this->loadUnmanagedContainers();
+    }
+    public function stopUnmanaged($id) {
+        $this->server->stopUnmanaged($id);
+        $this->dispatch('success', 'Container stopped.');
+        $this->loadUnmanagedContainers();
+    }
+    public function refreshStatus() {
+        $this->server->refresh();
+        $this->loadUnmanagedContainers();
+        $this->dispatch('success', 'Resource statuses refreshed.');
+    }
+    public function loadUnmanagedContainers() {
+        $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
+    }
+    public function mount() {
+        $this->unmanagedContainers = collect();
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.index');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.resources');
+    }
+}

app/Livewire/Server/ValidateAndInstall.php

@@ -2,6 +2,8 @@
 
 namespace App\Livewire\Server;
 
+use App\Actions\Proxy\CheckProxy;
+use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,10 +16,21 @@ class ValidateAndInstall extends Component
     public $uptime = null;
     public $supported_os_type = null;
     public $docker_installed = null;
+    public $docker_compose_installed = null;
     public $docker_version = null;
+    public $proxy_started = false;
     public $error = null;
+    public bool $ask = false;
 
-    protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
+    protected $listeners = [
+        'init',
+        'validateConnection',
+        'validateOS',
+        'validateDockerEngine',
+        'validateDockerVersion',
+        'startProxy',
+        'refresh' => '$refresh',
+    ];
 
     public function init(bool $install = true)
     {
@@ -26,24 +39,34 @@ class ValidateAndInstall extends Component
         $this->supported_os_type = null;
         $this->docker_installed = null;
         $this->docker_version = null;
+        $this->docker_compose_installed = null;
+        $this->proxy_started = null;
         $this->error = null;
         $this->number_of_tries = 0;
-        $this->dispatch('validateServerNow');
+        if (!$this->ask) {
+            $this->dispatch('validateConnection');
+        }
     }
-
-    public function validateServer()
+    public function startValidatingAfterAsking()
+    {
+        $this->ask = false;
+        $this->init();
+    }
+    public function startProxy()
     {
         try {
-            $this->validateConnection();
-            $this->validateOS();
-            $this->validateDockerEngine();
-
-            if ($this->server->isSwarm()) {
-                $swarmInstalled = $this->server->validateDockerSwarm();
-                if ($swarmInstalled) {
-                    $this->dispatch('success', 'Docker Swarm is initiated.');
+            $shouldStart = CheckProxy::run($this->server);
+            if ($shouldStart) {
+                $proxy = StartProxy::run($this->server, false);
+                if ($proxy === 'OK') {
+                    $this->proxy_started = true;
+                } else {
+                    throw new \Exception("Proxy could not be started.");
                 }
+            } else {
+                $this->proxy_started = true;
             }
+
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -55,6 +78,7 @@ class ValidateAndInstall extends Component
             $this->error = 'Server is not reachable. Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.';
             return;
         }
+        $this->dispatch('validateOS');
     }
     public function validateOS()
     {
@@ -63,40 +87,51 @@ class ValidateAndInstall extends Component
             $this->error = 'Server OS type is not supported. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
             return;
         }
+        $this->dispatch('validateDockerEngine');
     }
     public function validateDockerEngine()
     {
         $this->docker_installed = $this->server->validateDockerEngine();
-        if (!$this->docker_installed) {
+        $this->docker_compose_installed = $this->server->validateDockerCompose();
+        if (!$this->docker_installed || !$this->docker_compose_installed) {
             if ($this->install) {
-                ray($this->number_of_tries, $this->max_tries);
                 if ($this->number_of_tries == $this->max_tries) {
                     $this->error = 'Docker Engine could not be installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
                     return;
                 } else {
-                    $activity = $this->server->installDocker();
-                    $this->number_of_tries++;
-                    $this->dispatch('newActivityMonitor', $activity->id, 'validateDockerEngine');
+                    if ($this->number_of_tries == 0) {
+                        $activity = $this->server->installDocker();
+                        $this->number_of_tries++;
+                        $this->dispatch('newActivityMonitor', $activity->id, 'init');
+                    }
                     return;
                 }
             } else {
                 $this->error = 'Docker Engine is not installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
                 return;
             }
-        } else {
-            $this->validateDockerVersion();
         }
+        $this->dispatch('validateDockerVersion');
     }
     public function validateDockerVersion()
     {
-        $this->docker_version = $this->server->validateDockerEngineVersion();
-        if ($this->docker_version) {
-            $this->dispatch('serverInstalled');
-            $this->dispatch('success', 'Server validated successfully.');
+        if ($this->server->isSwarm()) {
+            $swarmInstalled = $this->server->validateDockerSwarm();
+            if ($swarmInstalled) {
+                $this->dispatch('success', 'Docker Swarm is initiated.');
+            }
         } else {
-            $this->error = 'Docker Engine version is not 22+. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
-            return;
+            $this->docker_version = $this->server->validateDockerEngineVersion();
+            if ($this->docker_version) {
+                $this->dispatch('serverInstalled');
+                $this->dispatch('success', 'Server validated.');
+            } else {
+                $this->error = 'Docker Engine version is not 22+. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+                return;
+            }
         }
+
+        $this->dispatch('startProxy');
     }
     public function render()
     {

app/Livewire/Settings/Backup.php

@@ -81,6 +81,6 @@ class Backup extends Component
     }
     public function submit()
     {
-        $this->dispatch('success', 'Backup updated successfully.');
+        $this->dispatch('success', 'Backup updated.');
     }
 }

app/Livewire/Settings/Email.php

@@ -49,7 +49,7 @@ class Email extends Component
                 'settings.smtp_from_name' => 'required',
             ]);
             $this->settings->save();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -61,7 +61,7 @@ class Email extends Component
                 'settings.resend_api_key' => 'required'
             ]);
             $this->settings->save();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             $this->settings->resend_enabled = false;
             return handleError($e, $this);
@@ -98,7 +98,7 @@ class Email extends Component
                 'settings.smtp_timeout' => 'nullable',
             ]);
             $this->settings->save();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }