Merge pull request #1742 from coollabsio/next

v4.0.0-beta.215

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,8 @@ 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.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartMongodb.php

@@ -122,7 +122,8 @@ 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.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartMysql.php

@@ -106,7 +106,8 @@ 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.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartPostgresql.php

@@ -128,7 +128,8 @@ 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.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Database/StartRedis.php

@@ -117,7 +117,8 @@ 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.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 

app/Actions/Server/InstallDocker.php

@@ -43,6 +43,7 @@ class InstallDocker
                 "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
             ]);
+            return remote_process($command, $server);
         } else {
             if ($supported_os_type->contains('debian')) {
                 $command = $command->merge([
@@ -89,7 +90,6 @@ class InstallDocker
                     "echo 'Done!'",
                 ]);
             }
-
             return remote_process($command, $server);
         }
     }

app/Actions/Server/InstallLogDrain.php

@@ -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/StartService.php

@@ -13,11 +13,15 @@ class StartService
     {
         ray('Starting service: ' . $service->name);
         $service->saveComposeConfigs();
+
+        $service_name = addslashes($service->name);
+        $server_name = addslashes($service->server->name);
+
         $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[] = "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/CleanupStuckedResources.php

@@ -20,7 +20,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()
@@ -113,18 +114,18 @@ class CleanupStuckedResources extends Command
             $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 +136,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 +158,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 +181,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 +204,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 +227,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 +250,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 +272,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 +284,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/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,10 @@ 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) {
+            $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 +136,4 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-
 }

app/Console/Commands/SyncBunny.php

@@ -48,7 +48,7 @@ class SyncBunny extends Command
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($fileName) use($that) {
+        PendingRequest::macro('storage', function ($fileName) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
@@ -76,23 +76,26 @@ class SyncBunny extends Command
             }
             if ($only_template) {
                 $this->info('About to sync service-templates.json to BunnyCDN.');
-            }
-            if ($only_version) {
-                $this->info('About to sync versions.json to BunnyCDN.');
-            }
-            $confirmed = confirm('Are you sure you want to sync?');
-            if (!$confirmed) {
-                return;
-            }
-            if ($only_template) {
+                $confirmed = confirm("Are you sure you want to sync?");
+                if (!$confirmed) {
+                    return;
+                }
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
                 ]);
                 $this->info('Service template uploaded & purged...');
                 return;
-            }
-            if ($only_version) {
+            } else if ($only_version) {
+                $this->info('About to sync versions.json to BunnyCDN.');
+                $file = file_get_contents("$parent_dir/$versions");
+                $json = json_decode($file, true);
+                $actual_version = data_get($json, 'coolify.v4.version');
+
+                $confirmed = confirm("Are you sure you want to sync to {$actual_version}?");
+                if (!$confirmed) {
+                    return;
+                }
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
@@ -101,6 +104,7 @@ class SyncBunny extends Command
                 return;
             }
 
+
             Http::pool(fn (Pool $pool) => [
                 $pool->storage(fileName: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
                 $pool->storage(fileName: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),

app/Console/Kernel.php

@@ -4,6 +4,7 @@ namespace App\Console;
 
 use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
+use App\Jobs\ComplexContainerStatusJob;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\InstanceAutoUpdateJob;
@@ -91,7 +92,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,7 +117,6 @@ class Kernel extends ConsoleKernel
     {
         $scheduled_tasks = ScheduledTask::all();
         if ($scheduled_tasks->isEmpty()) {
-            ray('no scheduled tasks');
             return;
         }
         foreach ($scheduled_tasks as $scheduled_task) {

app/Http/Controllers/Api/Deploy.php

@@ -73,12 +73,17 @@ class Deploy extends Controller
                 $message->push("Tag {$tag} not found.");
                 continue;
             }
-            $resources = $found_tag->resources()->get();
-            if ($resources->count() === 0) {
+            $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;
             }
-            foreach ($resources as $resource) {
+            foreach ($applications as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+            foreach ($services as $resource) {
                 $return_message = $this->deploy_resource($resource, $force);
                 $message = $message->merge($return_message);
             }
@@ -92,7 +97,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/Jobs/ApplicationDeploymentJob.php

@@ -122,7 +122,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($source) {
             $this->source = $source->getMorphClass()::where('id', $this->application->source->id)->first();
         }
-        $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->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;
         $this->basedir = $this->application->generateBaseDir($this->deployment_uuid);
@@ -166,10 +168,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        $this->application_deployment_queue->update([
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
-
         // Generate custom host<->ip mapping
         $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
         if (!is_null($allContainers)) {
@@ -251,9 +249,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()) {
@@ -291,162 +294,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
-    private function write_deployment_configurations()
-    {
-        if (isset($this->docker_compose_base64)) {
-            if ($this->use_build_server) {
-                $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) {
-                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
-            }
-            $this->execute_remote_command(
-                [
-                    "mkdir -p $this->configuration_dir"
-                ],
-                [
-                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
-                ],
-                [
-                    "echo '{$readme}' > $this->configuration_dir/README.md",
-                ]
-            );
-            if ($this->use_build_server) {
-                $this->server = $this->build_server;
-            }
-        }
-    }
-    private function push_to_docker_registry($forceFail = false)
-    {
-        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}).");
-                $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 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);
-            }
-        }
-    }
-    private function generate_image_names()
-    {
-        if ($this->application->dockerfile) {
-            if ($this->application->docker_registry_image_name) {
-                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:build");
-                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:latest");
-            } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:build");
-                $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
-            }
-        } else if ($this->application->build_pack === 'dockerimage') {
-            $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
-        } else if ($this->pull_request_id !== 0) {
-            if ($this->application->docker_registry_image_name) {
-                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}-build");
-                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}");
-            } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
-                $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
-            }
-        } else {
-            $this->dockerImageTag = str($this->commit)->substr(0, 128);
-            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}");
-            } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}-build");
-                $this->production_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}");
-            }
-        }
-    }
-    private function just_restart()
-    {
-        $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->check_image_locally_or_remotely();
-        if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
-            $this->application_deployment_queue->addLogEntry("Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.");
-            $this->create_workdir();
-            $this->generate_compose_file();
-            $this->rolling_update();
-            return;
-        }
-        throw new RuntimeException('Cannot find image anywhere. Please redeploy the application.');
-    }
-    private function check_image_locally_or_remotely()
-    {
-        $this->execute_remote_command([
-            "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
-        ]);
-        if (str($this->saved_outputs->get('local_image_found'))->isEmpty() && $this->application->docker_registry_image_name) {
-            $this->execute_remote_command([
-                "docker pull {$this->production_image_name} 2>/dev/null", "ignore_errors" => true, "hidden" => true
-            ]);
-            $this->execute_remote_command([
-                "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
-            ]);
-        }
-    }
-    private function save_environment_variables()
-    {
-        $envs = collect([]);
-        if ($this->pull_request_id !== 0) {
-            foreach ($this->application->environment_variables_preview as $env) {
-                $envs->push($env->key . '=' . $env->real_value);
-            }
-        } else {
-            foreach ($this->application->environment_variables as $env) {
-                $envs->push($env->key . '=' . $env->real_value);
-            }
-        }
-        $envs_base64 = base64_encode($envs->implode("\n"));
-        $this->execute_remote_command(
-            [
-                executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
-            ],
-        );
-    }
-
     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->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name} to {$this->server->name}.");
         $this->prepare_builder_image();
         $this->execute_remote_command(
             [
@@ -454,19 +308,30 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ],
         );
         $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;
         $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}.");
+        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();
@@ -484,9 +349,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $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}.");
+            $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}.");
+            $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();
@@ -554,30 +419,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         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();
-        // if ($this->application->additional_destinations) {
-        //     $this->push_to_docker_registry();
-        //     $this->deploy_to_additional_destinations();
-        // } else {
-        $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->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();
@@ -588,6 +430,38 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $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;
             }
@@ -600,8 +474,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_nixpacks_confs();
         $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_static_buildpack()
@@ -609,18 +483,205 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         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->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->build_image();
         $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)) {
+            if ($this->use_build_server) {
+                $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) {
+                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+            }
+            $this->execute_remote_command(
+                [
+                    "mkdir -p $this->configuration_dir"
+                ],
+                [
+                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
+                ],
+                [
+                    "echo '{$readme}' > $this->configuration_dir/README.md",
+                ]
+            );
+            if ($this->use_build_server) {
+                $this->server = $this->build_server;
+            }
+        }
+    }
+    private function push_to_docker_registry()
+    {
+        $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 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 new RuntimeException($e->getMessage(), 69420);
+            }
+            ray($e);
+        }
+    }
+    private function generate_image_names()
+    {
+        if ($this->application->dockerfile) {
+            if ($this->application->docker_registry_image_name) {
+                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:build");
+                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:latest");
+            } else {
+                $this->build_image_name = Str::lower("{$this->application->uuid}:build");
+                $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+            }
+        } else if ($this->application->build_pack === 'dockerimage') {
+            $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
+        } else if ($this->pull_request_id !== 0) {
+            if ($this->application->docker_registry_image_name) {
+                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}-build");
+                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}");
+            } else {
+                $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
+                $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
+            }
+        } 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}");
+            } else {
+                $this->build_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}-build");
+                $this->production_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}");
+            }
+        }
+    }
+    private function just_restart()
+    {
+        $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();
+        $this->check_image_locally_or_remotely();
+        if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
+            $this->application_deployment_queue->addLogEntry("Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.");
+            $this->create_workdir();
+            $this->generate_compose_file();
+            $this->rolling_update();
+            return;
+        }
+        throw new RuntimeException('Cannot find image anywhere. Please redeploy the application.');
+    }
+    private function check_image_locally_or_remotely()
+    {
+        $this->execute_remote_command([
+            "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
+        ]);
+        if (str($this->saved_outputs->get('local_image_found'))->isEmpty() && $this->application->docker_registry_image_name) {
+            $this->execute_remote_command([
+                "docker pull {$this->production_image_name} 2>/dev/null", "ignore_errors" => true, "hidden" => true
+            ]);
+            $this->execute_remote_command([
+                "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
+            ]);
+        }
+    }
+    private function save_environment_variables()
+    {
+        $envs = collect([]);
+        if ($this->pull_request_id !== 0) {
+            foreach ($this->application->environment_variables_preview as $env) {
+                $envs->push($env->key . '=' . $env->real_value);
+            }
+        } else {
+            foreach ($this->application->environment_variables as $env) {
+                $envs->push($env->key . '=' . $env->real_value);
+            }
+        }
+        $envs_base64 = base64_encode($envs->implode("\n"));
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
+            ],
+        );
+    }
+
+
     private function framework_based_notification()
     {
         // Laravel old env variables
@@ -638,9 +699,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(
                 [
@@ -650,7 +708,6 @@ 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;
             }
@@ -795,7 +852,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_to_additional_destinations()
     {
-        $destination_ids = collect(str($this->application->additional_destinations)->explode(','));
+        if ($this->application->additional_networks->count() === 0) {
+            return;
+        }
+        $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;
+        }
+        if ($destination_ids->contains($this->destination->id)) {
+            ray('Same destination found in additional destinations. Skipping.');
+            return;
+        }
         foreach ($destination_ids as $destination_id) {
             $destination = StandaloneDocker::find($destination_id);
             $server = $destination->server;
@@ -803,11 +871,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->application_deployment_queue->addLogEntry("Skipping deployment to {$server->name}. Not in the same team?!");
                 continue;
             }
-            $this->server = $server;
-            $this->application_deployment_queue->addLogEntry("Deploying to {$this->server->name}.");
-            $this->prepare_builder_image();
-            $this->generate_image_names();
-            $this->rolling_update();
+            // ray('Deploying to additional destination: ', $server->name);
+            $deployment_uuid = new Cuid2();
+            queue_application_deployment(
+                deployment_uuid: $deployment_uuid,
+                application: $this->application,
+                server: $server,
+                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', [
+                'project_uuid' => data_get($this->application, 'environment.project.uuid'),
+                'application_uuid' => data_get($this->application, 'uuid'),
+                'deployment_uuid' => $deployment_uuid,
+                'environment_name' => data_get($this->application, 'environment.name'),
+            ]));
         }
     }
     private function set_base_dir()
