Merge pull request #1474 from coollabsio/next

v4.0.0-beta.145

app/Actions/Database/StartMariadb.php

@@ -23,7 +23,7 @@ class StartMariadb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -69,7 +69,7 @@ class StartMariadb
                 ]
             ]
         ];
-        if ($this->database->destination->server->isDrainLogActivated()) {
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -104,7 +104,7 @@ class StartMariadb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
+        $this->commands[] = "echo '{$database->name} started.'";
         return remote_process($this->commands, $database->destination->server);
     }
 

app/Actions/Database/StartMongodb.php

@@ -25,7 +25,7 @@ class StartMongodb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -76,7 +76,7 @@ class StartMongodb
                 ]
             ]
         ];
-        if ($this->database->destination->server->isDrainLogActivated()) {
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -120,7 +120,7 @@ class StartMongodb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
+        $this->commands[] = "echo '{$database->name} started.'";
         return remote_process($this->commands, $database->destination->server);
     }
 

app/Actions/Database/StartMysql.php

@@ -23,7 +23,7 @@ class StartMysql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -69,7 +69,7 @@ class StartMysql
                 ]
             ]
         ];
-        if ($this->database->destination->server->isDrainLogActivated()) {
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -104,7 +104,7 @@ class StartMysql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
+        $this->commands[] = "echo '{$database->name} started.'";
         return remote_process($this->commands, $database->destination->server);
     }
 

app/Actions/Database/StartPostgresql.php

@@ -23,7 +23,7 @@ class StartPostgresql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
         ];
@@ -79,7 +79,8 @@ class StartPostgresql
                 ]
             ]
         ];
-        if ($this->database->destination->server->isDrainLogActivated()) {
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            ray('Log Drain Enabled');
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -129,7 +130,7 @@ class StartPostgresql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
+        $this->commands[] = "echo '{$database->name} started.'";
         return remote_process($this->commands, $database->destination->server);
     }
 

app/Actions/Database/StartRedis.php

@@ -26,7 +26,7 @@ class StartRedis
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -78,7 +78,7 @@ class StartRedis
                 ]
             ]
         ];
-        if ($this->database->destination->server->isDrainLogActivated()) {
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -114,7 +114,7 @@ class StartRedis
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
+        $this->commands[] = "echo '{$database->name} started.'";
         return remote_process($this->commands, $database->destination->server);
     }
 
@@ -166,6 +166,5 @@ class StartRedis
         $content = $this->database->redis_conf;
         $content_base64 = base64_encode($content);
         $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
-
     }
 }

app/Actions/Server/InstallDocker.php

@@ -11,6 +11,11 @@ class InstallDocker
     use AsAction;
     public function handle(Server $server)
     {
+        $supported_os_type = $server->validateOS();
+        if (!$supported_os_type) {
+            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+        }
+        ray('Installing Docker on server: ' . $server->name . ' (' . $server->ip . ')' . ' with OS: ' . $supported_os_type);
         $dockerVersion = '24.0';
         $config = base64_encode('{
             "log-driver": "json-file",
@@ -27,36 +32,49 @@ class InstallDocker
                 'server_id' => $server->id,
             ]);
         }
-
+        $command = collect([]);
         if (isDev() && $server->id === 0) {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
                 "sleep 1",
-                "echo '####### Installing/updating Docker Engine...'",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "echo 'Installing Docker Engine...'",
+                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 "sleep 4",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
-            ];
+            ]);
         } else {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
-                "command -v jq >/dev/null || apt-get update",
-                "command -v jq >/dev/null || apt install -y jq",
-                "echo '####### Installing/updating Docker Engine...'",
+            if ($supported_os_type === 'debian') {
+                $command = $command->merge([
+                    "echo 'Installing Prerequisites...'",
+                    "command -v jq >/dev/null || apt-get update",
+                    "command -v jq >/dev/null || apt install -y jq",
+
+                ]);
+            } else if ($supported_os_type === 'rhel') {
+                $command = $command->merge([
+                    "echo 'Installing Prerequisites...'",
+                    "command -v jq >/dev/null || dnf install -y jq",
+                ]);
+            } else {
+                throw new \Exception('Unsupported OS');
+            }
+            $command = $command->merge([
+                "echo 'Installing Docker Engine...'",
                 "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
                 "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
                 "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
                 "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
+                "systemctl enable docker >/dev/null 2>&1 || true",
                 "systemctl restart docker",
-                "echo '####### Creating default Docker network (coolify)...'",
+                "echo 'Creating default Docker network (coolify)...'",
                 "docker network create --attachable coolify >/dev/null 2>&1 || true",
-                "echo '####### Done!'"
-            ];
+                "echo 'Done!'"
+            ]);
+            return remote_process($command, $server);
         }
-        return remote_process($command, $server);
     }
 }

app/Actions/Server/InstallLogDrain.php

@@ -8,8 +8,17 @@ use App\Models\Server;
 class InstallLogDrain
 {
     use AsAction;
-    public function handle(Server $server, string $type)
+    public function handle(Server $server)
     {
+        if ($server->settings->is_logdrain_newrelic_enabled) {
+            $type = 'newrelic';
+        } else if ($server->settings->is_logdrain_highlight_enabled) {
+            $type = 'highlight';
+        } else if ($server->settings->is_logdrain_axiom_enabled) {
+            $type = 'axiom';
+        } else {
+            $type = 'none';
+        }
         try {
             if ($type === 'none') {
                 $command = [
@@ -127,6 +136,7 @@ services:
       - ./parsers.conf:/parsers.conf
     ports:
       - 127.0.0.1:24224:24224
+    restart: unless-stopped
 ");
             $readme = base64_encode('# New Relic Log Drain
 This log drain is based on [Fluent Bit](https://fluentbit.io/) and New Relic Log Forwarder.

app/Actions/Service/StartService.php

@@ -14,13 +14,13 @@ class StartService
         $network = $service->destination->network;
         $service->saveComposeConfigs();
         $commands[] = "cd " . $service->workdir();
-        $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
-        $commands[] = "echo '####### Creating Docker network.'";
+        $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
+        $commands[] = "echo 'Creating Docker network.'";
         $commands[] = "docker network create --attachable '{$service->uuid}' >/dev/null || true";
-        $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
-        $commands[] = "echo '####### Pulling images.'";
+        $commands[] = "echo 'Starting service {$service->name} on {$service->server->name}.'";
+        $commands[] = "echo 'Pulling images.'";
         $commands[] = "docker compose pull";
-        $commands[] = "echo '####### Starting containers.'";
+        $commands[] = "echo 'Starting containers.'";
         $commands[] = "docker compose up -d --remove-orphans --force-recreate";
         $commands[] = "docker network connect $service->uuid coolify-proxy || true";
         $compose = data_get($service,'docker_compose',[]);

app/Console/Commands/Init.php

@@ -48,6 +48,7 @@ class Init extends Command
     private function alive()
     {
         $id = config('app.id');
+        $version = config('version');
         $settings = InstanceSettings::get();
         $do_not_track = data_get($settings, 'do_not_track');
         if ($do_not_track == true) {
@@ -55,8 +56,8 @@ class Init extends Command
             return;
         }
         try {
+            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
             echo "I am alive!\n";
-            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id");
         } catch (\Throwable $e) {
             echo "Error in alive: {$e->getMessage()}\n";
         }

app/Console/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Console;
 
+use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\InstanceAutoUpdateJob;
@@ -11,6 +12,7 @@ use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
+use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -43,7 +45,7 @@ class Kernel extends ConsoleKernel
     }
     private function pull_helper_image($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
             $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
@@ -51,13 +53,18 @@ class Kernel extends ConsoleKernel
     private function check_resources($schedule)
     {
         if (isCloud()) {
-            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
+            $own = Team::find(0)->servers;
+            $servers = $servers->merge($own);
         } else {
-            $servers = Server::all();
+            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
         }
         foreach ($servers as $server) {
             $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            if ($server->isLogDrainEnabled()) {
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+            }
         }
     }
     private function instance_auto_update($schedule)

app/Exceptions/Handler.php

@@ -6,6 +6,7 @@ use App\Models\InstanceSettings;
 use App\Models\User;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use RuntimeException;
 use Sentry\Laravel\Integration;
 use Sentry\State\Scope;
 use Throwable;
@@ -55,7 +56,9 @@ class Handler extends ExceptionHandler
     {
         $this->reportable(function (Throwable $e) {
             if (isDev()) {
-                ray($e);
+                // return;
+            }
+            if ($e instanceof RuntimeException) {
                 return;
             }
             $this->settings = InstanceSettings::get();
@@ -74,6 +77,7 @@ class Handler extends ExceptionHandler
                     );
                 }
             );
+            ray('reporting to sentry');
             Integration::captureUnhandledException($e);
         });
     }

app/Http/Controllers/ApplicationController.php

@@ -10,23 +10,6 @@ class ApplicationController extends Controller
 {
     use AuthorizesRequests, ValidatesRequests;
 
-    public function configuration()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.application.configuration', ['application' => $application]);
-    }
-
     public function deployments()
     {
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();

app/Http/Livewire/Boarding/Index.php

@@ -188,7 +188,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function validateServer()
     {
         try {
-            $customErrorMessage = "Server is not reachable:";
             config()->set('coolify.mux_enabled', false);
 
             instant_remote_process(['uptime'], $this->createdServer, true);
@@ -198,7 +197,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             ]);
         } catch (\Throwable $e) {
             $this->serverReachable = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            return handleError(error: $e, livewire: $this);
         }
 
         try {
@@ -206,7 +205,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
             if (is_null($dockerVersion)) {
                 $this->currentState = 'install-docker';
-                throw new \Exception('Docker version is not supported or not installed.');
+                throw new \Exception('Docker not found or old version is installed.');
             }
             $this->createdServer->settings()->update([
                 'is_usable' => true,
@@ -214,14 +213,20 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->getProxyType();
         } catch (\Throwable $e) {
             // $this->dockerInstallationStarted = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            return handleError(error: $e, livewire: $this);
         }
     }
     public function installDocker()
     {
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->createdServer);
-        $this->emit('newMonitorActivity', $activity->id);
+        try {
+            $this->dockerInstallationStarted = true;
+            $activity = InstallDocker::run($this->createdServer);
+            $this->emit('installDocker');
+            $this->emit('newMonitorActivity', $activity->id);
+        } catch (\Throwable $e) {
+            $this->dockerInstallationStarted = false;
+            return handleError(error: $e, livewire: $this);
+        }
     }
     public function dockerInstalledOrSkipped()
     {

app/Http/Livewire/Dashboard.php

@@ -3,7 +3,6 @@
 namespace App\Http\Livewire;
 
 use App\Models\Project;
-use App\Models\S3Storage;
 use App\Models\Server;
 use Livewire\Component;
 

app/Http/Livewire/Project/Application/Advanced.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Livewire\Project\Application;
+
+use App\Models\Application;
+use Livewire\Component;
+
+class Advanced extends Component
+{
+    public Application $application;
+    protected $rules = [
+        'application.settings.is_git_submodules_enabled' => 'boolean|required',
+        'application.settings.is_git_lfs_enabled' => 'boolean|required',
+        'application.settings.is_preview_deployments_enabled' => 'boolean|required',
+        'application.settings.is_auto_deploy_enabled' => 'boolean|required',
+        'application.settings.is_force_https_enabled' => 'boolean|required',
+        'application.settings.is_log_drain_enabled' => 'boolean|required',
+        'application.settings.is_gpu_enabled' => 'boolean|required',
+        'application.settings.gpu_driver' => 'string|required',
+        'application.settings.gpu_count' => 'string|required',
+        'application.settings.gpu_device_ids' => 'string|required',
+        'application.settings.gpu_options' => 'string|required',
+    ];
+    public function instantSave()
+    {
+        if ($this->application->settings->is_log_drain_enabled) {
+            if (!$this->application->destination->server->isLogDrainEnabled()) {
+                $this->application->settings->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on this server.');
+                return;
+            }
+        }
+        if ($this->application->settings->is_force_https_enabled) {
+            $this->emit('resetDefaultLabels', false);
+        }
+        $this->application->settings->save();
+        $this->emit('success', 'Settings saved.');
+    }
+    public function submit() {
+        if ($this->application->settings->gpu_count && $this->application->settings->gpu_device_ids) {
+            $this->emit('error', 'You cannot set both GPU count and GPU device IDs.');
+            $this->application->settings->gpu_count = null;
+            $this->application->settings->gpu_device_ids = null;
+            $this->application->settings->save();
+            return;
+        }
+        $this->application->settings->save();
+        $this->emit('success', 'Settings saved.');
+    }
+    public function render()
+    {
+        return view('livewire.project.application.advanced');
+    }
+}

app/Http/Livewire/Project/Application/Configuration.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Livewire\Project\Application;
+
+use App\Models\Application;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use Livewire\Component;
+
+class Configuration extends Component
+{
+    public Application $application;
+    public $servers;
+    public function mount()
+    {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('dashboard');
+        }
+        $this->application = $application;
+        $mainServer = $application->destination->server;
+        $servers = Server::ownedByCurrentTeam()->get();
+        $this->servers = $servers->filter(function ($server) use ($mainServer) {
+            return $server->id != $mainServer->id;
+        });
+    }
+    public function render()
+    {
+        return view('livewire.project.application.configuration');
+    }
+}

app/Http/Livewire/Project/Application/General.php

@@ -26,14 +26,10 @@ class General extends Component
     public bool $isConfigurationChanged = false;
 
     public bool $is_static;
-    public bool $is_git_submodules_enabled;
-    public bool $is_git_lfs_enabled;
-    public bool $is_debug_enabled;
-    public bool $is_preview_deployments_enabled;
-    public bool $is_auto_deploy_enabled;
-    public bool $is_force_https_enabled;
-
 
+    protected $listeners = [
+        'resetDefaultLabels'
+    ];
     protected $rules = [
         'application.name' => 'required',
         'application.description' => 'nullable',
@@ -56,6 +52,7 @@ class General extends Component
         'application.dockerfile_location' => 'nullable',
         'application.custom_labels' => 'nullable',
         'application.dockerfile_target_build' => 'nullable',
+        'application.settings.is_static' => 'boolean|required',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -79,6 +76,7 @@ class General extends Component
         'application.dockerfile_location' => 'Dockerfile location',
         'application.custom_labels' => 'Custom labels',
         'application.dockerfile_target_build' => 'Dockerfile target build',
+        'application.settings.is_static' => 'Is static',
     ];
 
     public function mount()
@@ -93,17 +91,13 @@ class General extends Component
         } else {
             $this->customLabels = str($this->application->custom_labels)->replace(',', "\n");
         }
-        if (data_get($this->application, 'settings')) {
-            $this->is_static = $this->application->settings->is_static;
-            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        }
         $this->checkLabelUpdates();
     }
+    public function instantSave()
+    {
+        $this->application->settings->save();
+        $this->emit('success', 'Settings saved.');
+    }
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
@@ -120,32 +114,6 @@ class General extends Component
             $this->labelsChanged = false;
         }
     }
-    public function instantSave()
-    {
-        // @TODO: find another way - if possible
-        $force_https = $this->application->settings->is_force_https_enabled;
-        $this->application->settings->is_static = $this->is_static;
-        if ($this->is_static) {
-            $this->application->ports_exposes = 80;
-        } else {
-            $this->application->ports_exposes = 3000;
-        }
-        $this->application->settings->is_git_submodules_enabled = $this->is_git_submodules_enabled;
-        $this->application->settings->is_git_lfs_enabled = $this->is_git_lfs_enabled;
-        $this->application->settings->is_debug_enabled = $this->is_debug_enabled;
-        $this->application->settings->is_preview_deployments_enabled = $this->is_preview_deployments_enabled;
-        $this->application->settings->is_auto_deploy_enabled = $this->is_auto_deploy_enabled;
-        $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
-        $this->application->settings->save();
-        $this->application->save();
-        $this->application->refresh();
-        $this->emit('success', 'Application settings updated!');
-        $this->checkLabelUpdates();
-        $this->isConfigurationChanged = $this->application->isConfigurationChanged();
-        if ($force_https !== $this->is_force_https_enabled) {
-            $this->resetDefaultLabels(false);
-        }
-    }
 
     public function getWildcardDomain()
     {

app/Http/Livewire/Project/Application/Heading.php

@@ -4,6 +4,7 @@ namespace App\Http\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
 use App\Jobs\ContainerStatusJob;
+use App\Jobs\ServerStatusJob;
 use App\Models\Application;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
@@ -28,6 +29,8 @@ class Heading extends Component
             $this->application->previews->each(function ($preview) {
                 $preview->refresh();
             });
+        } else {
+            dispatch(new ServerStatusJob($this->application->destination->server));
         }
     }
 