@@ -1511,11 +1589,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 'status' => $status,
             ]);
         }
-        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
-        }
         if ($status === ApplicationDeploymentStatus::FAILED->value) {
             $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
+            return;
+        }
+        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
+            $this->deploy_to_additional_destinations();
+            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 
@@ -1527,10 +1607,14 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
 
         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();
+            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(
+                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
+                );
+            }
         }
 
         $this->next(ApplicationDeploymentStatus::FAILED->value);

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;
@@ -42,6 +43,19 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle()
     {
+        $applications = $this->server->applications();
+        foreach ($applications as $application) {
+            if ($application->additional_servers->count() > 0) {
+                $is_main_server = $application->destination->server->id === $this->server->id;
+                if ($is_main_server) {
+                    ComplexStatusCheck::run($application);
+                    $applications = $applications->filter(function ($value, $key) use ($application) {
+                        return $value->id !== $application->id;
+                    });
+                }
+            }
+        }
+
         if (!$this->server->isFunctional()) {
             return 'Server is not ready.';
         };
@@ -83,7 +97,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 +173,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 +221,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 +243,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 +268,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 +293,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/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/ServerStatusJob.php

@@ -41,6 +41,15 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
             throw new \RuntimeException('Server is not ready.');
         };
         try {
+            // $this->server->validateConnection();
+            // $this->server->validateOS();
+            // $docker_installed = $this->server->validateDockerEngine();
+            // if (!$docker_installed) {
+            //     $this->server->installDocker();
+            //     $this->server->validateDockerEngine();
+            // }
+
+            // $this->server->validateDockerEngineVersion();
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
             }

app/Livewire/ActivityMonitor.php

@@ -15,7 +15,7 @@ class ActivityMonitor extends Component
     public $isPollingActive = false;
 
     protected $activity;
-    protected $listeners = ['newMonitorActivity'];
+    protected $listeners = ['activityMonitor' => 'newMonitorActivity'];
 
     public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
     {

app/Livewire/Admin/Index.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Livewire\Admin;
+
+use App\Models\User;
+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 && session('adminToken') === null) {
+            return redirect()->route('dashboard');
+        }
+        $this->users = User::whereHas('teams', function ($query) {
+            $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+        })->get();
+    }
+    public function switchUser(int $user_id)
+    {
+        $user = User::find($user_id);
+        auth()->login($user);
+
+        if ($user_id === 0) {
+            session()->forget('adminToken');
+        } else {
+            $token_payload = [
+                'valid' => true,
+            ];
+            $token = Crypt::encrypt($token_payload);
+            session(['adminToken' => $token]);
+        }
+        return refreshSession();
+    }
+    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;
@@ -12,6 +13,7 @@ use Livewire\Component;
 
 class Index extends Component
 {
+    protected $listeners = ['serverInstalled' => 'validateServer'];
     public string $currentState = 'welcome';
 
     public ?string $selectedServerType = null;
@@ -93,7 +95,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if (isDev()) {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->get();
+            } else {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            }
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
             }
@@ -116,15 +122,16 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
         $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->validateServer();
+        $this->installServer();
     }
     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()
@@ -188,7 +195,11 @@ 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()
+    {
+        $this->dispatch('validateServer', true);
     }
     public function validateServer()
     {
@@ -210,7 +221,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([
@@ -218,27 +229,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('newMonitorActivity', $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('app:init', [
+            '--cleanup-deployments' => 'true'
+        ]);
+    }
     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/NewActivityMonitor.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\User;
+use Livewire\Component;
+use Spatie\Activitylog\Models\Activity;
+
+class NewActivityMonitor extends Component
+{
+    public ?string $header = null;
+    public $activityId;
+    public $eventToDispatch = 'activityFinished';
+    public $isPollingActive = false;
+
+    protected $activity;
+    protected $listeners = ['newActivityMonitor' => 'newMonitorActivity'];
+
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
+    {
+        $this->activityId = $activityId;
+        $this->eventToDispatch = $eventToDispatch;
+
+        $this->hydrateActivity();
+
+        $this->isPollingActive = true;
+    }
+
+    public function hydrateActivity()
+    {
+        $this->activity = Activity::find($this->activityId);
+    }
+
+    public function polling()
+    {
+        $this->hydrateActivity();
+        // $this->setStatus(ProcessStatus::IN_PROGRESS);
+        $exit_code = data_get($this->activity, 'properties.exitCode');
+        if ($exit_code !== null) {
+            // if ($exit_code === 0) {
+            //     // $this->setStatus(ProcessStatus::FINISHED);
+            // } else {
+            //     // $this->setStatus(ProcessStatus::ERROR);
+            // }
+            $this->isPollingActive = false;
+            if ($this->eventToDispatch !== null) {
+                if (str($this->eventToDispatch)->startsWith('App\\Events\\')) {
+                    $causer_id = data_get($this->activity, 'causer_id');
+                    $user = User::find($causer_id);
+                    if ($user) {
+                        foreach ($user->teams as $team) {
+                            $teamId = $team->id;
+                            $this->eventToDispatch::dispatch($teamId);
+                        }
+                    }
+                    return;
+                }
+                $this->dispatch($this->eventToDispatch);
+                ray('Dispatched event: ' . $this->eventToDispatch);
+            }
+        }
+    }
+}

app/Livewire/Project/Application/DeploymentNavbar.php

@@ -7,8 +7,6 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Process;
-use Illuminate\Support\Str;
 use Livewire\Component;
 
 class DeploymentNavbar extends Component
@@ -37,11 +35,21 @@ class DeploymentNavbar extends Component
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
         $this->dispatch('refreshQueue');
     }
-
+    public function force_start()
+    {
+        try {
+            force_start_deployment($this->application_deployment_queue);
+        } catch (\Throwable $e) {
+            ray($e);
+            return handleError($e, $this);
+        }
+    }
     public function cancel()
     {
         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);
 
@@ -57,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);
@@ -67,7 +75,6 @@ class DeploymentNavbar extends Component
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
-            // queue_next_deployment($this->application);
         }
     }
 }

app/Livewire/Project/Application/General.php

@@ -243,9 +243,11 @@ class General extends Component
                     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.");
+                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);

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,13 +33,14 @@ 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();
-            });
+            // $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.");
     }
 
@@ -46,38 +49,22 @@ class Heading extends Component
         $this->deploy(force_rebuild: true);
     }
 
-    public function deployNew()
-    {
-        if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
-            $this->dispatch('error', 'Please load a Compose file first.');
-            return;
-        }
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application: $this->application,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: false,
-            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'],
-        ]);
-    }
     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();
@@ -105,26 +92,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/CloneMe.php

@@ -22,12 +22,12 @@ class CloneMe extends Component
     public ?int $selectedDestination = null;
     public ?Server $server = null;
     public $resources = [];
-    public string $newProjectName = '';
+    public string $newName = '';
 
     protected $messages = [
         'selectedServer' => 'Please select a server.',
         'selectedDestination' => 'Please select a server & destination.',
-        'newProjectName' => 'Please enter a name for the new project.',
+        'newName' => 'Please enter a name for the new project or environment.',
     ];
     public function mount($project_uuid)
     {
@@ -36,7 +36,7 @@ class CloneMe extends Component
         $this->environment = $this->project->environments->where('name', $this->environment_name)->first();
         $this->project_id = $this->project->id;
         $this->servers = currentTeam()->servers;
-        $this->newProjectName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
+        $this->newName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
     }
 
     public function render()
@@ -46,34 +46,50 @@ class CloneMe extends Component
 
     public function selectServer($server_id, $destination_id)
     {
+        if ($server_id == $this->selectedServer && $destination_id == $this->selectedDestination) {
+            $this->selectedServer = null;
+            $this->selectedDestination = null;
+            $this->server = null;
+            return;
+        }
         $this->selectedServer = $server_id;
         $this->selectedDestination = $destination_id;
         $this->server = $this->servers->where('id', $server_id)->first();
     }
 
-    public function clone()
+    public function clone(string $type)
     {
         try {
             $this->validate([
                 'selectedDestination' => 'required',
-                'newProjectName' => 'required',
+                'newName' => 'required',
             ]);
-            $foundProject = Project::where('name', $this->newProjectName)->first();
-            if ($foundProject) {
-                throw new \Exception('Project with the same name already exists.');
-            }
-            $newProject = Project::create([
-                'name' => $this->newProjectName,
-                'team_id' => currentTeam()->id,
-                'description' => $this->project->description . ' (clone)',
-            ]);
-            if ($this->environment->name !== 'production') {
-                $newProject->environments()->create([
-                    'name' => $this->environment->name,
+            if ($type === 'project') {
+                $foundProject = Project::where('name', $this->newName)->first();
+                if ($foundProject) {
+                    throw new \Exception('Project with the same name already exists.');
+                }
+                $project = Project::create([
+                    'name' => $this->newName,
+                    'team_id' => currentTeam()->id,
+                    'description' => $this->project->description . ' (clone)',
+                ]);
+                if ($this->environment->name !== 'production') {
+                    $project->environments()->create([
+                        'name' => $this->environment->name,
+                    ]);
+                }
+                $environment = $project->environments->where('name', $this->environment->name)->first();
+            } else {
+                $foundEnv = $this->project->environments()->where('name', $this->newName)->first();
+                if ($foundEnv) {
+                    throw new \Exception('Environment with the same name already exists.');
+                }
+                $project = $this->project;
+                $environment = $this->project->environments()->create([
+                    'name' => $this->newName,
                 ]);
             }
-            $newEnvironment = $newProject->environments->where('name', $this->environment->name)->first();
-            // Clone Applications
             $applications = $this->environment->applications;
             $databases = $this->environment->databases();
             $services = $this->environment->services;
@@ -83,7 +99,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'fqdn' => generateFqdn($this->server, $uuid),
                     'status' => 'exited',
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     // This is not correct, but we need to set it to something
                     'destination_id' => $this->selectedDestination,
                 ]);
@@ -110,7 +126,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'status' => 'exited',
                     'started_at' => null,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newDatabase->save();
@@ -136,7 +152,7 @@ class CloneMe extends Component
                 $uuid = (string)new Cuid2(7);
                 $newService = $service->replicate()->fill([
                     'uuid' => $uuid,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newService->save();
@@ -153,8 +169,8 @@ class CloneMe extends Component
                 $newService->parse();
             }
             return redirect()->route('project.resource.index', [
-                'project_uuid' => $newProject->uuid,
-                'environment_name' => $newEnvironment->name,
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
             ]);
         } catch (\Exception $e) {
             return handleError($e, $this);

app/Livewire/Project/Database/Heading.php

@@ -58,19 +58,19 @@ class Heading extends Component
     {
         if ($this->database->type() === 'standalone-postgresql') {
             $activity = StartPostgresql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-redis') {
             $activity = StartRedis::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mongodb') {
             $activity = StartMongodb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mysql') {
             $activity = StartMysql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mariadb') {
             $activity = StartMariadb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         }
     }
 }

app/Livewire/Project/Database/Import.php

@@ -129,7 +129,7 @@ class Import extends Component
 
             if (!empty($this->importCommands)) {
                 $activity = remote_process($this->importCommands, $this->server, ignore_errors: true);
-                $this->dispatch('newMonitorActivity', $activity->id);
+                $this->dispatch('activityMonitor', $activity->id);
             }
         } catch (\Throwable $e) {
             $this->validated = false;

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -9,6 +9,7 @@ use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Illuminate\Support\Str;
@@ -18,7 +19,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public $current_step = 'private_keys';
     public $parameters;
     public $query;
-    public $private_keys;
+    public $private_keys =[];
     public int $private_key_id;
 
     public int $port = 3000;
@@ -33,6 +34,11 @@ class GithubPrivateRepositoryDeployKey extends Component
     public $build_pack = 'nixpacks';
     public bool $show_is_static = true;
 
+    private object $repository_url_parsed;
+    private GithubApp|GitlabApp|string $git_source = 'other';
+    private ?string $git_host = null;
+    private string $git_repository;
+
     protected $rules = [
         'repository_url' => 'required',
         'branch' => 'required|string',
@@ -49,10 +55,7 @@ class GithubPrivateRepositoryDeployKey extends Component
         'publish_directory' => 'Publish directory',
         'build_pack' => 'Build pack',
     ];
-    private object $repository_url_parsed;
-    private GithubApp|GitlabApp|string $git_source = 'other';
-    private ?string $git_host = null;
-    private string $git_repository;
+
 
     public function mount()
     {

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', [

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

@@ -57,7 +57,7 @@ class Navbar extends Component
         }
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
     public function stop(bool $forceCleanup = false)
     {
@@ -82,6 +82,6 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
 }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -5,7 +5,7 @@ namespace App\Livewire\Project\Service;
 use App\Models\ServiceApplication;
 use Livewire\Component;
 
-class Application extends Component
+class ServiceApplicationView extends Component
 {
     public ServiceApplication $application;
     public $parameters;
@@ -20,7 +20,7 @@ class Application extends Component
     ];
     public function render()
     {
-        return view('livewire.project.service.application');
+        return view('livewire.project.service.service-application-view');
     }
     public function instantSave()
     {

app/Livewire/Project/Shared/Destination.php

@@ -2,11 +2,83 @@
 
 namespace App\Livewire\Project\Shared;
 
+use App\Actions\Application\StopApplicationOneServer;
+use App\Events\ApplicationStatusChanged;
+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);
+        });
+    }
+    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,
+            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 addServer(int $network_id, int $server_id)
+    {
+        $this->resource->additional_networks()->attach($network_id, ['server_id' => $server_id]);
+        $this->resource->load(['additional_networks']);
+        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+        $this->loadData();
+    }
+    public function removeServer(int $network_id, int $server_id)
+    {
+        if ($this->resource->destination->server->id == $server_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->resource->load(['additional_networks']);
+        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+        $this->loadData();
+    }
 }

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

@@ -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/ExecuteContainerCommand.php

@@ -115,7 +115,7 @@ class ExecuteContainerCommand extends Component
                 $exec = "docker exec {$this->container} {$cmd}";
             }
             $activity = remote_process([$exec], $this->server, ignore_errors: true);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/Tags.php

@@ -37,12 +37,13 @@ class Tags extends Component
             return handleError($e, $this);
         }
     }
-    public function deleteTag($id, $name)
+    public function deleteTag(string $id)
     {
         try {
-            $found_more_tags = Tag::where(['name' => $name, 'team_id' => currentTeam()->id])->first();
             $this->resource->tags()->detach($id);
-            if ($found_more_tags->resources()->get()->count() == 0) {
+
+            $found_more_tags = Tag::where(['id' => $id, 'team_id' => currentTeam()->id])->first();
+            if ($found_more_tags->applications()->count() == 0 && $found_more_tags->services()->count() == 0){
                 $found_more_tags->delete();
             }
             $this->refresh();
@@ -53,6 +54,7 @@ class Tags extends Component
     public function refresh()
     {
         $this->resource->load(['tags']);
+        $this->tags = Tag::ownedByCurrentTeam()->get();
         $this->new_tag = null;
     }
     public function submit()

app/Livewire/RunCommand.php

@@ -31,7 +31,7 @@ class RunCommand extends Component
         $this->validate();
         try {
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Form.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Server;
 
-use App\Actions\Server\InstallDocker;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,7 +13,8 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
-    protected $listeners = ['serverRefresh'];
+
+    protected $listeners = ['serverInstalled'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -28,6 +28,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 +43,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()
@@ -49,9 +52,10 @@ class Form extends Component
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
-    public function serverRefresh($install = true)
+    public function serverInstalled()
     {
-        $this->validateServer($install);
+        $this->server->refresh();
+        $this->server->settings->refresh();
     }
     public function instantSave()
     {
@@ -64,13 +68,6 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-    public function installDocker()
-    {
-        $this->dispatch('installDocker');
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->server);
-        $this->dispatch('newMonitorActivity', $activity->id);
-    }
     public function checkLocalhostConnection()
     {
         $uptime = $this->server->validateConnection();
@@ -80,48 +77,13 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable.<br>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.');
+            $this->dispatch('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;
         }
     }
     public function validateServer($install = true)
     {
-        try {
-            $uptime = $this->server->validateConnection();
-            if (!$uptime) {
-                $install &&  $this->dispatch('error', 'Server is not reachable.<br>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;
-            }
-            $supported_os_type = $this->server->validateOS();
-            if (!$supported_os_type) {
-                $install && $this->dispatch('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.');
-                return;
-            }
-            $dockerInstalled = $this->server->validateDockerEngine();
-            if ($dockerInstalled) {
-                $install && $this->dispatch('success', 'Docker Engine is installed.<br> Checking version.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            $dockerVersion = $this->server->validateDockerEngineVersion();
-            if ($dockerVersion) {
-                $install && $this->dispatch('success', 'Docker Engine version is 22+.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            if ($this->server->isSwarm()) {
-                $swarmInstalled = $this->server->validateDockerSwarm();
-                if ($swarmInstalled) {
-                    $install && $this->dispatch('success', 'Docker Swarm is initiated.');
-                }
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->dispatch('proxyStatusUpdated');
-        }
+        $this->dispatch('validateServer', $install);
     }
 
     public function submit()

app/Livewire/Server/Proxy/Deploy.php

@@ -71,7 +71,7 @@ class Deploy extends Component
     {
         try {
             $activity = StartProxy::run($this->server);
-            $this->dispatch('newMonitorActivity', $activity->id, ProxyStatusChanged::class);
+            $this->dispatch('activityMonitor', $activity->id, ProxyStatusChanged::class);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Proxy/Status.php

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

app/Livewire/Server/Show.php

@@ -11,7 +11,7 @@ class Show extends Component
     use AuthorizesRequests;
     public ?Server $server = null;
     public $parameters = [];
-    protected $listeners = ['proxyStatusUpdated' => '$refresh'];
+    protected $listeners = ['serverInstalled' => '$refresh'];
     public function mount()
     {
         $this->parameters = get_route_parameters();

app/Livewire/Server/ShowPrivateKey.php

@@ -39,7 +39,7 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh#openssh">documentation</a> for further help.');
                 return;
             }
         } catch (\Throwable $e) {

app/Livewire/Server/ValidateAndInstall.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Actions\Proxy\StartProxy;
+use App\Models\Server;
+use Livewire\Component;
+
+class ValidateAndInstall extends Component
+{
+    public Server $server;
+    public int $number_of_tries = 0;
+    public int $max_tries = 1;
+    public bool $install = true;
+    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;
+
+    protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
+
+    public function init(bool $install = true)
+    {
+
+        $this->install = $install;
+        $this->uptime = null;
+        $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');
+    }
+
+    public function validateServer()
+    {
+        try {
+            $this->validateConnection();
+            $this->validateOS();
+            $this->validateDockerEngine();
+
+            if ($this->server->isSwarm()) {
+                $swarmInstalled = $this->server->validateDockerSwarm();
+                if ($swarmInstalled) {
+                    $this->dispatch('success', 'Docker Swarm is initiated.');
+                }
+            } else {
+                $proxy = StartProxy::run($this->server);
+                if ($proxy) {
+                    $this->proxy_started = true;
+                }
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function validateConnection()
+    {
+        $this->uptime = $this->server->validateConnection();
+        if (!$this->uptime) {
+            $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;
+        }
+    }
+    public function validateOS()
+    {
+        $this->supported_os_type = $this->server->validateOS();
+        if (!$this->supported_os_type) {
+            $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;
+        }
+    }
+    public function validateDockerEngine()
+    {
+        $this->docker_installed = $this->server->validateDockerEngine();
+        $this->docker_compose_installed = $this->server->validateDockerCompose();
+        if (!$this->docker_installed || !$this->docker_compose_installed) {
+            if ($this->install) {
+                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');
+                    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();
+        }
+    }
+    public function validateDockerVersion()
+    {
+        $this->docker_version = $this->server->validateDockerEngineVersion();
+        if ($this->docker_version) {
+            $this->dispatch('serverInstalled');
+            $this->dispatch('success', 'Server validated successfully.');
+        } 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;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.validate-and-install');
+    }
+}

app/Livewire/Tags/Show.php

@@ -9,15 +9,30 @@ use Livewire\Component;
 
 class Show extends Component
 {
+    public $tags;
     public Tag $tag;
-    public $resources;
+    public $applications;
+    public $services;
     public $webhook = null;
     public $deployments_per_tag_per_server = [];
 
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get()->unique('name')->sortBy('name');
+        $tag = $this->tags->where('name', request()->tag_name)->first();
+        if (!$tag) {
+            return redirect()->route('tags.index');
+        }
+        $this->webhook = generatTagDeployWebhook($tag->name);
+        $this->applications = $tag->applications()->get();
+        $this->services = $tag->services()->get();
+        $this->tag = $tag;
+        $this->get_deployments();
+    }
     public function get_deployments()
     {
         try {
-            $resource_ids = $this->resources->pluck('id');
+            $resource_ids = $this->applications->pluck('id');
             $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([
                 "id",
                 "application_id",
@@ -35,26 +50,21 @@ class Show extends Component
     public function redeploy_all()
     {
         try {
-            $this->resources->each(function ($resource) {
+            $message = collect([]);
+            $this->applications->each(function ($resource) use ($message) {
                 $deploy = new Deploy();
-                $deploy->deploy_resource($resource);
+                $message->push($deploy->deploy_resource($resource));
+            });
+            $this->services->each(function ($resource) use ($message) {
+                $deploy = new Deploy();
+                $message->push($deploy->deploy_resource($resource));
             });
             $this->dispatch('success', 'Mass deployment started.');
         } catch (\Exception $e) {
             return handleError($e, $this);
         }
     }
-    public function mount()
-    {
-        $tag = Tag::ownedByCurrentTeam()->where('name', request()->tag_name)->first();
-        if (!$tag) {
-            return redirect()->route('tags.index');
-        }
-        $this->webhook = generatTagDeployWebhook($tag->name);
-        $this->resources = $tag->resources()->get();
-        $this->tag = $tag;
-        $this->get_deployments();
-    }
+
     public function render()
     {
         return view('livewire.tags.show');

app/Models/Application.php

@@ -15,7 +15,6 @@ class Application extends BaseModel
 {
     use SoftDeletes;
     protected $guarded = [];
-
     protected static function booted()
     {
         static::saving(function ($application) {
@@ -53,6 +52,16 @@ class Application extends BaseModel
         });
     }
 
+    public function additional_servers()
+    {
+        return $this->belongsToMany(Server::class, 'additional_destinations')
+            ->withPivot('standalone_docker_id', 'status');
+    }
+    public function additional_networks()
+    {
+        return $this->belongsToMany(StandaloneDocker::class, 'additional_destinations')
+            ->withPivot('server_id', 'status');
+    }
     public function is_github_based(): bool
     {
         if (data_get($this, 'source')) {
@@ -191,9 +200,6 @@ class Application extends BaseModel
             set: fn ($value) => $value === "" ? null : $value,
         );
     }
-
-    // Normal Deployments
-
     public function portsMappingsArray(): Attribute
     {
         return Attribute::make(
@@ -203,6 +209,79 @@ class Application extends BaseModel
 
         );
     }
+    public function realStatus()
+    {
+        return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if ($this->additional_servers->count() === 0) {
+                    if (str($value)->contains('(')) {
+                        $status = str($value)->before('(')->trim()->value();
+                        $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                    } else if (str($value)->contains(':')) {
+                        $status = str($value)->before(':')->trim()->value();
+                        $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                    } else {
+                        $status = $value;
+                        $health = 'unhealthy';
+                    }
+                    return "$status:$health";
+                } else {
+                    if (str($value)->contains('(')) {
+                        $status = str($value)->before('(')->trim()->value();
+                        $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                    } else if (str($value)->contains(':')) {
+                        $status = str($value)->before(':')->trim()->value();
+                        $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                    } else {
+                        $status = $value;
+                        $health = 'unhealthy';
+                    }
+                    return "$status:$health";
+                }
+            },
+            get: function ($value) {
+                if ($this->additional_servers->count() === 0) {
+                    //running (healthy)
+                    if (str($value)->contains('(')) {
+                        $status = str($value)->before('(')->trim()->value();
+                        $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                    } else if (str($value)->contains(':')) {
+                        $status = str($value)->before(':')->trim()->value();
+                        $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                    } else {
+                        $status = $value;
+                        $health = 'unhealthy';
+                    }
+                    return "$status:$health";
+                } else {
+                    $complex_status = null;
+                    $complex_health = null;
+                    $complex_status = $main_server_status = str($value)->before(':')->value();
+                    $complex_health = $main_server_health = str($value)->after(':')->value() ?? 'unhealthy';
+                    $additional_servers_status = $this->additional_servers->pluck('pivot.status');
+                    foreach ($additional_servers_status as $status) {
+                        $server_status = str($status)->before(':')->value();
+                        $server_health = str($status)->after(':')->value() ?? 'unhealthy';
+                        if ($server_status !== 'running') {
+                            if ($main_server_status !== $server_status) {
+                                $complex_status = 'degraded';
+                            }
+                        }
+                        if ($server_health !== 'healthy') {
+                            if ($main_server_health !== $server_health) {
+                                $complex_health = 'unhealthy';
+                            }
+                        }
+                    }
+                    return "$complex_status:$complex_health";
+                }
+            },
+        );
+    }
 
     public function portsExposesArray(): Attribute
     {
@@ -216,6 +295,10 @@ class Application extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
@@ -432,7 +515,7 @@ class Application extends BaseModel
     {
         return "/artifacts/{$uuid}";
     }
-       function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
+    function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
     {
         $baseDir = $this->generateBaseDir($deployment_uuid);
         if ($this->git_commit_sha !== 'HEAD') {

app/Models/Environment.php

@@ -13,6 +13,8 @@ class Environment extends Model
         return $this->applications()->count() == 0 &&
             $this->redis()->count() == 0 &&
             $this->postgresqls()->count() == 0 &&
+            $this->mysqls()->count() == 0 &&
+            $this->mariadbs()->count() == 0 &&
             $this->mongodbs()->count() == 0 &&
             $this->services()->count() == 0;
     }

app/Models/LocalFileVolume.php

@@ -10,12 +10,19 @@ class LocalFileVolume extends BaseModel
     use HasFactory;
     protected $guarded = [];
 
+    protected static function booted()
+    {
+        static::created(function (LocalFileVolume $fileVolume) {
+            $fileVolume->saveStorageOnServer($fileVolume->service);
+        });
+    }
     public function service()
     {
         return $this->morphTo('resource');
     }
     public function saveStorageOnServer(ServiceApplication|ServiceDatabase $service)
     {
+        ray('saveStorageOnServer');
         $workdir = $service->service->workdir();
         $server = $service->service->server;
         $commands = collect([
@@ -39,7 +46,7 @@ class LocalFileVolume extends BaseModel
         if (!$fileVolume->is_directory && $isDir == 'NOK') {
             $content = base64_encode($content);
             $commands->push("echo '$content' | base64 -d > $path");
-         } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
+        } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
             $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
         }
         ray($commands->toArray());

app/Models/Server.php

@@ -2,12 +2,14 @@
 
 namespace App\Models;
 
+use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Notifications\Server\Revived;
 use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Facades\DB;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -247,9 +249,17 @@ class Server extends BaseModel
     }
     public function applications()
     {
-        return $this->destinations()->map(function ($standaloneDocker) {
+        $applications = $this->destinations()->map(function ($standaloneDocker) {
             return $standaloneDocker->applications;
         })->flatten();
+        $additionalApplicationIds = DB::table('additional_destinations')->where('server_id', $this->id)->get('application_id');
+        $additionalApplicationIds = collect($additionalApplicationIds)->map(function ($item) {
+            return $item->application_id;
+        });
+        Application::whereIn('id', $additionalApplicationIds)->get()->each(function ($application) use ($applications) {
+            $applications->push($application);
+        });
+        return $applications;
     }
     public function dockerComposeBasedApplications()
     {
@@ -299,7 +309,8 @@ class Server extends BaseModel
     {
         $standalone_docker = $this->hasMany(StandaloneDocker::class)->get();
         $swarm_docker = $this->hasMany(SwarmDocker::class)->get();
-        return $standalone_docker->concat($swarm_docker);
+        $asd = $this->belongsToMany(StandaloneDocker::class, 'additional_destinations')->withPivot('server_id')->get();
+        return $standalone_docker->concat($swarm_docker)->concat($asd);
     }
 
     public function standaloneDockers()
@@ -411,6 +422,11 @@ class Server extends BaseModel
 
         return true;
     }
+    public function installDocker()
+    {
+        $activity = InstallDocker::run($this);
+        return $activity;
+    }
     public function validateDockerEngine($throwError = false)
     {
         $dockerBinary = instant_remote_process(["command -v docker"], $this, false);
@@ -427,6 +443,21 @@ class Server extends BaseModel
         $this->validateCoolifyNetwork(isSwarm: false, isBuildServer: $this->settings->is_build_server);
         return true;
     }
+    public function validateDockerCompose($throwError = false)
+    {
+        $dockerCompose = instant_remote_process(["docker compose version"], $this, false);
+        if (is_null($dockerCompose)) {
+            $this->settings->is_usable = false;
+            $this->settings->save();
+            if ($throwError) {
+                throw new \Exception('Server is not usable. Docker Compose is not installed.');
+            }
+            return false;
+        }
+        $this->settings->is_usable = true;
+        $this->settings->save();
+        return true;
+    }
     public function validateDockerSwarm()
     {
         $swarmStatus = instant_remote_process(["docker info|grep -i swarm"], $this, false);

app/Models/Service.php

@@ -16,6 +16,10 @@ class Service extends BaseModel
     {
         return 'service';
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandaloneMariadb.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneMariadb extends BaseModel
 {
-    use HasFactory,SoftDeletes;
+    use HasFactory, SoftDeletes;
 
     protected $guarded = [];
     protected $casts = [
@@ -43,7 +43,41 @@ class StandaloneMariadb extends BaseModel
             $database->tags()->detach();
         });
     }
-
+    public function realStatus()
+    {
+       return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+            get: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+        );
+    }
     public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');

app/Models/StandaloneMongodb.php

@@ -46,7 +46,41 @@ class StandaloneMongodb extends BaseModel
             $database->tags()->detach();
         });
     }
-
+    public function realStatus()
+    {
+       return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+            get: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+        );
+    }
     public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');

app/Models/StandaloneMysql.php

@@ -43,7 +43,41 @@ class StandaloneMysql extends BaseModel
             $database->tags()->detach();
         });
     }
-
+    public function realStatus()
+    {
+       return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+            get: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+        );
+    }
     public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');

app/Models/StandalonePostgresql.php

@@ -43,7 +43,41 @@ class StandalonePostgresql extends BaseModel
             $database->tags()->detach();
         });
     }
-
+    public function realStatus()
+    {
+        return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+            get: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+        );
+    }
     public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');

app/Models/StandaloneRedis.php

@@ -38,7 +38,41 @@ class StandaloneRedis extends BaseModel
             $database->tags()->detach();
         });
     }
-
+    public function realStatus()
+    {
+        return $this->getRawOriginal('status');
+    }
+    public function status(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+            get: function ($value) {
+                if (str($value)->contains('(')) {
+                    $status = str($value)->before('(')->trim()->value();
+                    $health = str($value)->after('(')->before(')')->trim()->value() ?? 'unhealthy';
+                } else if (str($value)->contains(':')) {
+                    $status = str($value)->before(':')->trim()->value();
+                    $health = str($value)->after(':')->trim()->value() ?? 'unhealthy';
+                } else {
+                    $status = $value;
+                    $health = 'unhealthy';
+                }
+                return "$status:$health";
+            },
+        );
+    }
     public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');

app/Models/Tag.php

@@ -24,9 +24,8 @@ class Tag extends BaseModel
     {
         return $this->morphedByMany(Application::class, 'taggable');
     }
-
-    public function resources() {
-        return $this->applications();
+    public function services()
+    {
+        return $this->morphedByMany(Service::class, 'taggable');
     }
-
 }

bootstrap/helpers/applications.php

@@ -1,23 +1,35 @@
 <?php
 
+use App\Enums\ApplicationDeploymentStatus;
 use App\Jobs\ApplicationDeploymentJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
+use App\Models\StandaloneDocker;
 use Spatie\Url\Url;
 
-function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null)
+function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null)
 {
     $application_id = $application->id;
     $deployment_link = Url::fromString($application->link() . "/deployment/{$deployment_uuid}");
     $deployment_url = $deployment_link->getPath();
     $server_id = $application->destination->server->id;
     $server_name = $application->destination->server->name;
+    $destination_id = $application->destination->id;
+
+    if ($server) {
+        $server_id = $server->id;
+        $server_name = $server->name;
+    }
+    if ($destination) {
+        $destination_id = $destination->id;
+    }
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
         'application_name' => $application->name,
         'server_id' => $server_id,
         'server_name' => $server_name,
+        'destination_id' => $destination_id,
         'deployment_uuid' => $deployment_uuid,
         'deployment_url' => $deployment_url,
         'pull_request_id' => $pull_request_id,
@@ -28,18 +40,39 @@ function queue_application_deployment(Application $application, string $deployme
         'git_type' => $git_type
     ]);
 
-    if (next_queuable($server_id, $application_id)) {
+    if ($no_questions_asked) {
+        $deployment->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
+        dispatch(new ApplicationDeploymentJob(
+            application_deployment_queue_id: $deployment->id,
+        ));
+    } else if (next_queuable($server_id, $application_id)) {
+        $deployment->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $deployment->id,
         ));
     }
 }
-
+function force_start_deployment(ApplicationDeploymentQueue $deployment)
+{
+    $deployment->update([
+        'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+    ]);
+    dispatch(new ApplicationDeploymentJob(
+        application_deployment_queue_id: $deployment->id,
+    ));
+}
 function queue_next_deployment(Application $application)
 {
     $server_id = $application->destination->server_id;
     $next_found = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->get()->sortBy('created_at')->first();
     if ($next_found) {
+        $next_found->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $next_found->id,
         ));

bootstrap/helpers/constants.php

@@ -13,6 +13,11 @@ const VALID_CRON_STRINGS = [
 const RESTART_MODE = 'unless-stopped';
 
 const DATABASE_DOCKER_IMAGES = [
+    'bitnami/mariadb',
+    'bitnami/mongodb',
+    'bitnami/mysql',
+    'bitnami/postgresql',
+    'bitnami/redis',
     'mysql',
     'mariadb',
     'postgres',

bootstrap/helpers/docker.php

@@ -340,25 +340,20 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
         '--cap-drop' => 'cap_drop',
         '--security-opt' => 'security_opt',
         '--sysctl' => 'sysctls',
-        '--device' => 'devices',
         '--ulimit' => 'ulimits',
+        '--device' => 'devices',
         '--init' => 'init',
         '--ulimit' => 'ulimits',
         '--privileged' => 'privileged',
     ]);
     foreach ($matches as $match) {
         $option = $match[1];
-        $value = isset($match[2]) && $match[2] !== '' ? $match[2] : true;
-        if ($list_options->contains($option)) {
-            $value = explode(',', $value);
-        }
-        if (array_key_exists($option, $options)) {
-            if (is_array($options[$option])) {
-                $options[$option][] = $value;
-            } else {
-                $options[$option] = [$options[$option], $value];
-            }
+        if (isset($match[2]) && $match[2] !== '') {
+            $value = $match[2];
+            $options[$option][] = $value;
+            $options[$option] = array_unique($options[$option]);
         } else {
+            $value = true;
             $options[$option] = $value;
         }
     }
@@ -370,7 +365,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
         }
         if ($option === '--ulimit') {
             $ulimits = collect([]);
-            collect($value)->map(function ($ulimit) use ($ulimits){
+            collect($value)->map(function ($ulimit) use ($ulimits) {
                 $ulimit = explode('=', $ulimit);
                 $type = $ulimit[0];
                 $limits = explode(':', $ulimit[1]);
@@ -381,7 +376,6 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
                         'soft' => $soft_limit,
                         'hard' => $hard_limit
                     ]);
-
                 } else {
                     $soft_limit = $ulimit[1];
                     $ulimits->put($type, [

bootstrap/helpers/shared.php

@@ -104,7 +104,7 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     ray($error);
     if ($error instanceof TooManyRequestsException) {
         if (isset($livewire)) {
-            return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
+            return $livewire->dispatch('error', "Too many requests.", "Please try again in {$error->secondsUntilAvailable} seconds.");
         }
         return "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.";
     }
@@ -298,10 +298,8 @@ function validate_cron_expression($expression_to_validate): bool
 function send_internal_notification(string $message): void
 {
     try {
-        $baseUrl = config('app.name');
         $team = Team::find(0);
-        $team?->notify(new GeneralNotification("👀 {$baseUrl}: " . $message));
-        ray("👀 {$baseUrl}: " . $message);
+        $team?->notify(new GeneralNotification($message));
     } catch (\Throwable $e) {
         ray($e->getMessage());
     }
@@ -784,14 +782,14 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $source = data_get_str($volume, 'source');
                             $target = data_get_str($volume, 'target');
                             $content = data_get($volume, 'content');
-                            $isDirectory = (bool) data_get($volume, 'isDirectory', false);
+                            $isDirectory = (bool) data_get($volume, 'isDirectory', false) || (bool) data_get($volume, 'is_directory', false);
                             $foundConfig = $savedService->fileStorages()->whereMountPath($target)->first();
                             if ($foundConfig) {
                                 $contentNotNull = data_get($foundConfig, 'content');
                                 if ($contentNotNull) {
                                     $content = $contentNotNull;
                                 }
-                                $isDirectory = (bool) data_get($foundConfig, 'is_directory');
+                                $isDirectory = (bool) data_get($volume, 'isDirectory', false) || (bool) data_get($volume, 'is_directory', false);
                             }
                         }
                         if ($type->value() === 'bind') {
@@ -1056,6 +1054,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 data_set($service, 'container_name', $containerName);
                 data_forget($service, 'volumes.*.content');
                 data_forget($service, 'volumes.*.isDirectory');
+                data_forget($service, 'volumes.*.is_directory');
+
                 // Remove unnecessary variables from service.environment
                 // $withoutServiceEnvs = collect([]);
                 // collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
@@ -1692,7 +1692,7 @@ function check_fqdn_usage(ServiceApplication|Application $own_resource)
             $naked_domain = str($domain)->replace('http://', '')->replace('https://', '')->value();
             if ($domains->contains($naked_domain)) {
                 if ($app->uuid !== $own_resource->uuid) {
-                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource.");
+                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource:<br> {$app->name}.");
                 }
             }
         }

config/coolify.php

@@ -3,6 +3,7 @@
 return [
     'docs' => 'https://coolify.io/docs/',
     'contact' => 'https://coolify.io/docs/contact',
+    'feedback_discord_webhook' => env('FEEDBACK_DISCORD_WEBHOOK'),
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',

config/queue.php

@@ -65,7 +65,7 @@ return [
             'driver' => 'redis',
             'connection' => 'default',
             'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 3600,
+            'retry_after' => 86400,
             'block_for' => null,
             'after_commit' => true,
         ],

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.205',
+    'release' => '4.0.0-beta.215',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.205';
+return '4.0.0-beta.215';

database/migrations/2024_02_01_111228_create_tags_table.php

@@ -24,7 +24,6 @@ return new class extends Migration
             $table->string('taggable_type');
             $table->foreign('tag_id')->references('id')->on('tags')->onDelete('cascade');
             $table->unique(['tag_id', 'taggable_id', 'taggable_type'], 'taggable_unique'); // Composite unique index
-
         });
     }
 

database/migrations/2024_02_05_105215_add_destination_to_app_deployments.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->string('destination_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('destination_id');
+        });
+    }
+};

database/migrations/2024_02_06_132748_add_additional_destinations.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('additional_destinations', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('application_id')->constrained()->onDelete('cascade');
+            $table->foreignId('server_id')->constrained()->onDelete('cascade');
+            $table->string('status')->default('exited');
+            $table->foreignId('standalone_docker_id')->constrained()->onDelete('cascade');
+            $table->timestamps();
+        });
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('additional_destinations');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('additional_destinations');
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('additional_destinations')->nullable()->after('destination');
+        });
+    }
+};

database/migrations/2024_02_08_112304_add_dynamic_timeout_for_deployments.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->integer('dynamic_timeout')->default(3600);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('dynamic_timeout');
+        });
+    }
+};