app/Http/Livewire/Project/Application/Rollback.php

@@ -38,32 +38,36 @@ class Rollback extends Component
         ]);
     }
 
-    public function loadImages()
+    public function loadImages($showToast = false)
     {
         try {
-            $image = $this->application->uuid;
-            $output = instant_remote_process([
-                "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
-            ], $this->application->destination->server, throwError: false);
-            $current_tag = Str::of($output)->trim()->explode(":");
-            $this->current = data_get($current_tag, 1);
+            $image = $this->application->docker_registry_image_name ?? $this->application->uuid;
+            if ($this->application->destination->server->isFunctional()) {
+                $output = instant_remote_process([
+                    "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
+                ], $this->application->destination->server, throwError: false);
+                $current_tag = Str::of($output)->trim()->explode(":");
+                $this->current = data_get($current_tag, 1);
 
-            $output = instant_remote_process([
-                "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
-            ], $this->application->destination->server);
-            $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
-                return Str::of($item)->contains($image);
-            })->map(function ($item) {
-                $item = Str::of($item)->explode('#');
-                if ($item[1] === $this->current) {
-                    // $is_current = true;
-                }
-                return [
-                    'tag' => $item[1],
-                    'created_at' => $item[2],
-                    'is_current' => $is_current ?? null,
-                ];
-            })->toArray();
+                $output = instant_remote_process([
+                    "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
+                ], $this->application->destination->server);
+                $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
+                    return Str::of($item)->contains($image);
+                })->map(function ($item) {
+                    $item = Str::of($item)->explode('#');
+                    if ($item[1] === $this->current) {
+                        // $is_current = true;
+                    }
+                    return [
+                        'tag' => $item[1],
+                        'created_at' => $item[2],
+                        'is_current' => $is_current ?? null,
+                    ];
+                })->toArray();
+            }
+            $showToast && $this->emit('success', 'Images loaded.');
+            return [];
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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

@@ -28,6 +28,7 @@ class General extends Component
         'database.ports_mappings' => 'nullable',
         'database.is_public' => 'nullable|boolean',
         'database.public_port' => 'nullable|integer',
+        'database.is_log_drain_enabled' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -50,6 +51,20 @@ class General extends Component
             $this->db_url_public = $this->database->getDbUrl();
         }
     }