docker-compose.prod.yml

@@ -46,6 +46,7 @@ services:
       - PUSHER_APP_SECRET
       - AUTOUPDATE
       - SELF_HOSTED
+      - FEEDBACK_DISCORD_WEBHOOK
       - WAITLIST
       - SUBSCRIPTION_PROVIDER
       - STRIPE_API_KEY

docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up

@@ -1,3 +1,3 @@
 #!/command/execlineb -P
 s6-setuidgid webuser
-php /var/www/html/artisan app:init --cleanup
+php /var/www/html/artisan app:init --full-cleanup

package-lock.json

@@ -7,7 +7,7 @@
             "dependencies": {
                 "@tailwindcss/typography": "0.5.10",
                 "alpinejs": "3.13.5",
-                "daisyui": "4.4.19",
+                "daisyui": "4.7.2",
                 "ioredis": "5.3.2",
                 "tailwindcss-scrollbar": "0.1.0"
             },
@@ -17,11 +17,11 @@
                 "axios": "1.6.7",
                 "laravel-echo": "1.15.3",
                 "laravel-vite-plugin": "0.8.1",
-                "postcss": "8.4.33",
+                "postcss": "8.4.35",
                 "pusher-js": "8.4.0-rc2",
                 "tailwindcss": "3.4.1",
                 "vite": "4.5.2",
-                "vue": "3.4.15"
+                "vue": "3.4.19"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -524,77 +524,77 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
-            "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.19.tgz",
+            "integrity": "sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.6",
-                "@vue/shared": "3.4.15",
+                "@babel/parser": "^7.23.9",
+                "@vue/shared": "3.4.19",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
-            "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.19.tgz",
+            "integrity": "sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.15",
-                "@vue/shared": "3.4.15"
+                "@vue/compiler-core": "3.4.19",
+                "@vue/shared": "3.4.19"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
-            "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz",
+            "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.6",
-                "@vue/compiler-core": "3.4.15",
-                "@vue/compiler-dom": "3.4.15",
-                "@vue/compiler-ssr": "3.4.15",
-                "@vue/shared": "3.4.15",
+                "@babel/parser": "^7.23.9",
+                "@vue/compiler-core": "3.4.19",
+                "@vue/compiler-dom": "3.4.19",
+                "@vue/compiler-ssr": "3.4.19",
+                "@vue/shared": "3.4.19",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.5",
+                "magic-string": "^0.30.6",
                 "postcss": "^8.4.33",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
-            "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz",
+            "integrity": "sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.15",
-                "@vue/shared": "3.4.15"
+                "@vue/compiler-dom": "3.4.19",
+                "@vue/shared": "3.4.19"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -606,64 +606,64 @@
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
-            "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.19.tgz",
+            "integrity": "sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.4.15",
-                "@vue/shared": "3.4.15"
+                "@vue/reactivity": "3.4.19",
+                "@vue/shared": "3.4.19"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
-            "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.19.tgz",
+            "integrity": "sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.4.15"
+                "@vue/shared": "3.4.19"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
-            "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.19.tgz",
+            "integrity": "sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.4.15",
-                "@vue/shared": "3.4.15",
+                "@vue/runtime-core": "3.4.19",
+                "@vue/shared": "3.4.19",
                 "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