+    public function instantSaveAdvanced() {
+        try {
+            if (!$this->database->destination->server->isLogDrainEnabled()) {
+                $this->database->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+            $this->emit('success', 'You need to restart the service for the changes to take effect.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function submit()
     {
         try {

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

@@ -27,6 +27,7 @@ class General extends Component
         'database.ports_mappings' => 'nullable',
         'database.is_public' => 'nullable|boolean',
         'database.public_port' => 'nullable|integer',
+        'database.is_log_drain_enabled' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -48,7 +49,21 @@ class General extends Component
             $this->db_url_public = $this->database->getDbUrl();
         }
     }
-
+    public function instantSaveAdvanced()
+    {
+        try {
+            if (!$this->database->destination->server->isLogDrainEnabled()) {
+                $this->database->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+            $this->emit('success', 'You need to restart the service for the changes to take effect.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function submit()
     {
         try {

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

@@ -28,6 +28,7 @@ class General extends Component
         'database.ports_mappings' => 'nullable',
         'database.is_public' => 'nullable|boolean',
         'database.public_port' => 'nullable|integer',
+        'database.is_log_drain_enabled' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -50,6 +51,21 @@ class General extends Component
             $this->db_url_public = $this->database->getDbUrl();
         }
     }
+    public function instantSaveAdvanced()
+    {
+        try {
+            if (!$this->database->destination->server->isLogDrainEnabled()) {
+                $this->database->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+            $this->emit('success', 'You need to restart the service for the changes to take effect.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function submit()
     {
         try {

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

@@ -34,6 +34,7 @@ class General extends Component
         'database.ports_mappings' => 'nullable',
         'database.is_public' => 'nullable|boolean',
         'database.public_port' => 'nullable|integer',
+        'database.is_log_drain_enabled' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -57,6 +58,20 @@ class General extends Component
             $this->db_url_public = $this->database->getDbUrl();
         }
     }
+    public function instantSaveAdvanced() {
+        try {
+            if (!$this->database->destination->server->isLogDrainEnabled()) {
+                $this->database->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+            $this->emit('success', 'You need to restart the service for the changes to take effect.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function instantSave()
     {
         try {

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

@@ -25,6 +25,7 @@ class General extends Component
         'database.ports_mappings' => 'nullable',
         'database.is_public' => 'nullable|boolean',
         'database.public_port' => 'nullable|integer',
+        'database.is_log_drain_enabled' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -43,6 +44,20 @@ class General extends Component
             $this->db_url_public = $this->database->getDbUrl();
         }
     }
+    public function instantSaveAdvanced() {
+        try {
+            if (!$this->database->destination->server->isLogDrainEnabled()) {
+                $this->database->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+            $this->emit('success', 'You need to restart the service for the changes to take effect.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function submit()
     {
         try {

app/Http/Livewire/Project/Service/Application.php

@@ -16,6 +16,7 @@ class Application extends Component
         'application.image' => 'required',
         'application.exclude_from_status' => 'required|boolean',
         'application.required_fqdn' => 'required|boolean',
+        'application.is_log_drain_enabled' => 'nullable|boolean',
     ];
     public function render()
     {
@@ -25,7 +26,11 @@ class Application extends Component
     {
         $this->submit();
     }
-
+    public function instantSaveAdvanced()
+    {
+        $this->submit();
+        $this->emit('success', 'You need to restart the service for the changes to take effect.');
+    }
     public function delete()
     {
         try {
@@ -44,6 +49,11 @@ class Application extends Component
     {
         try {
             $this->validate();
+            if (!$this->application->service->destination->server->isLogDrainEnabled()) {
+                $this->application->is_log_drain_enabled = false;
+                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+                return;
+            }
             $this->application->save();
             updateCompose($this->application);
             $this->emit('success', 'Application saved successfully.');

app/Http/Livewire/Project/Service/Database.php

@@ -21,18 +21,31 @@ class Database extends Component
         'database.exclude_from_status' => 'required|boolean',
         'database.public_port' => 'nullable|integer',
         'database.is_public' => 'required|boolean',
+        'database.is_log_drain_enabled' => 'required|boolean',
     ];
     public function render()
     {
         return view('livewire.project.service.database');
     }
-    public function mount() {
+    public function mount()
+    {
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->getServiceDatabaseUrl();
         }
         $this->refreshFileStorages();
     }
-    public function instantSave() {
+    public function instantSaveAdvanced()
+    {
+        if (!$this->database->service->destination->server->isLogDrainEnabled()) {
+            $this->database->is_log_drain_enabled = false;
+            $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+            return;
+        }
+        $this->submit();
+        $this->emit('success', 'You need to restart the service for the changes to take effect.');
+    }
+    public function instantSave()
+    {
         if ($this->database->is_public && !$this->database->public_port) {
             $this->emit('error', 'Public port is required.');
             $this->database->is_public = false;

app/Http/Livewire/Project/Shared/Destination.php

@@ -6,5 +6,7 @@ use Livewire\Component;
 
 class Destination extends Component
 {
-    public $destination;
+    public $resource;
+    public $servers = [];
+    public $additionalServers = [];
 }

app/Http/Livewire/Server/Form.php

@@ -43,9 +43,9 @@ 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()
+    public function serverRefresh($install = true)
     {
-        $this->validateServer();
+        $this->validateServer($install);
     }
     public function instantSave()
     {
@@ -77,12 +77,15 @@ class Form extends Component
     {
         try {
             $uptime = $this->server->validateConnection();
-            if ($uptime) {
-                $install && $this->emit('success', 'Server is reachable.');
-            } else {
+            if (!$uptime) {
                 $install && $this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
                 return;
             }
+            $supported_os_type = $this->server->validateOS();
+            if (!$supported_os_type) {
+                $install && $this->emit('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+                return;
+            }
             $dockerInstalled = $this->server->validateDockerEngine();
             if ($dockerInstalled) {
                 $install && $this->emit('success', 'Docker Engine is installed.<br> Checking version.');
@@ -92,7 +95,7 @@ class Form extends Component
             }
             $dockerVersion = $this->server->validateDockerEngineVersion();
             if ($dockerVersion) {
-                $install && $this->emit('success', 'Docker Engine version is 23+.');
+                $install && $this->emit('success', 'Docker Engine version is 22+.');
             } else {
                 $install && $this->installDocker();
                 return;

app/Http/Livewire/Server/LogDrains.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Server;
 
+use App\Actions\Server\InstallLogDrain;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -46,14 +47,8 @@ class LogDrains extends Component
     public function configureLogDrain()
     {
         try {
-            if ($this->server->settings->is_logdrain_newrelic_enabled) {
-                $this->server->logDrain('newrelic');
-            } else if ($this->server->settings->is_logdrain_highlight_enabled) {
-                $this->server->logDrain('highlight');
-            } else if ($this->server->settings->is_logdrain_axiom_enabled) {
-                $this->server->logDrain('axiom');
-            } else {
-                $this->server->logDrain('none');
+            InstallLogDrain::run($this->server);
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->emit('serverRefresh');
                 $this->emit('success', 'Log drain service stopped.');
                 return;

app/Http/Livewire/Server/Show.php

@@ -25,7 +25,7 @@ class Show extends Component
     }
     public function submit()
     {
-        $this->emit('serverRefresh');
+        $this->emit('serverRefresh',false);
     }
     public function render()
     {

app/Jobs/ApplicationDeployDockerImageJob.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Enums\ApplicationDeploymentStatus;
+use App\Models\Application;
+use App\Models\ApplicationDeploymentQueue;
+use App\Traits\ExecuteRemoteCommandNew;
+use Exception;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Throwable;
+
+class ApplicationDeployDockerImageJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommandNew;
+
+    public $timeout = 3600;
+    public $tries = 1;
+    public string $applicationDeploymentQueueId;
+
+    public function __construct(string $applicationDeploymentQueueId)
+    {
+        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
+    }
+    public function handle()
+    {
+        ray()->clearAll();
+        ray('Deploying Docker Image');
+        try {
+            $applicationDeploymentQueue = ApplicationDeploymentQueue::find($this->applicationDeploymentQueueId);
+            $application = Application::find($applicationDeploymentQueue->application_id);
+
+            $deploymentUuid = data_get($applicationDeploymentQueue, 'deployment_uuid');
+            $dockerImage = data_get($application, 'docker_registry_image_name');
+            $dockerImageTag = data_get($application, 'docker_registry_image_tag');
+            $productionImageName = str("{$dockerImage}:{$dockerImageTag}");
+            $destination = $application->destination->getMorphClass()::where('id', $application->destination->id)->first();
+            $pullRequestId = data_get($applicationDeploymentQueue, 'pull_request_id');
+
+            $server = data_get($destination, 'server');
+            $network = data_get($destination, 'network');
+
+            $containerName = generateApplicationContainerName($application, $pullRequestId);
+            savePrivateKeyToFs($server);
+
+            ray("echo 'Starting deployment of {$productionImageName}.'");
+
+            $applicationDeploymentQueue->update([
+                'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+            ]);
+            $this->executeRemoteCommand(
+                server: $server,
+                logModel: $applicationDeploymentQueue,
+                commands: prepareHelperContainer($server, $network, $deploymentUuid)
+            );
+
+            $this->executeRemoteCommand(
+                server: $server,
+                logModel: $applicationDeploymentQueue,
+                commands: generateComposeFile(
+                    deploymentUuid: $deploymentUuid,
+                    server: $server,
+                    network: $network,
+                    application: $application,
+                    containerName: $containerName,
+                    imageName: $productionImageName,
+                    pullRequestId: $pullRequestId
+                )
+            );
+            $this->executeRemoteCommand(
+                server: $server,
+                logModel: $applicationDeploymentQueue,
+                commands: rollingUpdate(application: $application, deploymentUuid: $deploymentUuid)
+            );
+        } catch (Throwable $e) {
+            $this->executeRemoteCommand(
+                server: $server,
+                logModel: $applicationDeploymentQueue,
+                commands: [
+                    "echo 'Oops something is not okay, are you okay? 😢'",
+                    "echo '{$e->getMessage()}'",
+                    "echo -n 'Deployment failed. Removing the new version of your application.'",
+                    executeInDocker($deploymentUuid, "docker rm -f $containerName >/dev/null 2>&1"),
+                ]
+            );
+            // $this->next(ApplicationDeploymentStatus::FAILED->value);
+            throw $e;
+        }
+    }
+    // private function next(string $status)
+    // {
+    //     // If the deployment is cancelled by the user, don't update the status
+    //     if ($this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
+    //         $this->application_deployment_queue->update([
+    //             'status' => $status,
+    //         ]);
+    //     }
+    //     queue_next_deployment($this->application);
+    //     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));
+    //     }
+    // }
+}

app/Jobs/ApplicationDeploySimpleDockerfileJob.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Traits\ExecuteRemoteCommand;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+
+class ApplicationDeploySimpleDockerfileJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
+
+    public $timeout = 3600;
+    public $tries = 1;
+    public string $applicationDeploymentQueueId;
+
+    public function __construct(string $applicationDeploymentQueueId)
+    {
+        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
+    }
+    public function handle() {
+        ray('Deploying Simple Dockerfile');
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -24,6 +24,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use RuntimeException;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Throwable;
@@ -54,6 +55,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
     private Server $server;
+    private Server $mainServer;
     private ?ApplicationPreview $preview = null;
     private ?string $git_type = null;
 
@@ -110,7 +112,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $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 = $this->destination->server;
+        $this->server = $this->mainServer = $this->destination->server;
         $this->serverUser = $this->server->user;
         $this->basedir = "/artifacts/{$this->deployment_uuid}";
         $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
@@ -180,10 +182,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
         }
 
-        // Get user home directory
-        $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
-        $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
-
         // Check custom port
         preg_match('/(?<=:)\d+(?=\/)/', $this->application->git_repository, $matches);
         if (count($matches) === 1) {
@@ -197,6 +195,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
+                if ($this->server->isProxyShouldRun()) {
+                    dispatch(new ContainerStatusJob($this->server));
+                }
+                $this->next(ApplicationDeploymentStatus::FINISHED->value);
+                $this->application->isConfigurationChanged(true);
+                return;
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
             } else if ($this->application->build_pack === 'dockerimage') {
@@ -215,10 +219,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->server->isProxyShouldRun()) {
                 dispatch(new ContainerStatusJob($this->server));
             }
+            if ($this->application->docker_registry_image_name) {
+                $this->push_to_docker_registry();
+            }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
             $this->application->isConfigurationChanged(true);
         } catch (Exception $e) {
-            ray($e);
             $this->fail($e);
             throw $e;
         } finally {
@@ -256,7 +262,41 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         }
     }
-
+    private function push_to_docker_registry()
+    {
+        try {
+            instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+            $this->execute_remote_command(
+                [
+                    "echo '\n----------------------------------------'",
+                ],
+                ["echo -n 'Pushing image to docker registry ({$this->production_image_name}).'"],
+                [
+                    executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
+                ],
+            );
+            if ($this->application->docker_registry_image_tag) {
+                // Tag image with latest
+                $this->execute_remote_command(
+                    ['echo -n "Tagging and pushing image with latest tag."'],
+                    [
+                        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->execute_remote_command([
+                "echo -n 'Image pushed to docker registry.'"
+            ]);
+        } catch (Exception $e) {
+            $this->execute_remote_command(
+                ["echo -n 'Failed to push image to docker registry. Please check debug logs for more information.'"],
+            );
+            ray($e);
+        }
+    }
     // private function deploy_docker_compose()
     // {
     //     $dockercompose_base64 = base64_encode($this->application->dockercompose);
@@ -296,20 +336,32 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_image_names()
     {
         if ($this->application->dockerfile) {
-            $this->build_image_name = Str::lower("{$this->application->uuid}:build");
-            $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+            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) {
-            $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 {
-            $tag = Str::of("{$this->commit}-{$this->application->id}-{$this->pull_request_id}");
-            if (strlen($tag) > 128) {
-                $tag = $tag->substr(0, 128);
+            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}");
             }
-            $this->build_image_name = Str::lower("{$this->application->uuid}:{$tag}-build");
-            $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
         }
     }
     private function just_restart()
@@ -323,31 +375,41 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->check_git_if_build_needed();
         $this->set_base_dir();
         $this->generate_image_names();
-        $this->execute_remote_command([
-            "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
-        ]);
+        $this->check_image_locally_or_remotely();
         if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
             $this->generate_compose_file();
             $this->rolling_update();
             return;
         }
-        $this->execute_remote_command([
-            "echo 'Cannot find image {$this->production_image_name} locally. Please redeploy the application.'",
-        ]);
+        throw new RuntimeException('Cannot find image anywhere. Please redeploy the application.');
     }
-    private function save_environment_variables()
+    private function check_image_locally_or_remotely()
     {
-        $envs = collect([]);
-        foreach ($this->application->environment_variables as $env) {
-            $envs->push($env->key . '=' . $env->value);
+        $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"
+            ]);
         }
-        $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 save_environment_variables()
+    // {
+    //     $envs = collect([]);
+    //     foreach ($this->application->environment_variables as $env) {
+    //         $envs->push($env->key . '=' . $env->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()
     {
         $dockerfile_base64 = base64_encode($this->application->dockerfile);
@@ -406,7 +468,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        $this->rolling_update();
+        // if ($this->application->additional_destinations) {
+        //     $this->push_to_docker_registry();
+        //     $this->deploy_to_additional_destinations();
+        // } else {
+            $this->rolling_update();
+        // }
     }
     private function deploy_nixpacks_buildpack()
     {
@@ -420,12 +487,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->set_base_dir();
         $this->generate_image_names();
         if (!$this->force_rebuild) {
-            $this->execute_remote_command([
-                "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
-            ]);
-            if (Str::of($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+            $this->check_image_locally_or_remotely();
+            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
                 $this->execute_remote_command([
-                    "echo 'No configuration changed & Docker Image found locally with the same Git Commit SHA {$this->application->uuid}:{$this->commit}. Build step skipped.'",
+                    "echo 'No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.'",
                 ]);
                 $this->generate_compose_file();
                 $this->rolling_update();
@@ -468,12 +533,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         if (count($this->application->ports_mappings_array) > 0) {
             $this->execute_remote_command(
+                [
+                    "echo '\n----------------------------------------'",
+                ],
                 ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
             );
             $this->stop_running_container(force: true);
             $this->start_by_compose_file();
         } else {
             $this->execute_remote_command(
+                [
+                    "echo '\n----------------------------------------'",
+                ],
                 ["echo -n 'Rolling update started.'"],
             );
             $this->start_by_compose_file();
@@ -489,10 +560,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         // ray('New container name: ', $this->container_name);
         if ($this->container_name) {
-            $counter = 0;
+            $counter = 1;
             $this->execute_remote_command(
                 [
-                    "echo 'Waiting for healthcheck to pass on the new version of your application.'"
+                    "echo 'Waiting for healthcheck to pass on the new container.'"
                 ]
             );
             if ($this->full_healthcheck_url) {
@@ -504,9 +575,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
             while ($counter < $this->application->health_check_retries) {
                 $this->execute_remote_command(
-                    [
-                        "echo 'Attempt {$counter} of {$this->application->health_check_retries}'"
-                    ],
                     [
                         "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
                         "hidden" => true,
@@ -516,17 +584,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 );
                 $this->execute_remote_command(
                     [
-                        "echo 'New version healthcheck status: {$this->saved_outputs->get('health_check')}'"
+                        "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
                     ],
                 );
                 if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
                     $this->newVersionIsHealthy = true;
+                    $this->application->update(['status' => 'running']);
                     $this->execute_remote_command(
                         [
-                            "echo 'Rolling update completed.'"
+                            "echo 'New container is healthy.'"
                         ],
                     );
-                    $this->application->update(['status' => 'running']);
                     break;
                 }
                 $counter++;
@@ -563,12 +631,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function prepare_builder_image()
     {
         $helperImage = config('coolify.helper_image');
+        // Get user home directory
+        $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
+        $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
+
         if ($this->dockerConfigFileExists === 'OK') {
             $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         } else {
             $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         }
-
         $this->execute_remote_command(
             [
                 "echo -n 'Preparing container with helper image: $helperImage.'",
@@ -582,7 +653,31 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ],
         );
     }
-
+    private function deploy_to_additional_destinations()
+    {
+        $destination_ids = collect(str($this->application->additional_destinations)->explode(','));
+        foreach ($destination_ids as $destination_id) {
+            $destination = StandaloneDocker::find($destination_id);
+            $server = $destination->server;
+            if ($server->team_id !== $this->mainServer->team_id) {
+                $this->execute_remote_command(
+                    [
+                        "echo -n 'Skipping deployment to {$server->name}. Not in the same team?!'",
+                    ],
+                );
+                continue;
+            }
+            $this->server = $server;
+            $this->execute_remote_command(
+                [
+                    "echo -n 'Deploying to {$this->server->name}.'",
+                ],
+            );
+            $this->prepare_builder_image();
+            $this->generate_image_names();
+            $this->rolling_update();
+        }
+    }
     private function set_base_dir()
     {
         $this->execute_remote_command(
@@ -631,6 +726,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $importCommands = $this->generate_git_import_commands();
         $this->execute_remote_command(
+            [
+                "echo '\n----------------------------------------'",
+            ],
             [
                 "echo -n 'Importing {$this->customRepository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
             ],
@@ -678,7 +776,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->fullRepoUrl = $this->customRepository;
             $private_key = data_get($this->application, 'private_key.private_key');
             if (is_null($private_key)) {
-                throw new Exception('Private key not found. Please add a private key to the application and try again.');
+                throw new RuntimeException('Private key not found. Please add a private key to the application and try again.');
             }
             $private_key = base64_encode($private_key);
             $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->customRepository} {$this->basedir}";
@@ -737,16 +835,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function generate_nixpacks_confs()
     {
-
-        $this->execute_remote_command(
-            [
-                "echo -n 'Generating nixpacks configuration.'",
-            ]
-        );
         $nixpacks_command = $this->nixpacks_build_cmd();
         $this->execute_remote_command(
             [
-                "echo -n Running: $nixpacks_command",
+                "echo -n 'Generating nixpacks configuration with: $nixpacks_command'",
             ],
             [executeInDocker($this->deployment_uuid, $nixpacks_command)],
             [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
@@ -864,7 +956,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
-        if ($this->server->isDrainLogActivated()) {
+        if ($this->server->isLogDrainEnabled() && $this->application->isLogDrainEnabled()) {
             $docker_compose['services'][$this->container_name]['logging'] = [
                 'driver' => 'fluentd',
                 'options' => [
@@ -874,6 +966,26 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ];
         }
+        if ($this->application->settings->is_gpu_enabled) {
+            ray('asd');
+            $docker_compose['services'][$this->container_name]['deploy']['resources']['reservations']['devices'] = [
+                [
+                    'driver' => data_get($this->application, 'settings.gpu_driver', 'nvidia'),
+                    'capabilities' => ['gpu'],
+                    'options' => data_get($this->application, 'settings.gpu_options', [])
+                ]
+            ];
+            if (data_get($this->application, 'settings.gpu_count')) {
+                $count = data_get($this->application, 'settings.gpu_count');
+                if ($count === 'all') {
+                    $docker_compose['services'][$this->container_name]['deploy']['resources']['reservations']['devices'][0]['count'] = $count;
+                } else {
+                    $docker_compose['services'][$this->container_name]['deploy']['resources']['reservations']['devices'][0]['count'] = (int) $count;
+                }
+            } else if (data_get($this->application, 'settings.gpu_device_ids')) {
+                $docker_compose['services'][$this->container_name]['deploy']['resources']['reservations']['devices'][0]['ids'] = data_get($this->application, 'settings.gpu_device_ids');
+            }
+        }
         if ($this->application->isHealthcheckDisabled()) {
             data_forget($docker_compose, 'services.' . $this->container_name . '.healthcheck');
         }
@@ -1000,9 +1112,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "echo -n 'Static deployment. Copying static assets to the image.'",
             ]);
         } else {
-            $this->execute_remote_command([
-                "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
-            ]);
+            $this->execute_remote_command(
+                [
+                    "echo -n 'Building docker image started.'",
+                ],
+                ["echo -n 'To check the current progress, click on Show Debug Logs.'"]
+            );
         }
 
         if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
@@ -1022,10 +1137,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 listen  [::]:80;
                 server_name  localhost;
 
-                // real_ip_header    X-Forwarded-For;
-                // proxy_set_header        X-Real-IP       \$remote_addr;
-                // proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for;
-
                 location / {
                     root   /usr/share/nginx/html;
                     index  index.html;
@@ -1078,16 +1189,24 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             );
         } else {
             // Pure Dockerfile based deployment
-            $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-            ]);
+            if ($this->application->dockerfile) {
+                $this->execute_remote_command([
+                    executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                ]);
+            } else {
+                $this->execute_remote_command([
+                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                ]);
+            }
         }
+        $this->execute_remote_command([
+            "echo -n 'Building docker image completed.'",
+        ]);
     }
 
     private function stop_running_container(bool $force = false)
     {
-        $this->execute_remote_command(["echo -n 'Removing old version of your application.'"]);
-
+        $this->execute_remote_command(["echo -n 'Removing old container.'"]);
         if ($this->newVersionIsHealthy || $force) {
             $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
             if ($this->pull_request_id !== 0) {
@@ -1105,9 +1224,14 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
                 );
             });
+            $this->execute_remote_command(
+                [
+                    "echo 'Rolling update completed.'"
+                ],
+            );
         } else {
             $this->execute_remote_command(
-                ["echo -n 'New version is not healthy, rolling back to the old version.'"],
+                ["echo -n 'New container is not healthy, rolling back to the old container.'"],
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
             );
         }
@@ -1119,12 +1243,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->execute_remote_command(
                 ["echo -n 'Pulling latest images from the registry.'"],
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                ["echo -n 'Starting application (could take a while).'"],
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         } else {
             $this->execute_remote_command(
-                ["echo -n 'Starting application (could take a while).'"],
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         }
@@ -1183,9 +1305,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     public function failed(Throwable $exception): void
     {
         $this->execute_remote_command(
-            ["echo 'Oops something is not okay, are you okay? 😢'"],
-            ["echo '{$exception->getMessage()}'"],
-            ["echo -n 'Deployment failed. Removing the new version of your application.'"],
+            ["echo 'Oops something is not okay, are you okay? 😢'", 'type' => 'err'],
+            ["echo '{$exception->getMessage()}'", 'type' => 'err'],
+            ["echo -n 'Deployment failed. Removing the new version of your application.'", 'type' => 'err'],
             [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
         );
 

app/Jobs/ApplicationRestartJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Traits\ExecuteRemoteCommand;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+
+class ApplicationRestartJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
+
+    public $timeout = 3600;
+    public $tries = 1;
+    public string $applicationDeploymentQueueId;
+    public function __construct(string $applicationDeploymentQueueId)
+    {
+        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
+    }
+    public function handle() {
+        ray('Restarting application');
+    }
+}

app/Jobs/CheckLogDrainContainerJob.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Server\InstallLogDrain;
+use App\Models\Server;
+use App\Notifications\Container\ContainerRestarted;
+use App\Notifications\Container\ContainerStopped;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Sleep;
+
+class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+    public function healthcheck()
+    {
+        $status = instant_remote_process(["docker inspect --format='{{json .State.Status}}' coolify-log-drain"], $this->server, false);
+        if (str($status)->contains('running')) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    public function handle(): void
+    {
+        // ray("checking log drain statuses for {$this->server->id}");
+        try {
+            if (!$this->server->isServerReady()) {
+                return;
+            };
+            $containers = instant_remote_process(["docker container ls -q"], $this->server);
+            if (!$containers) {
+                return;
+            }
+            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+            $containers = format_docker_command_output_to_json($containers);
+
+            $foundLogDrainContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-log-drain';
+            })->first();
+            if (!$foundLogDrainContainer || !$this->healthcheck()) {
+                ray('Log drain container not found or unhealthy. Restarting...');
+                InstallLogDrain::run($this->server);
+                Sleep::for(10)->seconds();
+                if ($this->healthcheck()) {
+                    if ($this->server->log_drain_notification_sent) {
+                        $this->server->team->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                        $this->server->update(['log_drain_notification_sent' => false]);
+                    }
+                    return;
+                }
+                if (!$this->server->log_drain_notification_sent) {
+                    ray('Log drain container still unhealthy. Sending notification...');
+                    $this->server->team->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
+                    $this->server->update(['log_drain_notification_sent' => true]);
+                }
+            } else {
+                if ($this->server->log_drain_notification_sent) {
+                    $this->server->team->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                    $this->server->update(['log_drain_notification_sent' => false]);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification("CheckLogDrainContainerJob failed on ({$this->server->id}) with: " . $e->getMessage());
+            ray($e->getMessage());
+            handleError($e);
+        }
+    }
+}

app/Jobs/ContainerStatusJob.php

@@ -37,9 +37,11 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        // ray("checking server status for {$this->server->id}");
+        // ray("checking container statuses for {$this->server->id}");
         try {
-            $this->server->checkServerRediness();
+            if (!$this->server->isServerReady()) {
+                return;
+            };
             $containers = instant_remote_process(["docker container ls -q"], $this->server);
             if (!$containers) {
                 return;
@@ -50,29 +52,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $databases = $this->server->databases();
             $services = $this->server->services()->get();
             $previews = $this->server->previews();
-            $this->server->proxyType();
-            /// Check if proxy is running
-            $foundProxyContainer = $containers->filter(function ($value, $key) {
-                return data_get($value, 'Name') === '/coolify-proxy';
-            })->first();
-            if (!$foundProxyContainer) {
-                try {
-                    $shouldStart = CheckProxy::run($this->server);
-                    if ($shouldStart) {
-                        StartProxy::run($this->server, false);
-                        $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                    } else {
-                        ray('Proxy could not be started.');
-                    }
-                } catch (\Throwable $e) {
-                    ray($e);
-                }
-            } else {
-                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
-                $this->server->save();
-                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-            }
+
             $foundApplications = [];
             $foundApplicationPreviews = [];
             $foundDatabases = [];
@@ -265,8 +245,32 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
+
+            // Check if proxy is running
+            $this->server->proxyType();
+            $foundProxyContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-proxy';
+            })->first();
+            if (!$foundProxyContainer) {
+                try {
+                    $shouldStart = CheckProxy::run($this->server);
+                    if ($shouldStart) {
+                        StartProxy::run($this->server, false);
+                        $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
+                    } else {
+                        ray('Proxy could not be started.');
+                    }
+                } catch (\Throwable $e) {
+                    ray($e);
+                }
+            } else {
+                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
+                $this->server->save();
+                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+            }
         } catch (\Throwable $e) {
-            send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
+            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
             handleError($e);
         }

app/Jobs/ServerStatusJob.php

@@ -34,8 +34,9 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     {
         ray("checking server status for {$this->server->id}");
         try {
-            $this->server->checkServerRediness();
-            $this->cleanup(notify: false);
+            if ($this->server->isServerReady()) {
+                $this->cleanup(notify: false);
+            }
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());

app/Models/Application.php

@@ -225,7 +225,8 @@ class Application extends BaseModel
         return $this->morphTo();
     }
 
-    public function isDeploymentInprogress() {
+    public function isDeploymentInprogress()
+    {
         $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'in_progress')->count();
         if ($deployments > 0) {
             return true;
@@ -300,6 +301,10 @@ class Application extends BaseModel
         }
         return false;
     }
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'settings.is_log_drain_enabled', false);
+    }
     public function isConfigurationChanged($save = false)
     {
         $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->health_check_path  . $this->health_check_port . $this->health_check_host . $this->health_check_method . $this->health_check_return_code . $this->health_check_scheme . $this->health_check_response_text . $this->health_check_interval . $this->health_check_timeout . $this->health_check_retries . $this->health_check_start_period . $this->health_check_enabled . $this->limits_memory  . $this->limits_swap . $this->limits_swappiness . $this->limits_reservation . $this->limits_cpus . $this->limits_cpuset . $this->limits_cpu_shares . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
@@ -327,4 +332,14 @@ class Application extends BaseModel
             return true;
         }
     }
+    public function isMultipleServerDeployment()
+    {
+        if (isDev()) {
+            return true;
+        }
+        if (data_get($this, 'additional_destinations') && data_get($this, 'docker_registry_image_name')) {
+            return true;
+        }
+        return false;
+    }
 }

app/Models/Server.php

@@ -120,15 +120,25 @@ class Server extends BaseModel
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
     }
-    public function checkServerRediness()
+    public function skipServer()
+    {
+        if ($this->ip === '1.2.3.4') {
+            ray('skipping 1.2.3.4');
+            return true;
+        }
+        return false;
+    }
+    public function isServerReady()
     {
         $serverUptimeCheckNumber = $this->unreachable_count;
-        $serverUptimeCheckNumberMax = 5;
+        $serverUptimeCheckNumberMax = 3;
 
         $currentTime = now()->timestamp;
-        $runtime5Minutes = 1 * 60;
-        // Run for 1 minutes max and check every 5 seconds
-        while ($currentTime + $runtime5Minutes > now()->timestamp) {
+        $runtime = 30;
+
+        $isReady = false;
+        // Run for 30 seconds max and check every 5 seconds for 3 times
+        while ($currentTime + $runtime > now()->timestamp) {
             if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                 if ($this->unreachable_notification_sent === false) {
                     ray('Server unreachable, sending notification...');
@@ -157,10 +167,11 @@ class Server extends BaseModel
                         $db->update(['status' => 'exited']);
                     }
                 }
-                throw new \Exception('Server is not reachable.');
+                $isReady = false;
+                break;
             }
             $result = $this->validateConnection();
-            ray('validateConnection: ' . $result);
+            // ray('validateConnection: ' . $result);
             if (!$result) {
                 $serverUptimeCheckNumber++;
                 $this->update([
@@ -169,25 +180,10 @@ class Server extends BaseModel
                 Sleep::for(5)->seconds();
                 return;
             }
-            $this->update([
-                'unreachable_count' => 0,
-            ]);
-            if (data_get($this, 'unreachable_notification_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->team->notify(new Revived($this));
-                $this->update(['unreachable_notification_sent' => false]);
-            }
-            if (
-                data_get($this, 'settings.is_reachable') === false ||
-                data_get($this, 'settings.is_usable') === false
-            ) {
-                $this->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
+            $isReady = true;
             break;
         }
+        return $isReady;
     }
     public function getDiskUsage()
     {
@@ -300,27 +296,61 @@ class Server extends BaseModel
         // }
         return true;
     }
-    public function logDrain($type)
-    {
-        InstallLogDrain::run($this, $type);
-    }
     public function isFunctional()
     {
         return $this->settings->is_reachable && $this->settings->is_usable;
     }
-    public function isDrainLogActivated() {
+    public function isLogDrainEnabled()
+    {
         return $this->settings->is_logdrain_newrelic_enabled || $this->settings->is_logdrain_highlight_enabled || $this->settings->is_logdrain_axiom_enabled;
     }
+    public function validateOS()
+    {
+        $os_release = instant_remote_process(['cat /etc/os-release'], $this);
+        $datas = collect(explode("\n", $os_release));
+        $collectedData = collect([]);
+        foreach ($datas as $data) {
+            $item = Str::of($data)->trim();
+            $collectedData->put($item->before('=')->value(), $item->after('=')->lower()->replace('"', '')->value());
+        }
+        $ID = data_get($collectedData, 'ID');
+        $ID_LIKE = data_get($collectedData, 'ID_LIKE');
+        $VERSION_ID = data_get($collectedData, 'VERSION_ID');
+        // ray($ID, $ID_LIKE, $VERSION_ID);
+        if (collect(SUPPORTED_OS)->contains($ID_LIKE)) {
+            ray('supported');
+            return str($ID_LIKE)->explode(' ')->first();
+        } else {
+            ray('not supported');
+            return false;
+        }
+    }
     public function validateConnection()
     {
-        $uptime = instant_remote_process(['uptime'], $this, false);
-        if (!$uptime) {
-            $this->settings->is_reachable = false;
-            $this->settings->save();
+        if ($this->skipServer()) {
             return false;
         }
-        $this->settings->is_reachable = true;
-        $this->settings->save();
+
+        $uptime = instant_remote_process(['uptime'], $this, false);
+        if (!$uptime) {
+            $this->settings()->update([
+                'is_reachable' => false,
+            ]);
+            return false;
+        } else {
+            $this->settings()->update([
+                'is_reachable' => true,
+            ]);
+            $this->update([
+                'unreachable_count' => 0,
+            ]);
+        }
+
+        if (data_get($this, 'unreachable_notification_sent') === true) {
+            $this->team->notify(new Revived($this));
+            $this->update(['unreachable_notification_sent' => false]);
+        }
+
         return true;
     }
     public function validateDockerEngine($throwError = false)
@@ -330,7 +360,7 @@ class Server extends BaseModel
             $this->settings->is_usable = false;
             $this->settings->save();
             if ($throwError) {
-                throw new \Exception('Server is not usable.');
+                throw new \Exception('Server is not usable. Docker Engine is not installed.');
             }
             return false;
         }
@@ -348,6 +378,7 @@ class Server extends BaseModel
             $this->settings->save();
             return false;
         }
+        $this->settings->is_reachable = true;
         $this->settings->is_usable = true;
         $this->settings->save();
         return true;

app/Models/Service.php

@@ -53,50 +53,83 @@ class Service extends BaseModel
             $image = str($application->image)->before(':')->value();
             switch ($image) {
                 case str($image)->contains('minio'):
+                    $data = collect([]);
                     $console_url = $this->environment_variables()->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
                     $s3_api_url = $this->environment_variables()->where('key', 'MINIO_SERVER_URL')->first();
                     $admin_user = $this->environment_variables()->where('key', 'SERVICE_USER_MINIO')->first();
+                    if (is_null($admin_user)) {
+                        $admin_user = $this->environment_variables()->where('key', 'MINIO_ROOT_USER')->first();
+                    }
                     $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_MINIO')->first();
-                    $fields->put('MinIO', [
-                        'Console URL' => [
-                            'key' => data_get($console_url, 'key'),
-                            'value' => data_get($console_url, 'value'),
-                            'rules' => 'required|url',
-                        ],
-                        'S3 API URL' => [
-                            'key' => data_get($s3_api_url, 'key'),
-                            'value' => data_get($s3_api_url, 'value'),
-                            'rules' => 'required|url',
-                        ],
-                        'Admin User' => [
-                            'key' => data_get($admin_user, 'key'),
-                            'value' => data_get($admin_user, 'value'),
-                            'rules' => 'required',
-                        ],
-                        'Admin Password' => [
-                            'key' => data_get($admin_password, 'key'),
-                            'value' => data_get($admin_password, 'value'),
-                            'rules' => 'required',
-                            'isPassword' => true,
-                        ],
-                    ]);
+                    if (is_null($admin_password)) {
+                        $admin_password = $this->environment_variables()->where('key', 'MINIO_ROOT_PASSWORD')->first();
+                    }
+
+                    if ($console_url) {
+                        $data = $data->merge([
+                            'Console URL' => [
+                                'key' => data_get($console_url, 'key'),
+                                'value' => data_get($console_url, 'value'),
+                                'rules' => 'required|url',
+                            ],
+                        ]);
+                    }
+                    if ($s3_api_url) {
+                        $data = $data->merge([
+                            'S3 API URL' => [
+                                'key' => data_get($s3_api_url, 'key'),
+                                'value' => data_get($s3_api_url, 'value'),
+                                'rules' => 'required|url',
+                            ],
+                        ]);
+                    }
+                    if ($admin_user) {
+                        $data = $data->merge([
+                            'Admin User' => [
+                                'key' => data_get($admin_user, 'key'),
+                                'value' => data_get($admin_user, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    if ($admin_password) {
+                        $data = $data->merge([
+                            'Admin Password' => [
+                                'key' => data_get($admin_password, 'key'),
+                                'value' => data_get($admin_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+
+                    $fields->put('MinIO', $data->toArray());
                     break;
                 case str($image)->contains('weblate'):
+                    $data = collect([]);
                     $admin_email = $this->environment_variables()->where('key', 'WEBLATE_ADMIN_EMAIL')->first();
                     $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_WEBLATE')->first();
-                    $fields->put('Weblate', [
-                        'Admin Email' => [
-                            'key' => data_get($admin_email, 'key'),
-                            'value' => data_get($admin_email, 'value'),
-                            'rules' => 'required|email',
-                        ],
-                        'Admin Password' => [
-                            'key' => data_get($admin_password, 'key'),
-                            'value' => data_get($admin_password, 'value'),
-                            'rules' => 'required',
-                            'isPassword' => true,
-                        ],
-                    ]);
+
+                    if ($admin_email) {
+                        $data = $data->merge([
+                            'Admin Email' => [
+                                'key' => data_get($admin_email, 'key'),
+                                'value' => data_get($admin_email, 'value'),
+                                'rules' => 'required|email',
+                            ],
+                        ]);
+                    }
+                    if ($admin_password) {
+                        $data = $data->merge([
+                            'Admin Password' => [
+                                'key' => data_get($admin_password, 'key'),
+                                'value' => data_get($admin_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    $fields->put('Weblate', $data);
             }
         }
         $databases = $this->databases()->get();
@@ -367,6 +400,19 @@ class Service extends BaseModel
                 $serviceNetworks = collect(data_get($service, 'networks', []));
                 $serviceVariables = collect(data_get($service, 'environment', []));
                 $serviceLabels = collect(data_get($service, 'labels', []));
+                if ($serviceLabels->count() > 0) {
+                    $removedLabels = collect([]);
+                    $serviceLabels = $serviceLabels->filter(function ($serviceLabel, $serviceLabelName) use ($removedLabels) {
+                        if (!str($serviceLabel)->contains('=')) {
+                            $removedLabels->put($serviceLabelName, $serviceLabel);
+                            return false;
+                        }
+                        return $serviceLabel;
+                    });
+                    foreach($removedLabels as $removedLabelName =>$removedLabel) {
+                        $serviceLabels->push("$removedLabelName=$removedLabel");
+                    }
+                }
 
                 $containerName = "$serviceName-{$this->uuid}";
 
@@ -797,7 +843,7 @@ class Service extends BaseModel
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
                     }
                 }
-                if ($this->server->isDrainLogActivated()) {
+                if ($this->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
                     data_set($service, 'logging', [
                         'driver' => 'fluentd',
                         'options' => [

app/Models/ServiceApplication.php

@@ -18,6 +18,10 @@ class ServiceApplication extends BaseModel
             $service->fileStorages()->delete();
         });
     }
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
     public function type()
     {
         return 'service';

app/Models/ServiceDatabase.php

@@ -16,6 +16,10 @@ class ServiceDatabase extends BaseModel
             $service->fileStorages()->delete();
         });
     }
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
     public function type()
     {
         return 'service';

app/Models/StandaloneMariadb.php

@@ -41,6 +41,10 @@ class StandaloneMariadb extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
     public function type(): string
     {
         return 'standalone-mariadb';

app/Models/StandaloneMongodb.php

@@ -44,7 +44,10 @@ class StandaloneMongodb extends BaseModel
             $database->environment_variables()->delete();
         });
     }
-
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
     public function mongoInitdbRootPassword(): Attribute
     {
         return Attribute::make(

app/Models/StandaloneMysql.php

@@ -46,6 +46,11 @@ class StandaloneMysql extends BaseModel
         return 'standalone-mysql';
     }
 
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
+
     public function portsMappings(): Attribute
     {
         return Attribute::make(

app/Models/StandalonePostgresql.php

@@ -42,6 +42,11 @@ class StandalonePostgresql extends BaseModel
         });
     }
 
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
+
     public function portsMappings(): Attribute
     {
         return Attribute::make(

app/Models/StandaloneRedis.php

@@ -37,6 +37,11 @@ class StandaloneRedis extends BaseModel
         });
     }
 
+    public function isLogDrainEnabled()
+    {
+        return data_get($this, 'is_log_drain_enabled', false);
+    }
+
     public function portsMappings(): Attribute
     {
         return Attribute::make(

app/Models/User.php

@@ -52,7 +52,6 @@ class User extends Authenticatable implements SendsEmail
     }
     public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
     {
-        ray('asd');
         $plainTextToken = sprintf(
             '%s%s%s',
             config('sanctum.token_prefix', ''),

app/Notifications/Container/ContainerRestarted.php

@@ -27,7 +27,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify: Container ({$this->name}) has been restarted automatically on {$this->server->name}");
+        $mail->subject("Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}");
         $mail->view('emails.container-restarted', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
@@ -38,12 +38,12 @@ class ContainerRestarted extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: Container ({$this->name}) has been restarted automatically on {$this->server->name}";
+        $message = "Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}";
         return $message;
     }
     public function toTelegram(): array
     {
-        $message = "Coolify:  Container ({$this->name}) has been restarted automatically on {$this->server->name}";
+        $message = "Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}";
         $payload = [
             "message" => $message,
         ];

app/Notifications/Container/ContainerStopped.php

@@ -26,7 +26,7 @@ class ContainerStopped extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify: Container ({$this->name}) has been stopped on {$this->server->name}");
+        $mail->subject("Coolify: A service ({$this->name}) has been stopped on {$this->server->name}");
         $mail->view('emails.container-stopped', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
@@ -37,12 +37,12 @@ class ContainerStopped extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify:  Container ({$this->name}) has been stopped on {$this->server->name}";
+        $message = "Coolify: A service ({$this->name}) has been stopped on {$this->server->name}";
         return $message;
     }
     public function toTelegram(): array
     {
-        $message = "Coolify:  Container ($this->name} has been stopped on {$this->server->name}";
+        $message = "Coolify: A service ($this->name} has been stopped on {$this->server->name}";
         $payload = [
             "message" => $message,
         ];

app/Notifications/Server/Unreachable.php

@@ -43,7 +43,7 @@ class Unreachable extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify: Server ({$this->server->name}) is unreachable after trying to connect to it 5 times");
+        $mail->subject("Coolify: Server ({$this->server->name}) is unreachable after trying to connect to it 3 times");
         $mail->view('emails.server-lost-connection', [
             'name' => $this->server->name,
         ]);
@@ -52,13 +52,13 @@ class Unreachable extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: Server '{$this->server->name}' is unreachable after trying to connect to it 5 times. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations.";
+        $message = "Coolify: Server '{$this->server->name}' is unreachable after trying to connect to it 3 times. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations.";
         return $message;
     }
     public function toTelegram(): array
     {
         return [
-            "message" => "Coolify: Server '{$this->server->name}' is unreachable after trying to connect to it 5 times. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations."
+            "message" => "Coolify: Server '{$this->server->name}' is unreachable after trying to connect to it 3 times. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations."
         ];
     }
 }

app/Traits/ExecuteRemoteCommand.php

@@ -12,7 +12,6 @@ use Illuminate\Support\Str;
 trait ExecuteRemoteCommand
 {
     public ?string $save = null;
-
     public function execute_remote_command(...$commands)
     {
         static::$batch_counter++;
@@ -32,16 +31,20 @@ trait ExecuteRemoteCommand
                 throw new \RuntimeException('Command is not set');
             }
             $hidden = data_get($single_command, 'hidden', false);
+            $customType = data_get($single_command, 'type');
             $ignore_errors = data_get($single_command, 'ignore_errors', false);
             $this->save = data_get($single_command, 'save');
 
             $remote_command = generateSshCommand($this->server, $command);
-            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden) {
+            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden, $customType) {
                 $output = Str::of($output)->trim();
+                if ($output->startsWith('╔')) {
+                    $output = "\n" . $output;
+                }
                 $new_log_entry = [
-                    'command' => $command,
-                    'output' => $output,
-                    'type' => $type === 'err' ? 'stderr' : 'stdout',
+                    'command' => remove_iip($command),
+                    'output' => remove_iip($output),
+                    'type' => $customType ?? $type === 'err' ? 'stderr' : 'stdout',
                     'timestamp' => Carbon::now('UTC'),
                     'hidden' => $hidden,
                     'batch' => static::$batch_counter,

app/Traits/ExecuteRemoteCommandNew.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Traits;
+
+use App\Enums\ApplicationDeploymentStatus;
+use App\Models\Server;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Process;
+
+trait ExecuteRemoteCommandNew
+{
+    public static $batch_counter = 0;
+    public function executeRemoteCommand(Server $server, $logModel, $commands)
+    {
+        static::$batch_counter++;
+        if ($commands instanceof Collection) {
+            $commandsText = $commands;
+        } else {
+            $commandsText = collect($commands);
+        }
+        $commandsText->each(function ($singleCommand) use ($server, $logModel) {
+            $command = data_get($singleCommand, 'command') ?? $singleCommand[0] ?? null;
+            if ($command === null) {
+                throw new \RuntimeException('Command is not set');
+            }
+            $hidden = data_get($singleCommand, 'hidden', false);
+            $customType = data_get($singleCommand, 'type');
+            $ignoreErrors = data_get($singleCommand, 'ignore_errors', false);
+            $save = data_get($singleCommand, 'save');
+
+            $remote_command = generateSshCommand($server, $command);
+            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden, $customType, $logModel, $save) {
+                $output = str($output)->trim();
+                if ($output->startsWith('╔')) {
+                    $output = "\n" . $output;
+                }
+                $newLogEntry = [
+                    'command' => remove_iip($command),
+                    'output' => remove_iip($output),
+                    'type' => $customType ?? $type === 'err' ? 'stderr' : 'stdout',
+                    'timestamp' => Carbon::now('UTC'),
+                    'hidden' => $hidden,
+                    'batch' => static::$batch_counter,
+                ];
+
+                if (!$logModel->logs) {
+                    $newLogEntry['order'] = 1;
+                } else {
+                    $previousLogs = json_decode($logModel->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+                    $newLogEntry['order'] = count($previousLogs) + 1;
+                }
+
+                $previousLogs[] = $newLogEntry;
+                $logModel->logs = json_encode($previousLogs, flags: JSON_THROW_ON_ERROR);
+                $logModel->save();
+
+                if ($save) {
+                    $this->remoteCommandOutputs[$save] = str($output)->trim();
+                }
+            });
+            $logModel->update([
+                'current_process_id' => $process->id(),
+            ]);
+
+            $processResult = $process->wait();
+            if ($processResult->exitCode() !== 0) {
+                if (!$ignoreErrors) {
+                    $status = ApplicationDeploymentStatus::FAILED->value;
+                    $logModel->status = $status;
+                    $logModel->save();
+                    throw new \RuntimeException($processResult->errorOutput());
+                }
+            }
+        });
+    }
+}

app/View/Components/Forms/Textarea.php

@@ -38,7 +38,7 @@ class Textarea extends Component
         if (is_null($this->id)) $this->id = new Cuid2(7);
         if (is_null($this->name)) $this->name = $this->id;
 
-        $this->label = Str::title($this->label);
+        // $this->label = Str::title($this->label);
         return view('components.forms.textarea');
     }
 }

bootstrap/helpers/applications.php

@@ -1,8 +1,15 @@
 <?php
 
+use App\Jobs\ApplicationDeployDockerImageJob;
 use App\Jobs\ApplicationDeploymentJob;
+use App\Jobs\ApplicationDeploySimpleDockerfileJob;
+use App\Jobs\ApplicationRestartJob;
+use App\Jobs\MultipleApplicationDeploymentJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\ApplicationPreview;
+use App\Models\Server;
+use Symfony\Component\Yaml\Yaml;
 
 function queue_application_deployment(int $application_id, 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)
 {
@@ -29,17 +36,305 @@ function queue_application_deployment(int $application_id, string $deployment_uu
     if ($running_deployments->count() > 0) {
         return;
     }
+    // New deployment
+    // dispatchDeploymentJob($deployment->id);
     dispatch(new ApplicationDeploymentJob(
         application_deployment_queue_id: $deployment->id,
     ))->onConnection('long-running')->onQueue('long-running');
+
 }
 
 function queue_next_deployment(Application $application)
 {
     $next_found = ApplicationDeploymentQueue::where('application_id', $application->id)->where('status', 'queued')->first();
     if ($next_found) {
+         // New deployment
+        // dispatchDeploymentJob($next_found->id);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $next_found->id,
         ))->onConnection('long-running')->onQueue('long-running');
+
+    }
+}
+function dispatchDeploymentJob($id)
+{
+    $applicationQueue = ApplicationDeploymentQueue::find($id);
+    $application = Application::find($applicationQueue->application_id);
+
+    $isRestartOnly = data_get($applicationQueue, 'restart_only');
+    $isSimpleDockerFile = data_get($application, 'dockerfile');
+    $isDockerImage = data_get($application, 'build_pack') === 'dockerimage';
+
+    if ($isRestartOnly) {
+        ApplicationRestartJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
+    } else if ($isSimpleDockerFile) {
+        ApplicationDeploySimpleDockerfileJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
+    } else if ($isDockerImage) {
+        ApplicationDeployDockerImageJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
+    } else {
+        throw new Exception('Unknown build pack');
+    }
+}
+
+// Deployment things
+function generateHostIpMapping(Server $server, string $network)
+{
+    // Generate custom host<->ip hostnames
+    $allContainers = instant_remote_process(["docker network inspect {$network} -f '{{json .Containers}}' "], $server);
+    $allContainers = format_docker_command_output_to_json($allContainers);
+    $ips = collect([]);
+    if (count($allContainers) > 0) {
+        $allContainers = $allContainers[0];
+        foreach ($allContainers as $container) {
+            $containerName = data_get($container, 'Name');
+            if ($containerName === 'coolify-proxy') {
+                continue;
+            }
+            $containerIp = data_get($container, 'IPv4Address');
+            if ($containerName && $containerIp) {
+                $containerIp = str($containerIp)->before('/');
+                $ips->put($containerName, $containerIp->value());
+            }
+        }
+    }
+    return $ips->map(function ($ip, $name) {
+        return "--add-host $name:$ip";
+    })->implode(' ');
+}
+
+function generateBaseDir(string $deplyomentUuid)
+{
+    return "/artifacts/$deplyomentUuid";
+}
+function generateWorkdir(string $deplyomentUuid, Application $application)
+{
+    return generateBaseDir($deplyomentUuid) . rtrim($application->base_directory, '/');
+}
+
+function prepareHelperContainer(Server $server, string $network, string $deploymentUuid)
+{
+    $basedir = generateBaseDir($deploymentUuid);
+    $helperImage = config('coolify.helper_image');
+
+    $serverUserHomeDir = instant_remote_process(["echo \$HOME"], $server);
+    $dockerConfigFileExists = instant_remote_process(["test -f {$serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $server);
+
+    $commands = collect([]);
+    if ($dockerConfigFileExists === 'OK') {
+        $commands->push([
+            "command" => "docker run -d --network $network -v /:/host --name $deploymentUuid --rm -v {$serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock $helperImage",
+            "hidden" => true,
+        ]);
+    } else {
+        $commands->push([
+            "command" => "docker run -d --network {$network} -v /:/host --name {$deploymentUuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}",
+            "hidden" => true,
+        ]);
+    }
+    $commands->push([
+        "command" => executeInDocker($deploymentUuid, "mkdir -p {$basedir}"),
+        "hidden" => true,
+    ]);
+    return $commands;
+}
+
+function generateComposeFile(string $deploymentUuid, Server $server, string $network, Application $application, string $containerName, string $imageName, ?ApplicationPreview $preview = null, int $pullRequestId = 0)
+{
+    $ports = $application->settings->is_static ? [80] : $application->ports_exposes_array;
+    $workDir = generateWorkdir($deploymentUuid, $application);
+    $persistent_storages = generateLocalPersistentVolumes($application, $pullRequestId);
+    $volume_names = generateLocalPersistentVolumesOnlyVolumeNames($application, $pullRequestId);
+    $environment_variables = generateEnvironmentVariables($application, $ports, $pullRequestId);
+
+    if (data_get($application, 'custom_labels')) {
+        $labels = collect(str($application->custom_labels)->explode(','));
+        $labels = $labels->filter(function ($value, $key) {
+            return !str($value)->startsWith('coolify.');
+        });
+        $application->custom_labels = $labels->implode(',');
+        $application->save();
+    } else {
+        $labels = collect(generateLabelsApplication($application, $preview));
+    }
+    if ($pullRequestId !== 0) {
+        $labels = collect(generateLabelsApplication($application, $preview));
+    }
+    $labels = $labels->merge(defaultLabels($application->id, $application->uuid, 0))->toArray();
+    $docker_compose = [
+        'version' => '3.8',
+        'services' => [
+            $containerName => [
+                'image' => $imageName,
+                'container_name' => $containerName,
+                'restart' => RESTART_MODE,
+                'environment' => $environment_variables,
+                'labels' => $labels,
+                'expose' => $ports,
+                'networks' => [
+                    $network,
+                ],
+                'mem_limit' => $application->limits_memory,
+                'memswap_limit' => $application->limits_memory_swap,
+                'mem_swappiness' => $application->limits_memory_swappiness,
+                'mem_reservation' => $application->limits_memory_reservation,
+                'cpus' => (int) $application->limits_cpus,
+                'cpuset' => $application->limits_cpuset,
+                'cpu_shares' => $application->limits_cpu_shares,
+            ]
+        ],
+        'networks' => [
+            $network => [
+                'external' => true,
+                'name' => $network,
+                'attachable' => true
+            ]
+        ]
+    ];
+    if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) {
+        $docker_compose['services'][$containerName]['logging'] = [
+            'driver' => 'fluentd',
+            'options' => [
+                'fluentd-address' => "tcp://127.0.0.1:24224",
+                'fluentd-async' => "true",
+                'fluentd-sub-second-precision' => "true",
+            ]
+        ];
+    }
+    if ($application->settings->is_gpu_enabled) {
+        ray('asd');
+        $docker_compose['services'][$containerName]['deploy']['resources']['reservations']['devices'] = [
+            [
+                'driver' => data_get($application, 'settings.gpu_driver', 'nvidia'),
+                'capabilities' => ['gpu'],
+                'options' => data_get($application, 'settings.gpu_options', [])
+            ]
+        ];
+        if (data_get($application, 'settings.gpu_count')) {
+            $count = data_get($application, 'settings.gpu_count');
+            if ($count === 'all') {
+                $docker_compose['services'][$containerName]['deploy']['resources']['reservations']['devices'][0]['count'] = $count;
+            } else {
+                $docker_compose['services'][$containerName]['deploy']['resources']['reservations']['devices'][0]['count'] = (int) $count;
+            }
+        } else if (data_get($application, 'settings.gpu_device_ids')) {
+            $docker_compose['services'][$containerName]['deploy']['resources']['reservations']['devices'][0]['ids'] = data_get($application, 'settings.gpu_device_ids');
+        }
+    }
+    if ($application->isHealthcheckDisabled()) {
+        data_forget($docker_compose, 'services.' . $containerName . '.healthcheck');
+    }
+    if (count($application->ports_mappings_array) > 0 && $pullRequestId === 0) {
+        $docker_compose['services'][$containerName]['ports'] = $application->ports_mappings_array;
+    }
+    if (count($persistent_storages) > 0) {
+        $docker_compose['services'][$containerName]['volumes'] = $persistent_storages;
+    }
+    if (count($volume_names) > 0) {
+        $docker_compose['volumes'] = $volume_names;
+    }
+    $docker_compose = Yaml::dump($docker_compose, 10);
+    $docker_compose_base64 = base64_encode($docker_compose);
+    $commands = collect([]);
+    $commands->push([
+        "command" => executeInDocker($deploymentUuid, "echo '{$docker_compose_base64}' | base64 -d > {$workDir}/docker-compose.yml"),
+        "hidden" => true,
+    ]);
+    return $commands;
+}
+function generateLocalPersistentVolumes(Application $application, int $pullRequestId = 0)
+{
+    $local_persistent_volumes = [];
+    foreach ($application->persistentStorages as $persistentStorage) {
+        $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+        if ($pullRequestId !== 0) {
+            $volume_name = $volume_name . '-pr-' . $pullRequestId;
+        }
+        $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+    }
+    return $local_persistent_volumes;
+}
+
+function generateLocalPersistentVolumesOnlyVolumeNames(Application $application, int $pullRequestId = 0)
+{
+    $local_persistent_volumes_names = [];
+    foreach ($application->persistentStorages as $persistentStorage) {
+        if ($persistentStorage->host_path) {
+            continue;
+        }
+        $name = $persistentStorage->name;
+
+        if ($pullRequestId !== 0) {
+            $name = $name . '-pr-' . $pullRequestId;
+        }
+
+        $local_persistent_volumes_names[$name] = [
+            'name' => $name,
+            'external' => false,
+        ];
+    }
+    return $local_persistent_volumes_names;
+}
+function generateEnvironmentVariables(Application $application, $ports, int $pullRequestId = 0)
+{
+    $environment_variables = collect();
+    // ray('Generate Environment Variables')->green();
+    if ($pullRequestId === 0) {
+        // ray($this->application->runtime_environment_variables)->green();
+        foreach ($application->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+        foreach ($application->nixpacks_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+    } else {
+        // ray($this->application->runtime_environment_variables_preview)->green();
+        foreach ($application->runtime_environment_variables_preview as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+        foreach ($application->nixpacks_environment_variables_preview as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+    }
+    // Add PORT if not exists, use the first port as default
+    if ($environment_variables->filter(fn ($env) => str($env)->contains('PORT'))->isEmpty()) {
+        $environment_variables->push("PORT={$ports[0]}");
+    }
+    return $environment_variables->all();
+}
+
+function rollingUpdate(Application $application, string $deploymentUuid)
+{
+    $commands = collect([]);
+    $workDir = generateWorkdir($deploymentUuid, $application);
+    if (count($application->ports_mappings_array) > 0) {
+        // $this->execute_remote_command(
+        //     [
+        //         "echo '\n----------------------------------------'",
+        //     ],
+        //     ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
+        // );
+        // $this->stop_running_container(force: true);
+        // $this->start_by_compose_file();
+    } else {
+        $commands->push(
+            [
+                "command" =>  "echo '\n----------------------------------------'"
+            ],
+            [
+                "command" =>  "echo -n 'Rolling update started.'"
+            ]
+        );
+        if ($application->build_pack === 'dockerimage') {
+            $commands->push(
+                ["echo -n 'Pulling latest images from the registry.'"],
+                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} pull"), "hidden" => true],
+                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"), "hidden" => true],
+            );
+        } else {
+            $commands->push(
+                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"), "hidden" => true],
+            );
+        }
+        return $commands;
     }
 }

bootstrap/helpers/constants.php

@@ -1,5 +1,6 @@
 <?php
 
+const REDACTED = '<REDACTED>';
 const DATABASE_TYPES = ['postgresql', 'redis', 'mongodb', 'mysql', 'mariadb'];
 const VALID_CRON_STRINGS = [
     'every_minute' => '* * * * *',
@@ -26,3 +27,8 @@ const DATABASE_DOCKER_IMAGES = [
 const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',
 ];
+
+const SUPPORTED_OS = [
+    'debian',
+    'rhel centos fedora'
+];

bootstrap/helpers/remoteProcess.php

@@ -170,10 +170,13 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
             $i['timestamp'] = Carbon::parse($i['timestamp'])->format('Y-M-d H:i:s.u');
             return $i;
         });
-
     return $formatted;
 }
-
+function remove_iip($text)
+{
+    $text = preg_replace('/x-access-token:.*?(?=@)/', "x-access-token:" . REDACTED, $text);
+    return preg_replace('/\x1b\[[0-9;]*m/', '', $text);
+}
 function refresh_server_connection(?PrivateKey $private_key = null)
 {
     if (is_null($private_key)) {

bootstrap/helpers/shared.php

@@ -93,8 +93,13 @@ function refreshSession(?Team $team = null): void
 }
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
-    ray('handleError');
-    ray($error);
+    if ($error instanceof TooManyRequestsException) {
+        if (isset($livewire)) {
+            return $livewire->emit('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
+        }
+        return "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.";
+    }
+
     if ($error instanceof Throwable) {
         $message = $error->getMessage();
     } else {
@@ -103,55 +108,12 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     if ($customErrorMessage) {
         $message = $customErrorMessage . ' ' . $message;
     }
-    if ($error instanceof TooManyRequestsException) {
-        if (isset($livewire)) {
-            return $livewire->emit('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
-        }
-        return "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.";
-    }
+
     if (isset($livewire)) {
         return $livewire->emit('error', $message);
     }
-
-    throw new RuntimeException($message);
+    throw new Exception($message);
 }
-function general_error_handler(Throwable $err, Livewire\Component $that = null, $isJson = false, $customErrorMessage = null): mixed
-{
-    try {
-        ray($err);
-        ray('ERROR OCCURRED: ' . $err->getMessage());
-        if ($err instanceof QueryException) {
-            if ($err->errorInfo[0] === '23505') {
-                throw new Exception($customErrorMessage ?? 'Duplicate entry found.', '23505');
-            } else if (count($err->errorInfo) === 4) {
-                throw new Exception($customErrorMessage ?? $err->errorInfo[3]);
-            } else {
-                throw new Exception($customErrorMessage ?? $err->errorInfo[2]);
-            }
-        } elseif ($err instanceof TooManyRequestsException) {
-            throw new Exception($customErrorMessage ?? "Too many requests. Please try again in {$err->secondsUntilAvailable} seconds.");
-        } else {
-            if ($err->getMessage() === 'This action is unauthorized.') {
-                return redirect()->route('dashboard')->with('error', $customErrorMessage ?? $err->getMessage());
-            }
-            throw new Exception($customErrorMessage ?? $err->getMessage());
-        }
-    } catch (\Throwable $e) {
-        if ($that) {
-            return $that->emit('error', $customErrorMessage ?? $e->getMessage());
-        } elseif ($isJson) {
-            return response()->json([
-                'code' => $e->getCode(),
-                'error' => $e->getMessage(),
-            ]);
-        } else {
-            ray($customErrorMessage);
-            ray($e);
-            return $customErrorMessage ?? $e->getMessage();
-        }
-    }
-}
-
 function get_route_parameters(): array
 {
     return Route::current()->parameters();

config/sentry.php

@@ -3,11 +3,11 @@
 return [
 
     // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/
-    'dsn' => 'https://c35fe90ee56e18b220bb55e8217d4839@o1082494.ingest.sentry.io/4505347448045568',
+    'dsn' => 'https://396748153b19c469f5ceff50f1664323@o1082494.ingest.sentry.io/4505347448045568',
 
     // 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.139',
+    'release' => '4.0.0-beta.145',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
@@ -76,6 +76,7 @@ return [
     'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false),
 
     // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate
+    'enable_tracing' => env('SENTRY_ENABLE_TRACING', false),
     'traces_sample_rate' => 0.2,
 
     'profiles_sample_rate' => env('SENTRY_PROFILES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_PROFILES_SAMPLE_RATE'),

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.139';
+return '4.0.0-beta.145';

database/migrations/2023_11_17_160437_add_drain_log_enable_by_service.php

@@ -0,0 +1,76 @@
+<?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_settings', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('standalone_mysqls', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('standalone_mariadbs', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('standalone_postgresqls', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('standalone_mongodbs', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('service_databases', function (Blueprint $table) {
+            $table->boolean('is_log_drain_enabled')->default(false);
+        });
+        Schema::table('servers', function (Blueprint $table) {
+            $table->boolean('log_drain_notification_sent')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('standalone_mysqls', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('standalone_mariadbs', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('standalone_postgresqls', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('standalone_mongodbs', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('service_databases', function (Blueprint $table) {
+            $table->dropColumn('is_log_drain_enabled');
+        });
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('log_drain_notification_sent');
+        });
+    }
+};

database/migrations/2023_11_20_094628_add_gpu_settings.php

@@ -0,0 +1,36 @@
+<?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_settings', function (Blueprint $table) {
+            $table->boolean('is_gpu_enabled')->default(false);
+            $table->string('gpu_driver')->default('nvidia');
+            $table->string('gpu_count')->nullable();
+            $table->string('gpu_device_ids')->nullable();
+            $table->longText('gpu_options')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_gpu_enabled');
+            $table->dropColumn('gpu_driver');
+            $table->dropColumn('gpu_count');
+            $table->dropColumn('gpu_device_ids');
+            $table->dropColumn('gpu_options');
+        });
+    }
+};

database/migrations/2023_11_21_121920_add_additional_destinations_to_apps.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('applications', function (Blueprint $table) {
+            $table->string('additional_destinations')->nullable()->after('destination');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('additional_destinations');
+        });
+    }
+};

package-lock.json

@@ -6,19 +6,19 @@
         "": {
             "dependencies": {
                 "@tailwindcss/typography": "0.5.10",
-                "alpinejs": "3.13.1",
-                "daisyui": "4.0.3",
+                "alpinejs": "3.13.2",
+                "daisyui": "4.3.1",
                 "tailwindcss-scrollbar": "0.1.0"
             },
             "devDependencies": {
-                "@vitejs/plugin-vue": "4.4.0",
+                "@vitejs/plugin-vue": "4.5.0",
                 "autoprefixer": "10.4.16",
-                "axios": "1.5.1",
+                "axios": "1.6.2",
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.31",
                 "tailwindcss": "3.3.5",
-                "vite": "4.4.11",
-                "vue": "3.3.4"
+                "vite": "4.5.0",
+                "vue": "3.3.8"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -33,9 +33,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.22.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz",
-            "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==",
+            "version": "7.23.3",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+            "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -503,90 +503,90 @@
             }
         },
         "node_modules/@vitejs/plugin-vue": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.4.0.tgz",
-            "integrity": "sha512-xdguqb+VUwiRpSg+nsc2HtbAUSGak25DXYvpQQi4RVU1Xq1uworyoH/md9Rfd8zMmPR/pSghr309QNcftUVseg==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.5.0.tgz",
+            "integrity": "sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==",
             "dev": true,
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
             },
             "peerDependencies": {
-                "vite": "^4.0.0",
+                "vite": "^4.0.0 || ^5.0.0",
                 "vue": "^3.2.25"
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
-            "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz",
+            "integrity": "sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.21.3",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
-            "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz",
+            "integrity": "sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-core": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
-            "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz",
+            "integrity": "sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/reactivity-transform": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.8",
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/compiler-ssr": "3.3.8",
+                "@vue/reactivity-transform": "3.3.8",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0",
-                "postcss": "^8.1.10",
+                "magic-string": "^0.30.5",
+                "postcss": "^8.4.31",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
-            "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz",
+            "integrity": "sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -598,83 +598,83 @@
             }
         },
         "node_modules/@vue/reactivity-transform": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
-            "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz",
+            "integrity": "sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.8",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0"
+                "magic-string": "^0.30.5"
             }
         },
         "node_modules/@vue/reactivity-transform/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
-            "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.8.tgz",
+            "integrity": "sha512-qurzOlb6q26KWQ/8IShHkMDOuJkQnQcTIp1sdP4I9MbCf9FJeGVRXJFr2mF+6bXh/3Zjr9TDgURXrsCr9bfjUw==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/reactivity": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
-            "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.8.tgz",
+            "integrity": "sha512-ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.3.4"
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
-            "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.8.tgz",
+            "integrity": "sha512-Noy5yM5UIf9UeFoowBVgghyGGPIDPy1Qlqt0yVsUdAVbqI8eeMSsTqBtauaEoT2UFXUk5S64aWVNJN4MJ2vRdA==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.3.4",
-                "@vue/shared": "3.3.4",
-                "csstype": "^3.1.1"
+                "@vue/runtime-core": "3.3.8",
+                "@vue/shared": "3.3.8",
+                "csstype": "^3.1.2"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
-            "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.8.tgz",
+            "integrity": "sha512-zVCUw7RFskvPuNlPn/8xISbrf0zTWsTSdYTsUTN1ERGGZGVnRxM2QZ3x1OR32+vwkkCm0IW6HmJ49IsPm7ilLg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-ssr": "3.3.8",
+                "@vue/shared": "3.3.8"
             },
             "peerDependencies": {
-                "vue": "3.3.4"
+                "vue": "3.3.8"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -683,9 +683,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/alpinejs": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.1.tgz",
-            "integrity": "sha512-/LZ7mumW02V7AV5xTTftJFHS0I3KOXLl7tHm4xpxXAV+HJ/zjTT0n8MU7RZ6UoGPhmO/i+KEhQojaH/0RsH5tg==",
+            "version": "3.13.2",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.2.tgz",
+            "integrity": "sha512-WzojeeN082kLZznGI1HAuP8yFJSWqJ1fGdz2mUjj45H4y0XwToE7fFqtI3mCPRR+BpcSbxT/NL+FyPnYAWSltw==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -756,9 +756,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-            "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
             "dev": true,
             "dependencies": {
                 "follow-redirects": "^1.15.0",
@@ -956,9 +956,9 @@
             }
         },
         "node_modules/daisyui": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.0.3.tgz",
-            "integrity": "sha512-mG6PsdIA6MEHzdJwBlJxc1rqsIAAlcfhj2O8g0ol1uWg5y6C5zTcqfG8vKBqK4y2YfCxGIVgMsMWRTSm32N1Ow==",
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.3.1.tgz",
+            "integrity": "sha512-dCi91VD+57lkoBd10CjdW4wPOeOPYvvzQbxti6xmyQbDMbCeCXwNq2KdoU798I4OsCcD5B+n7yVG7HAgYW+cvw==",
             "dependencies": {
                 "css-selector-tokenizer": "^0.8",
                 "culori": "^3",
@@ -1153,9 +1153,9 @@
             "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
         },
         "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "hasInstallScript": true,
             "optional": true,
             "os": [
@@ -1335,12 +1335,12 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
         "node_modules/magic-string": {
-            "version": "0.30.0",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-            "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+            "version": "0.30.5",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.4.13"
+                "@jridgewell/sourcemap-codec": "^1.4.15"
             },
             "engines": {
                 "node": ">=12"
@@ -1711,9 +1711,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "3.29.3",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz",
-            "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==",
+            "version": "3.29.4",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+            "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
             "dev": true,
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -1922,9 +1922,9 @@
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "node_modules/vite": {
-            "version": "4.4.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
-            "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
+            "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.18.10",
@@ -1977,35 +1977,40 @@
             }
         },
         "node_modules/vite-plugin-full-reload": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.0.5.tgz",
-            "integrity": "sha512-kVZFDFWr0DxiHn6MuDVTQf7gnWIdETGlZh0hvTiMXzRN80vgF4PKbONSq8U1d0WtHsKaFODTQgJeakLacoPZEQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.1.0.tgz",
+            "integrity": "sha512-3cObNDzX6DdfhD9E7kf6w2mNunFpD7drxyNgHLw+XwIYAgb+Xt16SEXo0Up4VH+TMf3n+DSVJZtW2POBGcBYAA==",
             "dev": true,
             "dependencies": {
                 "picocolors": "^1.0.0",
                 "picomatch": "^2.3.1"
-            },
-            "peerDependencies": {
-                "vite": "^2 || ^3 || ^4"
             }
         },
         "node_modules/vue": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
-            "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.8.tgz",
+            "integrity": "sha512-5VSX/3DabBikOXMsxzlW8JyfeLKlG9mzqnWgLQLty88vdZL7ZJgrdgBOmrArwxiLtmS+lNNpPcBYqrhE6TQW5w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-sfc": "3.3.4",
-                "@vue/runtime-dom": "3.3.4",
-                "@vue/server-renderer": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/compiler-sfc": "3.3.8",
+                "@vue/runtime-dom": "3.3.8",
+                "@vue/server-renderer": "3.3.8",
+                "@vue/shared": "3.3.8"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -6,19 +6,19 @@
         "build": "vite build"
     },
     "devDependencies": {
-        "@vitejs/plugin-vue": "4.4.0",
+        "@vitejs/plugin-vue": "4.5.0",
         "autoprefixer": "10.4.16",
-        "axios": "1.5.1",
+        "axios": "1.6.2",
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.31",
         "tailwindcss": "3.3.5",
-        "vite": "4.4.11",
-        "vue": "3.3.4"
+        "vite": "4.5.0",
+        "vue": "3.3.8"
     },
     "dependencies": {
         "@tailwindcss/typography": "0.5.10",
-        "alpinejs": "3.13.1",
-        "daisyui": "4.0.3",
+        "alpinejs": "3.13.2",
+        "daisyui": "4.3.1",
         "tailwindcss-scrollbar": "0.1.0"
     }
 }

resources/views/components/forms/checkbox.blade.php

@@ -1,4 +1,4 @@
-<div class="form-control min-w-fit">
+<div class="px-2 form-control min-w-fit hover:bg-coolgray-100">
     <label class="flex gap-4 px-0 cursor-pointer label">
         <span class="flex gap-2 label-text min-w-fit">
             @if ($label)
@@ -7,20 +7,7 @@
                 {{ $id }}
             @endif
             @if ($helper)
-                <div class="group w-fit">
-                    <div class="cursor-pointer text-warning">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                            class="w-4 h-4 stroke-current">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                        </svg>
-                    </div>
-                    <div class="absolute hidden text-xs group-hover:block border-coolgray-400 bg-coolgray-500">
-                        <div class="p-4 card-body">
-                            {!! $helper !!}
-                        </div>
-                    </div>
-                </div>
+                <x-helper :helper="$helper" />
             @endif
         </span>
         <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}

resources/views/emails/container-restarted.blade.php

@@ -1,6 +1,6 @@
 <x-emails.layout>
 
-Container ({{ $containerName }}) has been restarted automatically on {{$serverName}}, because it was stopped unexpectedly.
+A service ({{ $containerName }}) has been restarted automatically on {{$serverName}}, because it was stopped unexpectedly.
 
 @if ($containerName === 'coolify-proxy')
 Coolify Proxy should run on your server as you have FQDNs set up in one of your resources.

resources/views/emails/container-stopped.blade.php

@@ -1,6 +1,6 @@
 <x-emails.layout>
 
-Container {{ $containerName }} has been stopped unexpectedly on {{$serverName}}.
+A service ({{ $containerName }}) has been stopped unexpectedly on {{$serverName}}.
 
 @if ($url)
 Please check what is going on [here]({{ $url }}).

resources/views/layouts/base.blade.php

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html data-theme="coollabs" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -25,6 +26,7 @@
     @endif
 </head>
 @section('body')
+
     <body>
         @livewireScripts
         <dialog id="help" class="modal">
@@ -120,6 +122,9 @@
             Livewire.on('success', (message) => {
                 if (message) Toaster.success(message)
             })
+            Livewire.on('installDocker', () => {
+                installDocker.showModal();
+            })
         </script>
     </body>
 @show

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

@@ -225,8 +225,7 @@
                     Could not find Docker Engine on your server. Do you want me to install it for you?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="installDocker"
-                    onclick="installDocker.showModal()">
+                    <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">
@@ -235,9 +234,10 @@
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able
-                        to run optimal.</p>
+                        to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install Docker Engine, check <a target="_blank" class="underline text-warning" href="https://coolify.io/docs/servers#install-docker-engine-manually">this documentation</a>.</p>
                 </x-slot:explanation>
             </x-boarding-step>
+
         @endif
     </div>
     <div>

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

@@ -0,0 +1,55 @@
+<div>
+    <div class="flex flex-col">
+        <div class="flex items-center gap-2">
+            <h2>Advanced</h2>
+        </div>
+        <div>Advanced configuration for your application.</div>
+        <div class="flex flex-col w-full pt-4">
+
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
+            <x-forms.checkbox
+                helper="Your application will be available only on https if your domain starts with https://..."
+                instantSave id="application.settings.is_force_https_enabled" label="Force Https" />
+            @if ($application->git_based())
+                <x-forms.checkbox helper="Automatically deploy new commits based on Git webhooks." instantSave
+                    id="application.settings.is_auto_deploy_enabled" label="Auto Deploy" />
+                <x-forms.checkbox
+                    helper="Allow to automatically deploy Preview Deployments for all opened PR's.<br><br>Closing a PR will delete Preview Deployments."
+                    instantSave id="application.settings.is_preview_deployments_enabled" label="Preview Deployments" />
+
+                <x-forms.checkbox instantSave id="application.settings.is_git_submodules_enabled" label="Git Submodules"
+                    helper="Allow Git Submodules during build process." />
+                <x-forms.checkbox instantSave id="application.settings.is_git_lfs_enabled" label="Git LFS"
+                    helper="Allow Git LFS during build process." />
+            @endif
+            <form wire:submit.prevent="submit">
+                <div class="flex gap-2">
+                    <x-forms.checkbox helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>." instantSave
+                        id="application.settings.is_gpu_enabled" label="GPU Enabled Application" />
+                    @if ($application->settings->is_gpu_enabled)
+                        <x-forms.button type="submiot">Save</x-forms.button>
+                    @endif
+                </div>
+                @if ($application->settings->is_gpu_enabled)
+                    <div class="flex flex-col w-full gap-2 p-2 xl:flex-row">
+                        <x-forms.input label="GPU Driver" id="application.settings.gpu_driver"> </x-forms.input>
+                        <x-forms.input label="GPU Count" placeholder="empty means use all GPUs"
+                            id="application.settings.gpu_count"> </x-forms.input>
+                        <x-forms.input label="GPU Device Ids" placeholder="0,2"
+                            helper="Comma separated list of device ids. More info <a href='https://docs.docker.com/compose/gpu-support/#access-specific-devices' class='text-white underline' target='_blank'>here</a>."
+                            id="application.settings.gpu_device_ids"> </x-forms.input>
+
+                    </div>
+                    <div class="px-2">
+                        <x-forms.textarea label="GPU Options" id="application.settings.gpu_options">
+                        </x-forms.textarea>
+                    </div>
+                @endif
+            </form>
+            {{-- <x-forms.checkbox disabled instantSave id="is_dual_cert" label="Dual Certs?" />
+            <x-forms.checkbox disabled instantSave id="is_custom_ssl" label="Is Custom SSL?" />
+            <x-forms.checkbox disabled instantSave id="is_http2" label="Is Http2?" /> --}}
+        </div>
+    </div>
+</div>

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

@@ -1,10 +1,12 @@
-<x-layout>
+<div>
     <h1>Configuration</h1>
     <livewire:project.application.heading :application="$application" />
     <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex h-full pt-6">
         <div class="flex flex-col gap-4 min-w-fit">
             <a :class="activeTab === 'general' && 'text-white'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
+            <a :class="activeTab === 'advanced' && 'text-white'"
+                @click.prevent="activeTab = 'advanced'; window.location.hash = 'advanced'" href="#">Advanced</a>
             @if ($application->build_pack !== 'static')
                 <a :class="activeTab === 'environment-variables' && 'text-white'"
                     @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
@@ -34,7 +36,7 @@
             @endif
             @if ($application->build_pack !== 'static')
                 <a :class="activeTab === 'health' && 'text-white'"
-                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
+                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Healthchecks
                 </a>
             @endif
             <a :class="activeTab === 'rollback' && 'text-white'"
@@ -52,6 +54,9 @@
             <div x-cloak x-show="activeTab === 'general'" class="h-full">
                 <livewire:project.application.general :application="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
+                <livewire:project.application.advanced :application="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <livewire:project.shared.environment-variable.all :resource="$application" />
             </div>
@@ -61,7 +66,7 @@
                 </div>
             @endif
             <div x-cloak x-show="activeTab === 'server'">
-                <livewire:project.shared.destination :destination="$application->destination" />
+                <livewire:project.shared.destination :resource="$application" :servers="$servers" />
             </div>
             <div x-cloak x-show="activeTab === 'storages'">
                 <livewire:project.service.storage :resource="$application" />
@@ -86,4 +91,4 @@
             </div>
         </div>
     </div>
-</x-layout>
+</div>

resources/views/livewire/project/application/deployment-logs.blade.php

@@ -48,9 +48,8 @@
                     @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                         <div @class([
                             'font-mono whitespace-pre-line',
-                            'text-white' => $line['type'] == 'stdout',
-                            'text-error' => $line['type'] == 'stderr',
                             'text-warning' => $line['hidden'],
+                            'text-error' => $line['type'] == 'stderr',
                         ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
                                 <br>COMMAND: <br>{{ $line['command'] }} <br><br>OUTPUT:
                                 @endif{{ $line['output'] }}@if ($line['hidden'])

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

@@ -40,12 +40,33 @@
                     </div>
                     @if ($application->could_set_build_commands())
                         <div class="w-64">
-                            <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                            <x-forms.checkbox instantSave id="application.settings.is_static"
+                                label="Is it a static site?"
                                 helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
                         </div>
                     @endif
                 </div>
             @endif
+            <h3>Docker Registry</h3>
+            @if ($application->build_pack !== 'dockerimage')
+                <div>Push the built image to a docker registry. More info <a class="underline"
+                        href="https://coolify.io/docs/docker-registries" target="_blank">here</a>.</div>
+            @endif
+            <div class="flex flex-col gap-2 xl:flex-row">
+                @if ($application->build_pack === 'dockerimage')
+                    <x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
+                    <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
+                @else
+                    <x-forms.input id="application.docker_registry_image_name"
+                        helper="Empty means it won't push the image to a docker registry."
+                        placeholder="Empty means it won't push the image to a docker registry." label="Docker Image" />
+                    <x-forms.input id="application.docker_registry_image_tag"
+                        placeholder="Empty means only push commit sha tag."
+                        helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
+                        label="Docker Image Tag" />
+                @endif
+
+            </div>
 
             @if ($application->build_pack !== 'dockerimage')
                 <h3>Build</h3>
@@ -64,8 +85,6 @@
                         </div>
                     @endif
                 @endif
-
-
                 <div class="flex flex-col gap-2 xl:flex-row">
                     <x-forms.input placeholder="/" id="application.base_directory" label="Base Directory"
                         helper="Directory to use as root. Useful for monorepos." />
@@ -88,11 +107,6 @@
                         @endif
                     @endif
                 </div>
-            @else
-                <div class="flex flex-col gap-2 xl:flex-row">
-                    <x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
-                    <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
-                </div>
             @endif
 
             @if ($application->dockerfile)
@@ -112,27 +126,5 @@
             <x-forms.textarea label="Container Labels" rows="15" id="customLabels"></x-forms.textarea>
             <x-forms.button wire:click="resetDefaultLabels">Reset to Coolify Generated Labels</x-forms.button>
         </div>
-        <h3>Advanced</h3>
-        <div class="flex flex-col">
-            <x-forms.checkbox
-                helper="Your application will be available only on https if your domain starts with https://..."
-                instantSave id="is_force_https_enabled" label="Force Https" />
-            @if ($application->git_based())
-                <x-forms.checkbox helper="Automatically deploy new commits based on Git webhooks." instantSave
-                    id="is_auto_deploy_enabled" label="Auto Deploy" />
-                <x-forms.checkbox
-                    helper="Allow to automatically deploy Preview Deployments for all opened PR's.<br><br>Closing a PR will delete Preview Deployments."
-                    instantSave id="is_preview_deployments_enabled" label="Preview Deployments" />
-
-                <x-forms.checkbox instantSave id="is_git_submodules_enabled" label="Git Submodules"
-                    helper="Allow Git Submodules during build process." />
-                <x-forms.checkbox instantSave id="is_git_lfs_enabled" label="Git LFS"
-                    helper="Allow Git LFS during build process." />
-            @endif
-
-            {{-- <x-forms.checkbox disabled instantSave id="is_dual_cert" label="Dual Certs?" />
-            <x-forms.checkbox disabled instantSave id="is_custom_ssl" label="Is Custom SSL?" />
-            <x-forms.checkbox disabled instantSave id="is_http2" label="Is Http2?" /> --}}
-        </div>
     </form>
 </div>

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

@@ -1,12 +1,12 @@
 <div x-init="$wire.loadImages">
     <div class="flex items-center gap-2">
         <h2>Rollback</h2>
-        <x-forms.button wire:click='loadImages'>Reload Available Images</x-forms.button>
+        <x-forms.button wire:click='loadImages(true)'>Reload Available Images</x-forms.button>
     </div>
-    <div class="pb-4 ">You can easily rollback to a previously built image quickly.</div>
+    <div class="pb-4 ">You can easily rollback to a previously built <span class="text-warning">(local)</span> images quickly.</div>
     <div wire:target='loadImages'>
         <div class="flex flex-wrap">
-            @foreach ($images as $image)
+            @forelse ($images as $image)
                 <div class="w-2/4 p-2">
                     <div class="rounded shadow-lg bg-coolgray-200">
                         <div class="p-2">
@@ -25,14 +25,16 @@
                                     Rollback
                                 </x-forms.button>
                             @else
-                                <x-forms.button wire:click="rollbackImage('{{ data_get($image, 'tag') }}')">
+                                <x-forms.button class="bg-coolgray-100" wire:click="rollbackImage('{{ data_get($image, 'tag') }}')">
                                     Rollback
                                 </x-forms.button>
                             @endif
                         </div>
                     </div>
                 </div>
-            @endforeach
+            @empty
+                <div>No images found locally.</div>
+            @endforelse
         </div>
     </div>
 </div>

resources/views/livewire/project/database/mariadb/general.blade.php

@@ -59,5 +59,10 @@
             @endif
         </div>
         <x-forms.textarea label="Custom MariaDB Configuration" rows="10" id="database.mariadb_conf" />
+        <h3 class="pt-4">Advanced</h3>
+        <div class="flex flex-col">
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
+        </div>
     </form>
 </div>

resources/views/livewire/project/database/mongodb/general.blade.php

@@ -16,8 +16,8 @@
             <div class="flex gap-2">
                 <x-forms.input label="Initial Username" id="database.mongo_initdb_root_username"
                     placeholder="If empty: postgres" readonly helper="You can only change this in the database." />
-                <x-forms.input label="Initial Password" id="database.mongo_initdb_root_password" type="password" required
-                    readonly helper="You can only change this in the database." />
+                <x-forms.input label="Initial Password" id="database.mongo_initdb_root_password" type="password"
+                    required readonly helper="You can only change this in the database." />
                 <x-forms.input label="Initial Database" id="database.mongo_initdb_database"
                     placeholder="If empty, it will be the same as Username." readonly
                     helper="You can only change this in the database." />
@@ -44,14 +44,19 @@
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
             <x-forms.input label="Mongo URL (internal)"
-            helper="If you change the user/password/port, this could be different. This is with the default values."
+                helper="If you change the user/password/port, this could be different. This is with the default values."
                 type="password" readonly wire:model="db_url" />
             @if ($db_url_public)
-            <x-forms.input label="Mongo URL (public)"
-            helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url_public" />
+                <x-forms.input label="Mongo URL (public)"
+                    helper="If you change the user/password/port, this could be different. This is with the default values."
+                    type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
         <x-forms.textarea label="Custom MongoDB Configuration" rows="10" id="database.mongo_conf" />
+        <h3 class="pt-4">Advanced</h3>
+        <div class="flex flex-col">
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
+        </div>
     </form>
 </div>

resources/views/livewire/project/database/mysql/general.blade.php

@@ -59,5 +59,10 @@
             @endif
         </div>
         <x-forms.textarea label="Custom Mysql Configuration" rows="10" id="database.mysql_conf" />
+        <h3 class="pt-4">Advanced</h3>
+        <div class="flex flex-col">
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
+        </div>
     </form>
 </div>

resources/views/livewire/project/database/postgresql/general.blade.php

@@ -74,6 +74,11 @@
         </div>
         <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="database.postgres_conf" />
     </form>
+    <h3 class="pt-4">Advanced</h3>
+    <div class="flex flex-col">
+        <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings." instantSave="instantSaveAdvanced"
+            id="database.is_log_drain_enabled" label="Drain Logs" />
+    </div>
     <div class="pb-16">
         <div class="flex gap-2 pt-4 pb-2">
             <h3>Initialization scripts</h3>
@@ -87,4 +92,5 @@
             @endforelse
         </div>
     </div>
+
 </div>

resources/views/livewire/project/database/redis/general.blade.php

@@ -33,5 +33,10 @@
         <x-forms.textarea
             helper="<a target='_blank' class='text-white underline' href='https://raw.githubusercontent.com/redis/redis/7.2/redis.conf'>Redis Default Configuration</a>"
             label="Custom Redis Configuration" rows="10" id="database.redis_conf" />
+        <h3 class="pt-4">Advanced</h3>
+        <div class="flex flex-col">
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
+        </div>
     </form>
 </div>

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

@@ -36,6 +36,8 @@
             <x-forms.checkbox instantSave label="Exclude from service status"
                 helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
                 id="application.exclude_from_status"></x-forms.checkbox>
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="application.is_log_drain_enabled" label="Drain Logs" />
         </div>
     </form>
 </div>

resources/views/livewire/project/service/database.blade.php

@@ -32,6 +32,8 @@
             <x-forms.checkbox instantSave label="Exclude from service status"
                 helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
                 id="database.exclude_from_status"></x-forms.checkbox>
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
         </div>
     </form>
 </div>

resources/views/livewire/project/service/stack-form.blade.php

@@ -17,10 +17,10 @@
             <h3>Service Specific Configuration</h3>
         </div>
         <div class="grid grid-cols-2 gap-2">
-            @foreach ($fields as $serviceName => $fields)
-                <x-forms.input type="{{ data_get($fields, 'isPassword') ? 'password' : 'text' }}" required
+            @foreach ($fields as $serviceName => $field)
+                <x-forms.input type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}" required
                     helper="Variable name: {{ $serviceName }}"
-                    label="{{ data_get($fields, 'serviceName') }} {{ data_get($fields, 'name') }}"
+                    label="{{ data_get($field, 'serviceName') }} {{ data_get($field, 'name') }}"
                     id="fields.{{ $serviceName }}.value"></x-forms.input>
             @endforeach
         </div>

resources/views/livewire/project/shared/destination.blade.php

@@ -3,7 +3,34 @@
     <div class="">The destination server where your application will be deployed to.</div>
     <div class="py-4 ">
         <a class="box"
-            href="{{ route('server.show', ['server_uuid' => data_get($destination, 'server.uuid')]) }}">On server <span class="px-1 text-warning">{{ data_get($destination, 'server.name') }}</span>
-            in <span class="px-1 text-warning"> {{ data_get($destination, 'network') }} </span> network.</a>
+            href="{{ route('server.show', ['server_uuid' => data_get($resource, 'destination.server.uuid')]) }}">On
+            server <span class="px-1 text-warning">{{ data_get($resource, 'destination.server.name') }}</span>
+            in <span class="px-1 text-warning"> {{ data_get($resource, 'destination.network') }} </span> network.</a>
     </div>
+    {{-- {{$resource->additional_destinations}} --}}
+    {{-- @if (count($servers) > 0)
+        <div>
+            <h3>Additional Servers</h3>
+            @foreach ($servers as $server)
+                <form wire:submit.prevent='submit' class="p-2 border border-coolgray-400">
+                    <h4>{{ $server->name }}</h4>
+                    <div class="text-sm text-coolgray-600">{{ $server->description }}</div>
+                    <x-forms.checkbox id="additionalServers.{{ $loop->index }}.enabled" label="Enabled">
+                    </x-forms.checkbox>
+                    <x-forms.select label="Destination" id="additionalServers.{{ $loop->index }}.destination" required>
+                        @foreach ($server->destinations() as $destination)
+                            @if ($loop->first)
+                                <option selected value="{{ $destination->uuid }}">{{ $destination->name }}</option>
+                                <option value="{{ $destination->uuid }}">{{ $destination->name }}</option>
+                            @else
+                                <option value="{{ $destination->uuid }}">{{ $destination->name }}</option>
+                                <option value="{{ $destination->uuid }}">{{ $destination->name }}</option>
+                            @endif
+                        @endforeach
+                    </x-forms.select>
+                    <x-forms.button type="submit">Save</x-forms.button>
+                </form>
+            @endforeach
+        </div>
+    @endif --}}
 </div>

resources/views/livewire/server/form.blade.php

@@ -1,4 +1,4 @@
-<div x-init="$wire.validateServer(false)">
+<div>
     <x-modal yesOrNo modalId="changeLocalhost" modalTitle="Change Localhost" action="submit">
         <x-slot:modalBody>
             <p>You could lost a lot of functionalities if you change the server details of the server where Coolify is
@@ -64,9 +64,4 @@
                 helper="Disk cleanup job will be executed if disk usage is more than this number." />
         @endif
     </form>
-    <script>
-        Livewire.on('installDocker', () => {
-            installDocker.showModal();
-        })
-    </script>
 </div>

resources/views/livewire/server/log-drains.blade.php

@@ -1,7 +1,7 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
     <h2>Log Drains</h2>
-    <div class="pb-4">Sends resource logs to external services.</div>
+    <div class="pb-4">Sends service logs to 3rd party tools.</div>
     <div class="flex flex-col gap-4 pt-4">
         <div class="p-4 border border-coolgray-500">
             <form wire:submit.prevent='submit("newrelic")' class="flex flex-col">

resources/views/project/database/configuration.blade.php

@@ -63,7 +63,7 @@
                 <livewire:project.shared.environment-variable.all :resource="$database" />
             </div>
             <div x-cloak x-show="activeTab === 'server'">
-                <livewire:project.shared.destination :destination="$database->destination" />
+                <livewire:project.shared.destination :resource="$database" />
             </div>
             <div x-cloak x-show="activeTab === 'storages'">
                 <livewire:project.service.storage :resource="$database" />

routes/web.php

@@ -5,6 +5,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Controllers\DatabaseController;
 use App\Http\Controllers\MagicController;
 use App\Http\Controllers\ProjectController;
+use App\Http\Livewire\Project\Application\Configuration as ApplicationConfiguration;
 use App\Http\Livewire\Boarding\Index as BoardingIndex;
 use App\Http\Livewire\Project\Service\Index as ServiceIndex;
 use App\Http\Livewire\Project\Service\Show as ServiceShow;
@@ -101,7 +102,8 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::get('/project/{project_uuid}/{environment_name}', [ProjectController::class, 'resources'])->name('project.resources');
 
     // Applications
-    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', [ApplicationController::class, 'configuration'])->name('project.application.configuration');
+    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', ApplicationConfiguration::class)->name('project.application.configuration');
+
     Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment', [ApplicationController::class, 'deployments'])->name('project.application.deployments');
     Route::get(
         '/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment/{deployment_uuid}',
@@ -167,7 +169,6 @@ Route::middleware(['auth'])->group(function () {
         'private_key' => PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail()
     ]))->name('security.private-key.show');
     Route::get('/security/api-tokens', ApiTokens::class)->name('security.api-tokens');
-
 });
 
 

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.139"
+            "version": "4.0.0-beta.145"
         }
     }
 }