-            "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.19.tgz",
+            "integrity": "sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.4.15",
-                "@vue/shared": "3.4.15"
+                "@vue/compiler-ssr": "3.4.19",
+                "@vue/shared": "3.4.19"
             },
             "peerDependencies": {
-                "vue": "3.4.15"
+                "vue": "3.4.19"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -953,9 +953,9 @@
             }
         },
         "node_modules/daisyui": {
-            "version": "4.4.19",
-            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.19.tgz",
-            "integrity": "sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA==",
+            "version": "4.7.2",
+            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.7.2.tgz",
+            "integrity": "sha512-9UCss12Zmyk/22u+JbkVrHHxOzFOyY17HuqP5LeswI4hclbj6qbjJTovdj2zRy8cCH6/n6Wh0lTLjriGnyGh0g==",
             "dependencies": {
                 "css-selector-tokenizer": "^0.8",
                 "culori": "^3",
@@ -1410,9 +1410,9 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
         "node_modules/magic-string": {
-            "version": "0.30.5",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+            "version": "0.30.7",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
+            "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
@@ -1598,9 +1598,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.33",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+            "version": "8.4.35",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+            "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -2106,16 +2106,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
-            "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.19.tgz",
+            "integrity": "sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.15",
-                "@vue/compiler-sfc": "3.4.15",
-                "@vue/runtime-dom": "3.4.15",
-                "@vue/server-renderer": "3.4.15",
-                "@vue/shared": "3.4.15"
+                "@vue/compiler-dom": "3.4.19",
+                "@vue/compiler-sfc": "3.4.19",
+                "@vue/runtime-dom": "3.4.19",
+                "@vue/server-renderer": "3.4.19",
+                "@vue/shared": "3.4.19"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2127,9 +2127,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.4.15",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-            "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -11,16 +11,16 @@
         "axios": "1.6.7",
         "laravel-echo": "1.15.3",
         "laravel-vite-plugin": "0.8.1",
-        "postcss": "8.4.33",
+        "postcss": "8.4.35",
         "pusher-js": "8.4.0-rc2",
         "tailwindcss": "3.4.1",
         "vite": "4.5.2",
-        "vue": "3.4.15"
+        "vue": "3.4.19"
     },
     "dependencies": {
         "@tailwindcss/typography": "0.5.10",
         "alpinejs": "3.13.5",
-        "daisyui": "4.4.19",
+        "daisyui": "4.7.2",
         "ioredis": "5.3.2",
         "tailwindcss-scrollbar": "0.1.0"
     }

resources/css/app.css

@@ -76,7 +76,7 @@ a {
 }
 
 .box {
-    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] bg-coolgray-100 hover:bg-coollabs-100 hover:text-white hover:no-underline min-w-[24rem];
+    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] bg-coolgray-100 hover:bg-coollabs-100 hover:text-white hover:no-underline;
 }
 
 .box-without-bg {

resources/views/components/applications/links.blade.php

@@ -28,8 +28,8 @@
                                     <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
                                         target="_blank" href="{{ getFqdnWithoutPort($domain) }}">
                                         <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
-                                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                                            stroke-linejoin="round">
+                                            stroke-width="1.5" stroke="currentColor" fill="none"
+                                            stroke-linecap="round" stroke-linejoin="round">
                                             <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                                             <path d="M9 15l6 -6" />
                                             <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
@@ -84,7 +84,7 @@
                 @endif
                 @if (data_get($application, 'ports_mappings_array'))
                     @foreach ($application->ports_mappings_array as $port)
-                        @if (isDev())
+                        @if ($application->destination->server->id === 0)
                             <li>
                                 <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
                                     target="_blank" href="http://localhost:{{ explode(':', $port)[0] }}">
@@ -114,9 +114,29 @@
                                         <path
                                             d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
                                     </svg>
-                                    Port {{ $port }}
+                                    {{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}
                                 </a>
                             </li>
+                            @if (count($application->additional_servers) > 0)
+                                @foreach ($application->additional_servers as $server)
+                                    <li>
+                                        <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                                            target="_blank"
+                                            href="http://{{ $server->ip }}:{{ explode(':', $port)[0] }}">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                                stroke-width="1.5" stroke="currentColor" fill="none"
+                                                stroke-linecap="round" stroke-linejoin="round">
+                                                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                                <path d="M9 15l6 -6" />
+                                                <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
+                                                <path
+                                                    d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
+                                            </svg>
+                                            {{ $server->ip }}:{{ explode(':', $port)[0] }}
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
                         @endif
                     @endforeach
                 @endif

resources/views/components/databases/navbar.blade.php

@@ -22,7 +22,7 @@
         </a>
     @endif
     <div class="flex-1"></div>
-    @if ($database->status !== 'exited')
+    @if (!str($database->status)->startsWith('exited'))
         <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">

resources/views/components/navbar-subscription.blade.php

@@ -26,24 +26,18 @@
             </li>
             <li title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
                 <div class="justify-center" wire:click="help" onclick="help.showModal()">
-                    <svg class="w-5 h-5" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                    <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                         <path fill="currentColor"
-                            d="M22 5.5H9c-1.1 0-2 .9-2 2v9a2 2 0 0 0 2 2h13c1.11 0 2-.89 2-2v-9a2 2 0 0 0-2-2m0 11H9V9.17l6.5 3.33L22 9.17v7.33m-6.5-5.69L9 7.5h13l-6.5 3.31M5 16.5c0 .17.03.33.05.5H1c-.552 0-1-.45-1-1s.448-1 1-1h4v1.5M3 7h2.05c-.02.17-.05.33-.05.5V9H3c-.55 0-1-.45-1-1s.45-1 1-1m-2 5c0-.55.45-1 1-1h3v2H2c-.55 0-1-.45-1-1Z" />
+                            d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88" />
                     </svg>
-                    Feedback
                 </div>
             </li>
             <li class="pb-6" title="Logout">
-                <form action="/logout" method="POST" class=" hover:bg-transparent">
+                <form action="/logout" method="POST" class="hover:bg-transparent">
                     @csrf
                     <button class="flex items-center gap-2 rounded-none hover:text-white hover:bg-transparent">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path d="M13 12v.01" />
-                            <path d="M3 21h18" />
-                            <path d="M5 21v-16a2 2 0 0 1 2 -2h7.5m2.5 10.5v7.5" />
-                            <path d="M14 7h7m-3 -3l3 3l-3 3" />
+                        <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor" d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22m7-6v-3h-8v-2h8V8l5 4z"/>
                         </svg>
                     </button>
                 </form>

resources/views/components/navbar.blade.php

@@ -1,5 +1,5 @@
 @auth
-    <nav class="fixed h-full overflow-hidden overflow-y-auto pt-28 scrollbar">
+    <nav class="fixed h-full pt-28 scrollbar">
         <a href="/" class="fixed top-0 z-50 mx-3 mt-3 bg-transparent cursor-pointer"><img
                 class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
         <ul class="flex flex-col h-full gap-4 menu flex-nowrap">
@@ -40,62 +40,142 @@
                     </svg>
                 </a>
             </li>
-            <li title="Command Center">
-                <a class="hover:bg-transparent" href="/command-center">
-                    <svg xmlns="http://www.w3.org/2000/svg"
-                        class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
-                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                        stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <path d="M5 7l5 5l-5 5" />
-                        <path d="M12 19l7 0" />
-                    </svg>
-                </a>
-            </li>
-            <li title="Source">
-                <a class="hover:bg-transparent" href="{{ route('source.all') }}">
-                    <svg class="icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor"
-                            d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" />
-                    </svg>
-                </a>
-            </li>
-            <li title="Security">
-                <a class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
-                    <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2"
-                            d="m16.555 3.843l3.602 3.602a2.877 2.877 0 0 1 0 4.069l-2.643 2.643a2.877 2.877 0 0 1-4.069 0l-.301-.301l-6.558 6.558a2 2 0 0 1-1.239.578L5.172 21H4a1 1 0 0 1-.993-.883L3 20v-1.172a2 2 0 0 1 .467-1.284l.119-.13L4 17h2v-2h2v-2l2.144-2.144l-.301-.301a2.877 2.877 0 0 1 0-4.069l2.643-2.643a2.877 2.877 0 0 1 4.069 0zM15 9h.01" />
-                    </svg>
-                </a>
-            </li>
-            <li title="Teams">
-                <a class="hover:bg-transparent" href="{{ route('team.index') }}">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                        stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <path d="M10 13a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
-                        <path d="M8 21v-1a2 2 0 0 1 2 -2h4a2 2 0 0 1 2 2v1" />
-                        <path d="M15 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
-                        <path d="M17 10h2a2 2 0 0 1 2 2v1" />
-                        <path d="M5 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
-                        <path d="M3 13v-1a2 2 0 0 1 2 -2h2" />
-                    </svg>
-                </a>
-            </li>
-            <li title="Tags">
-                <a class="hover:bg-transparent" href="{{ route('tags.index') }}">
-                    <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2">
-                            <path
-                                d="M3 8v4.172a2 2 0 0 0 .586 1.414l5.71 5.71a2.41 2.41 0 0 0 3.408 0l3.592-3.592a2.41 2.41 0 0 0 0-3.408l-5.71-5.71A2 2 0 0 0 9.172 6H5a2 2 0 0 0-2 2" />
-                            <path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" />
-                        </g>
-                    </svg>
-                </a>
-            </li>
+            <div class="inline-block text-left " x-data="{ open: false }">
+                <div>
+                    <button x-on:click.prevent="open = !open" x-on:click.away="open = false" type="button"
+                        class="py-4 mx-4" id="menu-button" aria-expanded="true" aria-haspopup="true">
+                        <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M224 128a8 8 0 0 1-8 8h-80v80a8 8 0 0 1-16 0v-80H40a8 8 0 0 1 0-16h80V40a8 8 0 0 1 16 0v80h80a8 8 0 0 1 8 8" />
+                        </svg>
+                    </button>
+                </div>
+                <div x-show="open" x-cloak
+                    class="absolute left-0 z-10 w-56 mx-4 mt-2 origin-top-right rounded shadow-lg bg-coolgray-100 ring-1 ring-black ring-opacity-5 focus:outline-none"
+                    role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
+                    <div class="py-1" role="none">
+                        <li title="Tags" class="border-transparent hover:bg-coolgray-200 ">
+                            <a class=" hover:bg-transparent hover:no-underline" href="{{ route('tags.index') }}">
+                                <svg class="{{ request()->is('tags*') ? 'text-warning icon' : 'icon' }}"viewBox="0 0 24 24"
+                                    xmlns="http://www.w3.org/2000/svg">
+                                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                        stroke-width="2">
+                                        <path
+                                            d="M3 8v4.172a2 2 0 0 0 .586 1.414l5.71 5.71a2.41 2.41 0 0 0 3.408 0l3.592-3.592a2.41 2.41 0 0 0 0-3.408l-5.71-5.71A2 2 0 0 0 9.172 6H5a2 2 0 0 0-2 2" />
+                                        <path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" />
+                                    </g>
+                                </svg>
+                                Tags
+                            </a>
+                        </li>
+                        <li title="Command Center" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline" href="{{ route('command-center') }}">
+                                <svg xmlns="http://www.w3.org/2000/svg"
+                                    class="{{ request()->is('command-center*') ? 'text-warning icon' : 'icon' }}"
+                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
+                                    stroke-linecap="round" stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M5 7l5 5l-5 5" />
+                                    <path d="M12 19l7 0" />
+                                </svg>
+                                Command Center
+                            </a>
+                        </li>
+                        <li title="Source" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline" href="{{ route('source.all') }}">
+                                <svg class="{{ request()->is('source*') ? 'text-warning icon' : 'icon' }}"
+                                    viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+                                    <path fill="currentColor"
+                                        d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" />
+                                </svg>
+                                Sources
+                            </a>
+                        </li>
+                        <li title="Security" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline"
+                                href="{{ route('security.private-key.index') }}">
+                                <svg class="{{ request()->is('security*') ? 'text-warning icon' : 'icon' }}"
+                                    viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                                    <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                        stroke-linejoin="round" stroke-width="2"
+                                        d="m16.555 3.843l3.602 3.602a2.877 2.877 0 0 1 0 4.069l-2.643 2.643a2.877 2.877 0 0 1-4.069 0l-.301-.301l-6.558 6.558a2 2 0 0 1-1.239.578L5.172 21H4a1 1 0 0 1-.993-.883L3 20v-1.172a2 2 0 0 1 .467-1.284l.119-.13L4 17h2v-2h2v-2l2.144-2.144l-.301-.301a2.877 2.877 0 0 1 0-4.069l2.643-2.643a2.877 2.877 0 0 1 4.069 0zM15 9h.01" />
+                                </svg>
+                                Security
+                            </a>
+                        </li>
+                        <li title="Profile" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline" href="{{ route('profile') }}">
+                                <svg xmlns="http://www.w3.org/2000/svg"
+                                    class="{{ request()->is('profile*') ? 'text-warning icon' : 'icon' }}"
+                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
+                                    stroke-linecap="round" stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0" />
+                                    <path d="M12 10m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0" />
+                                    <path d="M6.168 18.849a4 4 0 0 1 3.832 -2.849h4a4 4 0 0 1 3.834 2.855" />
+                                </svg>
+                                Profile
+                            </a>
+                        </li>
+                        <li title="Teams" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline" href="{{ route('team.index') }}">
+                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
+                                    class="{{ request()->is('team*') ? 'text-warning icon' : 'icon' }}"
+                                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                    stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M10 13a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
+                                    <path d="M8 21v-1a2 2 0 0 1 2 -2h4a2 2 0 0 1 2 2v1" />
+                                    <path d="M15 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
+                                    <path d="M17 10h2a2 2 0 0 1 2 2v1" />
+                                    <path d="M5 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
+                                    <path d="M3 13v-1a2 2 0 0 1 2 -2h2" />
+                                </svg>
+                                Teams @if (isCloud())
+                                    / Subscription
+                                @endif
+                            </a>
+                        </li>
 
+                        @if (isInstanceAdmin())
+                            <li title="Settings" class="hover:bg-coolgray-200">
+                                <a class="hover:bg-transparent hover:no-underline" href="/settings">
+                                    <svg xmlns="http://www.w3.org/2000/svg"
+                                        class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}"
+                                        viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
+                                        stroke-linecap="round" stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                        <path
+                                            d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
+                                        <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
+                                    </svg>
+                                    Settings
+                                </a>
+                            </li>
+                        @endif
+                        <li title="Boarding" class="hover:bg-coolgray-200">
+                            <a class="hover:bg-transparent hover:no-underline" href="{{ route('boarding') }}">
+                                <svg class="{{ request()->is('boarding*') ? 'text-warning icon' : 'icon' }}"
+                                    viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                                    <path fill="currentColor"
+                                        d="M224 128a8 8 0 0 1-8 8h-88a8 8 0 0 1 0-16h88a8 8 0 0 1 8 8m-96-56h88a8 8 0 0 0 0-16h-88a8 8 0 0 0 0 16m88 112h-88a8 8 0 0 0 0 16h88a8 8 0 0 0 0-16M82.34 42.34L56 68.69L45.66 58.34a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32m0 64L56 132.69l-10.34-10.35a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32m0 64L56 196.69l-10.34-10.35a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32" />
+                                </svg>
+                                Boarding
+                            </a>
+                        </li>
+                    </div>
+                </div>
+            </div>
+            @if (isCloud() && isInstanceAdmin())
+                <li title="Admin">
+                    <a class="hover:bg-transparent" href="/admin">
+                        <svg class="text-pink-600 icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" />
+                        </svg>
+                    </a>
+                </li>
+            @endif
             <div class="flex-1"></div>
             @if (isInstanceAdmin() && !isCloud())
                 @persist('upgrade')
@@ -114,59 +194,26 @@
                     </svg>
                 </a>
             </li>
-            <li title="Profile">
-                <a class="hover:bg-transparent" href="/profile">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                        stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <path d="M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0" />
-                        <path d="M12 10m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0" />
-                        <path d="M6.168 18.849a4 4 0 0 1 3.832 -2.849h4a4 4 0 0 1 3.834 2.855" />
-                    </svg>
-                </a>
-            </li>
 
-            @if (isInstanceAdmin())
-                <li title="Settings" class="mt-auto">
-                    <a class="hover:bg-transparent" href="/settings">
-                        <svg xmlns="http://www.w3.org/2000/svg"
-                            class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
-                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                            stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path
-                                d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
-                            <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
-                        </svg>
-                    </a>
-                </li>
-            @endif
-            @if (isSubscriptionActive() || isDev())
-                <li title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
-                    <div class="justify-center" wire:click="help" onclick="help.showModal()">
-                        <svg class="w-5 h-5" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                            <path fill="currentColor"
-                                d="M22 5.5H9c-1.1 0-2 .9-2 2v9a2 2 0 0 0 2 2h13c1.11 0 2-.89 2-2v-9a2 2 0 0 0-2-2m0 11H9V9.17l6.5 3.33L22 9.17v7.33m-6.5-5.69L9 7.5h13l-6.5 3.31M5 16.5c0 .17.03.33.05.5H1c-.552 0-1-.45-1-1s.448-1 1-1h4v1.5M3 7h2.05c-.02.17-.05.33-.05.5V9H3c-.55 0-1-.45-1-1s.45-1 1-1m-2 5c0-.55.45-1 1-1h3v2H2c-.55 0-1-.45-1-1Z" />
-                        </svg>
-                        Feedback
-                    </div>
-                </li>
-            @endif
-            <li class="pb-6" title="Logout">
-                <form action="/logout" method="POST" class=" hover:bg-transparent">
+            <li title="Send us feedback or get help!" class="hover:bg-transparent">
+                <div class="justify-center" wire:click="help" onclick="help.showModal()">
+                    <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <path fill="currentColor"
+                            d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88" />
+                    </svg>
+                </div>
+            </li>
+            <form action="/logout" method="POST" class="hover:bg-transparent">
+                <li title="Logout" class="mb-6 hover:transparent">
                     @csrf
                     <button type="submit" class="rounded-none hover:text-white hover:bg-transparent">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path d="M13 12v.01" />
-                            <path d="M3 21h18" />
-                            <path d="M5 21v-16a2 2 0 0 1 2 -2h7.5m2.5 10.5v7.5" />
-                            <path d="M14 7h7m-3 -3l3 3l-3 3" />
+                        <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22m7-6v-3h-8v-2h8V8l5 4z" />
                         </svg>
                     </button>
-                </form>
-            </li>
+                </li>
+            </form>
         </ul>
     </nav>
 @endauth

resources/views/components/new-modal.blade.php

@@ -4,15 +4,22 @@
     'isErrorButton' => false,
     'disabled' => false,
     'action' => 'delete',
+    'content' => null,
 ])
 <div x-data="{ modalOpen: false }" @keydown.escape.window="modalOpen = false" :class="{ 'z-40': modalOpen }"
     class="relative w-auto h-auto">
-    @if ($disabled)
-        <x-forms.button isError disabled>{{ $buttonTitle }}</x-forms.button>
-    @elseif ($isErrorButton)
-        <x-forms.button isError @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+    @if ($content)
+        <div @click="modalOpen=true">
+            {{ $content }}
+        </div>
     @else
-        <x-forms.button @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @if ($disabled)
+            <x-forms.button isError disabled>{{ $buttonTitle }}</x-forms.button>
+        @elseif ($isErrorButton)
+            <x-forms.button isError @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @else
+            <x-forms.button @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @endif
     @endif
     <template x-teleport="body">
         <div x-show="modalOpen" class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen"
@@ -30,13 +37,13 @@
                 class="relative w-full py-6 border rounded shadow-lg bg-coolgray-100 px-7 border-coolgray-300 sm:max-w-lg">
                 <div class="flex items-center justify-between pb-3">
                     <h3 class="text-2xl font-bold">{{ $title }}</h3>
-                    <button @click="modalOpen=false"
+                    {{-- <button @click="modalOpen=false"
                         class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-white rounded-full hover:bg-coolgray-300">
                         <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                         </svg>
-                    </button>
+                    </button> --}}
                 </div>
                 <div class="relative w-auto pb-8">
                     {{ $slot }}
@@ -48,14 +55,13 @@
                     <div class="flex-1"></div>
                     @if ($isErrorButton)
                         <x-forms.button @click="modalOpen=false" class="w-24" isError type="button"
-                            wire:click.prevent='{{ $action }}'>Continue
+                            wire:click.prevent="{{ $action }}">Continue
                         </x-forms.button>
                     @else
                         <x-forms.button @click="modalOpen=false" class="w-24" isHighlighted type="button"
-                            wire:click.prevent='{{ $action }}'>Continue
+                            wire:click.prevent="{{ $action }}">Continue
                         </x-forms.button>
                     @endif
-
                 </div>
             </div>
         </div>

resources/views/components/pricing-plans.blade.php

@@ -258,7 +258,8 @@
                 <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
                     your self-hosted instance?
                     <x-forms.button>
-                        <a class="font-bold text-white hover:no-underline" href="{{ config('coolify.contact') }}">Contact
+                        <a class="font-bold text-white hover:no-underline"
+                            href="{{ config('coolify.contact') }}">Contact
                             Us</a>
                     </x-forms.button>
                 </div>

resources/views/components/slide-over.blade.php

@@ -1,31 +1,37 @@
+@props(['closeWithX' => false, 'fullScreen' => false])
 <div x-data="{
     slideOverOpen: false
 }" class="relative w-auto h-auto">
     {{ $slot }}
     <template x-teleport="body">
-        <div x-show="slideOverOpen" @keydown.window.escape="slideOverOpen=false" class="relative z-[99]">
-            <div x-show="slideOverOpen" @click="slideOverOpen = false" class="fixed inset-0 bg-black bg-opacity-60"></div>
+        <div x-show="slideOverOpen" @if (!$closeWithX) @keydown.window.escape="slideOverOpen=false" @endif
+            class="relative z-[99]">
+            <div x-show="slideOverOpen" @if (!$closeWithX) @click="slideOverOpen = false" @endif
+                class="fixed inset-0 bg-black bg-opacity-60"></div>
             <div class="fixed inset-0 overflow-hidden">
                 <div class="absolute inset-0 overflow-hidden">
                     <div class="fixed inset-y-0 right-0 flex max-w-full pl-10">
-                        <div x-show="slideOverOpen" @click.away="slideOverOpen = false"
+                        <div x-show="slideOverOpen"
+                            @if (!$closeWithX) @click.away="slideOverOpen = false" @endif
                             x-transition:enter="transform transition ease-in-out duration-100 sm:duration-300"
                             x-transition:enter-start="translate-x-full" x-transition:enter-end="translate-x-0"
                             x-transition:leave="transform transition ease-in-out duration-100 sm:duration-300"
                             x-transition:leave-start="translate-x-0" x-transition:leave-end="translate-x-full"
-                            class="w-screen max-w-md">
+                            @class([
+                                'max-w-md w-screen' => !$fullScreen,
+                                'max-w-4xl w-screen' => $fullScreen,
+                            ])>
                             <div
                                 class="flex flex-col h-full py-6 overflow-hidden border-l shadow-lg bg-base-100 border-neutral-800">
-                                <div class="px-4 pb-10 sm:px-5">
+                                <div class="px-4 pb-4 sm:px-5">
                                     <div class="flex items-start justify-between pb-1">
-                                        <h2 class="text-2xl leading-6" id="slide-over-title">
+                                        <h2 class="text-3xl leading-6" id="slide-over-title">
                                             {{ $title }}</h2>
                                         <div class="flex items-center h-auto ml-3">
                                             <button class="icon" @click="slideOverOpen=false"
                                                 class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-4 mr-2 space-x-1 text-xs font-normal border-none rounded">
                                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
-                                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-                                                    >
+                                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
                                                     <path stroke-linecap="round" stroke-linejoin="round"
                                                         d="M6 18L18 6M6 6l12 12"></path>
                                                 </svg>

resources/views/components/status/index.blade.php

@@ -1,6 +1,6 @@
-@if (Str::of($status)->startsWith('running'))
+@if (str($status)->startsWith('running'))
     <x-status.running :status="$status" />
-@elseif(Str::of($status)->startsWith('restarting') || Str::of($status)->startsWith('starting'))
+@elseif(str($status)->startsWith('restarting') || str($status)->startsWith('starting') || str($status)->startsWith('degraded'))
     <x-status.restarting :status="$status" />
 @else
     <x-status.stopped :status="$status" />

resources/views/components/status/restarting.blade.php

@@ -2,7 +2,12 @@
     'status' => 'Restarting',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2" wire:loading.remove.delay.longer>
+<div class="flex items-center " wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
+        <div class="text-xs text-warning">({{ str($status)->after(':') }})</div>
+    @endif
 </div>

resources/views/components/status/running.blade.php

@@ -2,7 +2,12 @@
     'status' => 'Running',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-success badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-success">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
+        <div class="text-xs text-success">({{ str($status)->after(':') }})</div>
+    @endif
 </div>

resources/views/components/status/stopped.blade.php

@@ -2,7 +2,7 @@
     'status' => 'Stopped',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-error badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-error">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-error">{{ str($status)->before(':')->headline() }}</div>
 </div>

resources/views/layouts/base.blade.php

@@ -170,6 +170,7 @@
                     }
                 })
                 window.Livewire.on('installDocker', () => {
+                    console.log('Installing Docker...');
                     installDocker.showModal();
                 })
             });

resources/views/layouts/boarding.blade.php

@@ -1,26 +1,12 @@
 @extends('layouts.base')
 @section('body')
-    <x-modal noSubmit modalId="installDocker">
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Docker Installation Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="installDocker.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
-    @if (isSubscriptionActive() || isDev())
-        <div title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
-            <button class="flex items-center justify-center gap-2" wire:click="help" onclick="help.showModal()">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                    <path fill="currentColor"
-                        d="M22 5.5H9c-1.1 0-2 .9-2 2v9a2 2 0 0 0 2 2h13c1.11 0 2-.89 2-2v-9a2 2 0 0 0-2-2m0 11H9V9.17l6.5 3.33L22 9.17v7.33m-6.5-5.69L9 7.5h13l-6.5 3.31M5 16.5c0 .17.03.33.05.5H1c-.552 0-1-.45-1-1s.448-1 1-1h4v1.5M3 7h2.05c-.02.17-.05.33-.05.5V9H3c-.55 0-1-.45-1-1s.45-1 1-1m-2 5c0-.55.45-1 1-1h3v2H2c-.55 0-1-.45-1-1Z" />
-                </svg>
-                Feedback
-            </button>
-        </div>
-    @endif
+    <div title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
+        <button class="flex items-center justify-center gap-2" wire:click="help" onclick="help.showModal()">
+            <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                <path fill="currentColor" d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88"/>
+            </svg>
+        </button>
+    </div>
     <main class="min-h-screen hero">
         <div class="hero-content">
             {{ $slot }}

resources/views/layouts/subscription.blade.php

@@ -12,7 +12,7 @@
         <x-navbar-subscription />
     @endif
 
-    <main class="main max-w-screen-2xl">
+    <main class="mx-auto main max-w-screen-2xl">
         {{ $slot }}
     </main>
 @endsection

resources/views/livewire/admin/index.blade.php

@@ -0,0 +1,17 @@
+<div>
+    <h1>Admin Dashboard</h1>
+    <h3 class="pt-4">Who am I now?</h3>
+    {{ auth()->user()->name }}
+    <h3 class="pt-4">Users</h3>
+    <div class="flex flex-wrap gap-2">
+        <div class="w-96 box" wire:click="switchUser('0')">
+            Root
+        </div>
+        @foreach ($users as $user)
+            <div class="w-96 box" wire:click="switchUser('{{ $user->id }}')">
+                <p>{{ $user->name }}</p>
+                <p>{{ $user->email }}</p>
+            </div>
+        @endforeach
+    </div>
+</div>

resources/views/livewire/boarding/index.blade.php

@@ -5,7 +5,8 @@
             <h1 class="text-5xl font-bold">Welcome to Coolify</h1>
             <p class="py-6 text-xl text-center">Let me help you to set the basics.</p>
             <div class="flex justify-center ">
-                <x-forms.button class="justify-center box" wire:click="$set('currentState','explanation')">Get Started
+                <x-forms.button class="justify-center w-64 box" wire:click="$set('currentState','explanation')">Get
+                    Started
                 </x-forms.button>
             </div>
         @endif
@@ -31,7 +32,7 @@
                         Telegram, Email, etc.) when something goes wrong, or an action needed from your side.</p>
                 </x-slot:explanation>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="explanation">Next
+                    <x-forms.button class="justify-center w-64 box" wire:click="explanation">Next
                     </x-forms.button>
                 </x-slot:actions>
             </x-boarding-step>
@@ -43,11 +44,11 @@
                     or on a <x-highlighted text="Remote Server" />?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:target="setServerType('localhost')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setServerType('localhost')"
                         wire:click="setServerType('localhost')">Localhost
                     </x-forms.button>
 
-                    <x-forms.button class="justify-center box" wire:target="setServerType('remote')"
+                    <x-forms.button class="justify-center w-64 box " wire:target="setServerType('remote')"
                         wire:click="setServerType('remote')">Remote Server
                     </x-forms.button>
                     @if (!$serverReachable)
@@ -57,9 +58,10 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <br />
-                        Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
+                        Check this <a target="_blank" class="underline"
+                            href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="box" wire:target="setServerType('localhost')"
+                        <x-forms.button class="w-64 box" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again
                         </x-forms.button>
                     @endif
@@ -83,10 +85,10 @@
                     Do you have your own SSH Private Key?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:target="setPrivateKey('own')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setPrivateKey('own')"
                         wire:click="setPrivateKey('own')">Yes
                     </x-forms.button>
-                    <x-forms.button class="justify-center box" wire:target="setPrivateKey('create')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setPrivateKey('create')"
                         wire:click="setPrivateKey('create')">No (create one for me)
                     </x-forms.button>
                     @if (count($privateKeys) > 0)
@@ -119,18 +121,24 @@
                     There are already servers available for your Team. Do you want to use one of them?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="createNewServer">No (create one for me)
-                    </x-forms.button>
-                    <div>
-                        <form wire:submit='selectExistingServer' class="flex flex-col w-full gap-4 lg:w-96">
-                            <x-forms.select label="Existing servers" class="w-96" id='selectedExistingServer'>
-                                @foreach ($servers as $server)
-                                    <option wire:key="{{ $loop->index }}" value="{{ $server->id }}">
-                                        {{ $server->name }}</option>
-                                @endforeach
-                            </x-forms.select>
-                            <x-forms.button type="submit">Use this Server</x-forms.button>
-                        </form>
+                    <div class="flex flex-col gap-4">
+                        <div>
+                            <x-forms.button class="justify-center w-64 box" wire:click="createNewServer">No (create one
+                                for
+                                me)
+                            </x-forms.button>
+                        </div>
+                        <div>
+                            <form wire:submit='selectExistingServer' class="flex flex-col w-full gap-4 lg:w-96">
+                                <x-forms.select label="Existing servers" class="w-96" id='selectedExistingServer'>
+                                    @foreach ($servers as $server)
+                                        <option wire:key="{{ $loop->index }}" value="{{ $server->id }}">
+                                            {{ $server->name }}</option>
+                                    @endforeach
+                                </x-forms.select>
+                                <x-forms.button type="submit">Use this Server</x-forms.button>
+                            </form>
+                        </div>
                     </div>
                     @if (!$serverReachable)
                         This server is not reachable with the following public key.
@@ -139,7 +147,7 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="box" wire:target="validateServer" wire:click="validateServer">Check
+                        <x-forms.button class="w-64 box" wire:target="validateServer" wire:click="validateServer">Check
                             again
                         </x-forms.button>
                     @endif
@@ -214,7 +222,7 @@
                                 helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<br><span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
                                 id="isCloudflareTunnel" label="Cloudflare Tunnel" />
                         </div>
-                        <x-forms.button type="submit">Check Connection</x-forms.button>
+                        <x-forms.button type="submit">Continue</x-forms.button>
                     </form>
                 </x-slot:actions>
                 <x-slot:explanation>
@@ -225,18 +233,23 @@
         @endif
     </div>
     <div>
-        @if ($currentState === 'install-docker')
-            <x-boarding-step title="Install Docker">
+        @if ($currentState === 'validate-server')
+            <x-boarding-step title="Validate & Configure Server">
                 <x-slot:question>
-                    Could not find Docker Engine on your server. Do you want me to install it for you?
+                    I need to validate your server (connection, Docker Engine, etc) and configure if something is
+                    missing for me. Are you okay with this?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="installDocker">
-                        Let's do it!</x-forms.button>
-                    @if ($dockerInstallationStarted)
-                        <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
-                            Validate Server & Continue</x-forms.button>
-                    @endif
+                    <x-slide-over closeWithX fullScreen>
+                        <x-slot:title>Validating & Configuring</x-slot:title>
+                        <x-slot:content>
+                            <livewire:server.validate-and-install :server="$this->createdServer" />
+                        </x-slot:content>
+                        <x-forms.button @click="slideOverOpen=true" class="font-bold box w-96"
+                            wire:click.prevent='installServer' isHighlighted>
+                            Let's do it!
+                        </x-forms.button>
+                    </x-slide-over>
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able
@@ -246,10 +259,9 @@
                             documentation</a>.</p>
                 </x-slot:explanation>
             </x-boarding-step>
-
         @endif
     </div>
-    <div>
+    {{-- <div>
         @if ($currentState === 'select-proxy')
             <x-boarding-step title="Select a Proxy">
                 <x-slot:question>
@@ -276,7 +288,7 @@
                 </x-slot:explanation>
             </x-boarding-step>
         @endif
-    </div>
+    </div> --}}
     <div>
         @if ($currentState === 'create-project')
             <x-boarding-step title="Project">
@@ -289,7 +301,7 @@
                     @endif
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="createNewProject">Let's create a new
+                    <x-forms.button class="justify-center w-64 box" wire:click="createNewProject">Let's create a new
                         one!</x-forms.button>
                     <div>
                         @if (count($projects) > 0)
@@ -322,7 +334,7 @@
                     I will redirect you to the new resource page, where you can create your first resource.
                 </x-slot:question>
                 <x-slot:actions>
-                    <div class="items-center justify-center box" wire:click="showNewResource">Let's do
+                    <div class="items-center justify-center w-64 box" wire:click="showNewResource">Let's do
                         it!</div>
                 </x-slot:actions>
                 <x-slot:explanation>

resources/views/livewire/dashboard.blade.php

@@ -29,7 +29,7 @@
     @endif
     @foreach ($projects as $project)
         <div class="gap-2 border border-transparent cursor-pointer box group">
-            @if (data_get($project, 'environments.0.name'))
+            @if (data_get($project, 'environments')->count() === 1)
                 <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                     <div class="font-bold text-white">{{ $project->name }}</div>
@@ -106,6 +106,7 @@
     @if (count($deployments_per_server) > 0)
         <x-loading />
     @endif
+    <x-forms.button wire:click='cleanup_queue'>Cleanup Queues</x-forms.button>
 </div>
 <div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
     @forelse ($deployments_per_server as $server_name => $deployments)

resources/views/livewire/help.blade.php

@@ -6,6 +6,6 @@
         <x-forms.textarea rows="10" id="description" label="Description"
             placeholder="Please provide as much information as possible."></x-forms.textarea>
         <div></div>
-        <x-forms.button class="w-full mt-4" type="submit" onclick="help.close()">Send Email</x-forms.button>
+        <x-forms.button class="w-full mt-4" type="submit" onclick="help.close()">Send</x-forms.button>
     </form>
 </div>

resources/views/livewire/new-activity-monitor.blade.php

@@ -0,0 +1,18 @@
+@php use App\Actions\CoolifyTask\RunRemoteProcess; @endphp
+<div>
+    @if ($this->activity)
+        @if (isset($header))
+            <div class="flex gap-2 pb-2">
+                {{ $header }}
+                @if ($isPollingActive)
+                    <x-loading />
+                @endif
+            </div>
+        @endif
+        <div
+            class="scrollbar flex flex-col-reverse w-full overflow-y-auto border border-solid rounded border-coolgray-300 max-h-[32rem] p-4 pt-6 text-xs text-white">
+
+            <pre class="font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>
+        </div>
+    @endif
+</div>

resources/views/livewire/project/application/configuration.blade.php

@@ -27,8 +27,8 @@
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
             @endif
-            <a :class="activeTab === 'server' && 'text-white'"
-                @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
+            <a :class="activeTab === 'servers' && 'text-white'"
+                @click.prevent="activeTab = 'servers'; window.location.hash = 'servers'" href="#">Servers
             </a>
 
             <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
@@ -88,7 +88,7 @@
                     <livewire:project.application.source :application="$application" />
                 </div>
             @endif
-            <div x-cloak x-show="activeTab === 'server'">
+            <div x-cloak x-show="activeTab === 'servers'">
                 <livewire:project.shared.destination :resource="$application" :servers="$servers" />
             </div>
             <div x-cloak x-show="activeTab === 'storages'">