Merge pull request #1238 from coollabsio/next

Fixes

app/Actions/Proxy/CheckConfiguration.php

@@ -2,21 +2,26 @@
 
 namespace App\Actions\Proxy;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Server;
 use Illuminate\Support\Str;
 
-class CheckConfigurationSync
+class CheckConfiguration
 {
-    public function __invoke(Server $server, bool $reset = false)
+    use AsAction;
+    public function handle(Server $server, bool $reset = false)
     {
         $proxy_path = get_proxy_path();
         $proxy_configuration = instant_remote_process([
             "cat $proxy_path/docker-compose.yml",
         ], $server, false);
 
-        if ($reset || is_null($proxy_configuration)) {
+        if ($reset || !$proxy_configuration || is_null($proxy_configuration)) {
             $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
         }
+        if (!$proxy_configuration || is_null($proxy_configuration)) {
+            throw new \Exception("Could not generate proxy configuration");
+        }
         return $proxy_configuration;
     }
 }

app/Actions/Proxy/SaveConfiguration.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SaveConfiguration
+{
+    use AsAction;
+
+    public function handle(Server $server)
+    {
+        $proxy_settings = CheckConfiguration::run($server, true);
+        $proxy_path = get_proxy_path();
+        $docker_compose_yml_base64 = base64_encode($proxy_settings);
+
+        $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
+        $server->save();
+
+        return instant_remote_process([
+            "mkdir -p $proxy_path",
+            "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
+        ], $server);
+    }
+}

app/Actions/Proxy/SaveConfigurationSync.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Actions\Proxy;
-
-use App\Models\Server;
-use Illuminate\Support\Str;
-
-class SaveConfigurationSync
-{
-    public function __invoke(Server $server)
-    {
-        try {
-            $proxy_settings = resolve(CheckConfigurationSync::class)($server, true);
-            $proxy_path = get_proxy_path();
-            $docker_compose_yml_base64 = base64_encode($proxy_settings);
-
-            $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-            $server->save();
-
-            instant_remote_process([
-                "mkdir -p $proxy_path",
-                "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
-            ], $server);
-        } catch (\Throwable $e) {
-            ray($e);
-        }
-
-    }
-}

app/Actions/Proxy/StartProxy.php

@@ -2,14 +2,27 @@
 
 namespace App\Actions\Proxy;
 
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
 use Spatie\Activitylog\Models\Activity;
 
 class StartProxy
 {
-    public function __invoke(Server $server, bool $async = true): Activity|string
+    use AsAction;
+    public function handle(Server $server, bool $async = true): Activity|string
     {
+        $proxyType = data_get($server,'proxy.type');
+        if ($proxyType === 'none') {
+            return 'OK';
+        }
+        if (is_null($proxyType)) {
+            $server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
+            $server->proxy->status = ProxyStatus::EXITED->value;
+            $server->save();
+        }
         $proxy_path = get_proxy_path();
         $networks = collect($server->standaloneDockers)->map(function ($docker) {
             return $docker['network'];
@@ -21,8 +34,10 @@ class StartProxy
             return "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null 2>&1 || docker network create --attachable $network > /dev/null 2>&1";
         });
 
-        $configuration = resolve(CheckConfigurationSync::class)($server);
-
+        $configuration = CheckConfiguration::run($server);
+        if (!$configuration) {
+            throw new \Exception("Configuration is not synced");
+        }
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
@@ -36,19 +51,19 @@ class StartProxy
             "cd $proxy_path",
             "echo '####### Creating Docker Compose file...'",
             "echo '####### Pulling docker image...'",
-            'docker compose pull',
+            'docker compose pull || docker-compose pull',
             "echo '####### Stopping existing coolify-proxy...'",
-            'docker compose down -v --remove-orphans',
-            "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9",
-            "command -v lsof >/dev/null && lsof -nt -i:443 | xargs -r kill -9",
-            "command -v fuser >/dev/null && fuser -k 80/tcp",
-            "command -v fuser >/dev/null && fuser -k 443/tcp",
+            "docker compose down -v --remove-orphans > /dev/null 2>&1 || docker-compose down -v --remove-orphans > /dev/null 2>&1 || true",
             "command -v fuser >/dev/null || command -v lsof >/dev/null || echo '####### Could not kill existing processes listening on port 80 & 443. Please stop the process holding these ports...'",
+            "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9 || true",
+            "command -v lsof >/dev/null && lsof -nt -i:443 | xargs -r kill -9 || true",
+            "command -v fuser >/dev/null && fuser -k 80/tcp || true",
+            "command -v fuser >/dev/null && fuser -k 443/tcp || true",
             "systemctl disable nginx > /dev/null 2>&1 || true",
             "systemctl disable apache2 > /dev/null 2>&1 || true",
             "systemctl disable apache > /dev/null 2>&1 || true",
             "echo '####### Starting coolify-proxy...'",
-            'docker compose up -d --remove-orphans',
+            'docker compose up -d --remove-orphans || docker-compose up -d --remove-orphans',
             "echo '####### Proxy installed successfully...'"
         ];
         if (!$async) {

app/Actions/Server/InstallDocker.php

@@ -4,11 +4,10 @@ namespace App\Actions\Server;
 
 use App\Models\Server;
 use App\Models\StandaloneDocker;
-use App\Models\Team;
 
 class InstallDocker
 {
-    public function __invoke(Server $server, Team $team)
+    public function __invoke(Server $server)
     {
         $dockerVersion = '24.0';
         $config = base64_encode('{
@@ -19,15 +18,16 @@ class InstallDocker
             }
           }');
         $found = StandaloneDocker::where('server_id', $server->id);
-        if ($found->count() == 0) {
+        if ($found->count() == 0 && $server->id) {
             StandaloneDocker::create([
                 'name' => 'coolify',
                 'network' => 'coolify',
                 'server_id' => $server->id,
             ]);
         }
-        if (isDev()) {
-            return remote_process([
+
+        if (isDev() && $server->id === 0) {
+            $command = [
                 "echo '####### Installing Prerequisites...'",
                 "sleep 1",
                 "echo '####### Installing/updating Docker Engine...'",
@@ -35,9 +35,9 @@ class InstallDocker
                 "sleep 4",
                 "echo '####### Restarting Docker Engine...'",
                 "ls -l /tmp"
-            ], $server);
+            ];
         } else {
-            return remote_process([
+            $command = [
                 "echo '####### Installing Prerequisites...'",
                 "command -v jq >/dev/null || apt-get update",
                 "command -v jq >/dev/null || apt install -y jq",
@@ -53,7 +53,8 @@ class InstallDocker
                 "echo '####### Creating default Docker network (coolify)...'",
                 "docker network create --attachable coolify >/dev/null 2>&1 || true",
                 "echo '####### Done!'"
-            ], $server);
+            ];
         }
+        return remote_process($command, $server);
     }
 }

app/Data/CoolifyTaskArgs.php

@@ -17,8 +17,11 @@ class CoolifyTaskArgs extends Data
         public string  $type,
         public ?string $type_uuid = null,
         public ?Model  $model = null,
-        public string  $status = ProcessStatus::QUEUED->value,
+        public ?string  $status = null ,
         public bool    $ignore_errors = false,
     ) {
+        if(is_null($status)){
+            $this->status = ProcessStatus::QUEUED->value;
+        }
     }
 }

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
+use App\Models\User;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
 use Sentry\State\Scope;
@@ -56,8 +57,8 @@ class Handler extends ExceptionHandler
                 function (Scope $scope) {
                     $scope->setUser(
                         [
-                            'id' => config('sentry.server_name'),
-                            'email' => auth()->user()->email
+                            'email' => auth()->user()->email,
+                            'instanceAdmin' => User::find(0)->email
                         ]
                     );
                 }

app/Http/Livewire/Boarding/Index.php

@@ -9,12 +9,12 @@ use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Support\Collection;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class Index extends Component
 {
     public string $currentState = 'welcome';
 
+    public ?string $selectedServerType = null;
     public ?Collection $privateKeys = null;
     public ?int $selectedExistingPrivateKey = null;
     public ?string $privateKeyType = null;
@@ -37,6 +37,11 @@ class Index extends Component
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 
+    public bool $dockerInstallationStarted = false;
+
+    public string $serverPublicKey;
+    public bool $serverReachable = true;
+
     public function mount()
     {
         $this->privateKeyName = generate_random_name();
@@ -64,12 +69,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function restartBoarding()
     {
-        if ($this->createdServer) {
-            $this->createdServer->delete();
-        }
-        if ($this->createdPrivateKey) {
-            $this->createdPrivateKey->delete();
-        }
         return redirect()->route('boarding');
     }
     public function skipBoarding()
@@ -84,13 +83,15 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function setServerType(string $type)
     {
-        if ($type === 'localhost') {
+        $this->selectedServerType = $type;
+        if ($this->selectedServerType === 'localhost') {
             $this->createdServer = Server::find(0);
             if (!$this->createdServer) {
                 return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
-            return $this->validateServer();
-        } elseif ($type === 'remote') {
+            $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
+            return $this->validateServer('localhost');
+        } elseif ($this->selectedServerType === 'remote') {
             $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
@@ -113,9 +114,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             return;
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
+        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
         $this->validateServer();
-        $this->getProxyType();
-        $this->getProjects();
     }
     public function getProxyType()
     {
@@ -128,6 +128,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function selectExistingPrivateKey()
     {
+        $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
         $this->currentState = 'create-server';
     }
     public function createNewServer()
@@ -150,39 +151,38 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'privateKeyName' => 'required',
             'privateKey' => 'required',
         ]);
+        $this->createdPrivateKey = PrivateKey::create([
+            'name' => $this->privateKeyName,
+            'description' => $this->privateKeyDescription,
+            'private_key' => $this->privateKey,
+            'team_id' => currentTeam()->id
+        ]);
+        $this->createdPrivateKey->save();
         $this->currentState = 'create-server';
     }
     public function saveServer()
     {
         $this->validate([
             'remoteServerName' => 'required',
-            'remoteServerHost' => 'required|ip',
+            'remoteServerHost' => 'required',
             'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);
         $this->privateKey = formatPrivateKey($this->privateKey);
-        $this->createdPrivateKey = new PrivateKey();
-        $this->createdPrivateKey->private_key = $this->privateKey;
-        $this->createdPrivateKey->name = $this->privateKeyName;
-        $this->createdPrivateKey->description = $this->privateKeyDescription;
-        $this->createdPrivateKey->team_id = currentTeam()->id;
         $foundServer = Server::whereIp($this->remoteServerHost)->first();
         if ($foundServer) {
             return $this->emit('error', 'IP address is already in use by another team.');
         }
-        $this->createdServer = new Server();
-        $this->createdServer->uuid = (string)new Cuid2(7);
-        $this->createdServer->name = $this->remoteServerName;
-        $this->createdServer->ip = $this->remoteServerHost;
-        $this->createdServer->port = $this->remoteServerPort;
-        $this->createdServer->user = $this->remoteServerUser;
-        $this->createdServer->description = $this->remoteServerDescription;
-        $this->createdServer->privateKey = $this->createdPrivateKey;
-        $this->createdServer->team_id = currentTeam()->id;
-
-        ray($this->createdServer);
-
-
+        $this->createdServer = Server::create([
+            'name' => $this->remoteServerName,
+            'ip' => $this->remoteServerHost,
+            'port' => $this->remoteServerPort,
+            'user' => $this->remoteServerUser,
+            'description' => $this->remoteServerDescription,
+            'private_key_id' => $this->createdPrivateKey->id,
+            'team_id' => currentTeam()->id,
+        ]);
+        $this->createdServer->save();
         $this->validateServer();
     }
     public function validateServer()
@@ -190,41 +190,42 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         try {
             $customErrorMessage = "Server is not reachable:";
             config()->set('coolify.mux_enabled', false);
+
             instant_remote_process(['uptime'], $this->createdServer, true);
+
+            $this->createdServer->settings()->update([
+                'is_reachable' => true,
+            ]);
+        } catch (\Throwable $e) {
+            $this->serverReachable = false;
+            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+        }
+
+        try {
             $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
             if (is_null($dockerVersion)) {
-                throw new \Exception('No Docker Engine or older than 23 version installed.');
+                $this->currentState = 'install-docker';
+                throw new \Exception('Docker version is not supported or not installed.');
             }
-            $customErrorMessage = "Cannot create Server or Private Key. Please try again.";
-            $createdPrivateKey = PrivateKey::create([
-                'name' => $this->privateKeyName,
-                'description' => $this->privateKeyDescription,
-                'private_key' => $this->privateKey,
-                'team_id' => currentTeam()->id
+            $this->createdServer->settings()->update([
+                'is_usable' => true,
             ]);
-            $server = Server::create([
-                'name' => $this->remoteServerName,
-                'ip' => $this->remoteServerHost,
-                'port' => $this->remoteServerPort,
-                'user' => $this->remoteServerUser,
-                'description' => $this->remoteServerDescription,
-                'private_key_id' => $createdPrivateKey->id,
-                'team_id' => currentTeam()->id,
-            ]);
-            $server->settings->is_reachable = true;
-            $server->settings->is_usable = true;
-            $server->settings->save();
             $this->getProxyType();
         } catch (\Throwable $e) {
+            $this->dockerInstallationStarted = false;
             return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
     }
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->createdServer, currentTeam());
+        $this->dockerInstallationStarted = true;
+        $activity = resolve(InstallDocker::class)($this->createdServer);
         $this->emit('newMonitorActivity', $activity->id);
-        $this->currentState = 'select-proxy';
+    }
+    public function dockerInstalledOrSkipped()
+    {
+        $this->validateServer();
     }
     public function selectProxy(string|null $proxyType = null)
     {

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

@@ -68,10 +68,11 @@ class Heading extends Component
                     ["docker rm -f {$containerName}"],
                     $this->application->destination->server
                 );
-                $this->application->status = 'stopped';
+                $this->application->status = 'exited';
                 $this->application->save();
                 // $this->application->environment->project->team->notify(new StatusChanged($this->application));
             }
         }
+        $this->application->refresh();
     }
 }

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

@@ -43,7 +43,7 @@ class Heading extends Component
             stopPostgresProxy($this->database);
             $this->database->is_public = false;
         }
-        $this->database->status = 'stopped';
+        $this->database->status = 'exited';
         $this->database->save();
         $this->check_status();
         // $this->database->environment->project->team->notify(new StatusChanged($this->database));

app/Http/Livewire/Server/Form.php

@@ -15,6 +15,7 @@ class Form extends Component
     public $dockerVersion;
     public string|null $wildcard_domain = null;
     public int $cleanup_after_percentage;
+    public bool $dockerInstallationStarted = false;
 
     protected $rules = [
         'server.name' => 'required|min:6',
@@ -44,7 +45,8 @@ class Form extends Component
 
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->server, currentTeam());
+        $this->dockerInstallationStarted = true;
+        $activity = resolve(InstallDocker::class)($this->server);
         $this->emit('newMonitorActivity', $activity->id);
     }
 
@@ -56,7 +58,10 @@ class Form extends Component
                 $this->uptime = $uptime;
                 $this->emit('success', 'Server is reachable.');
             } else {
+                ray($this->uptime);
+
                 $this->emit('error', 'Server is not reachable.');
+
                 return;
             }
             if ($dockerVersion) {

app/Http/Livewire/Server/New/ByIp.php

@@ -26,7 +26,7 @@ class ByIp extends Component
     protected $rules = [
         'name' => 'required|string',
         'description' => 'nullable|string',
-        'ip' => 'required|ip',
+        'ip' => 'required',
         'user' => 'required|string',
         'port' => 'required|integer',
     ];

app/Http/Livewire/Server/Proxy.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Livewire\Server;
 
-use App\Actions\Proxy\CheckConfigurationSync;
-use App\Actions\Proxy\SaveConfigurationSync;
-use App\Enums\ProxyTypes;
+use App\Actions\Proxy\CheckConfiguration;
+use App\Actions\Proxy\SaveConfiguration;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -48,8 +47,7 @@ class Proxy extends Component
     public function submit()
     {
         try {
-            resolve(SaveConfigurationSync::class)($this->server);
-
+            SaveConfiguration::run($this->server);
             $this->server->proxy->redirect_url = $this->redirect_url;
             $this->server->save();
 
@@ -63,7 +61,7 @@ class Proxy extends Component
     public function reset_proxy_configuration()
     {
         try {
-            $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
+            $this->proxy_settings = CheckConfiguration::run($this->server, true);
         } catch (\Throwable $e) {
             return handleError($e);
         }
@@ -72,8 +70,7 @@ class Proxy extends Component
     public function loadProxyConfiguration()
     {
         try {
-            ray('loadProxyConfiguration');
-            $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
+            $this->proxy_settings = CheckConfiguration::run($this->server);
         } catch (\Throwable $e) {
             return handleError($e);
         }

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
-use App\Actions\Proxy\SaveConfigurationSync;
+use App\Actions\Proxy\SaveConfiguration;
 use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
@@ -13,20 +13,25 @@ class Deploy extends Component
     public $proxy_settings = null;
     protected $listeners = ['proxyStatusUpdated'];
 
-    public function proxyStatusUpdated() {
+    public function proxyStatusUpdated()
+    {
         $this->server->refresh();
     }
     public function startProxy()
     {
-        if (
-            $this->server->proxy->last_applied_settings &&
-            $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
-        ) {
-            resolve(SaveConfigurationSync::class)($this->server);
-        }
+        try {
+            if (
+                $this->server->proxy->last_applied_settings &&
+                $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
+            ) {
+                SaveConfiguration::run($this->server);
+            }
 
-        $activity = resolve(StartProxy::class)($this->server);
-        $this->emit('newMonitorActivity', $activity->id);
+            $activity = StartProxy::run($this->server);
+            $this->emit('newMonitorActivity', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e);
+        }
     }
 
     public function stop()

app/Http/Livewire/Server/Proxy/Status.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
+use App\Jobs\ContainerStatusJob;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -18,9 +19,7 @@ class Status extends Component
     {
         try {
             if ($this->server->isFunctional()) {
-                $container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy');
-                $this->server->proxy->status = $container;
-                $this->server->save();
+                dispatch_sync(new ContainerStatusJob($this->server));
                 $this->emit('proxyStatusUpdated');
             }
         } catch (\Throwable $e) {

app/Http/Livewire/Server/ShowPrivateKey.php

@@ -37,14 +37,27 @@ class ShowPrivateKey extends Component
         try {
             ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server, true);
             if ($uptime) {
+                $this->server->settings->update([
+                    'is_reachable' => true
+                ]);
                 $this->emit('success', 'Server is reachable with this private key.');
             } else {
+                $this->server->settings->update([
+                    'is_reachable' => false,
+                    'is_usable' => false
+                ]);
                 $this->emit('error', 'Server is not reachable with this private key.');
                 return;
             }
             if ($dockerVersion) {
+                $this->server->settings->update([
+                    'is_usable' => true
+                ]);
                 $this->emit('success', 'Server is usable for Coolify.');
             } else {
+                $this->server->settings->update([
+                    'is_usable' => false
+                ]);
                 $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
             }
         } catch (\Throwable $e) {

app/Jobs/ApplicationDeploymentJob.php

@@ -89,7 +89,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
         $this->container_name = generateApplicationContainerName($this->application->uuid, $this->pull_request_id);
-        addPrivateKeyToSshAgent($this->server);
+        savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
         // Set preview fqdn

app/Jobs/ContainerStatusJob.php

@@ -40,20 +40,19 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         return $this->server->uuid;
     }
 
-    private function checkServerConnection() {
-        ray("Checking server connection to {$this->server->ip}");
+    private function checkServerConnection()
+    {
         $uptime = instant_remote_process(['uptime'], $this->server, false);
         if (!is_null($uptime)) {
-            ray('Server is up');
             return true;
         }
     }
     public function handle(): void
     {
         try {
-            ray()->clearAll();
+            // ray()->clearAll();
             $serverUptimeCheckNumber = 0;
-            $serverUptimeCheckNumberMax = 5;
+            $serverUptimeCheckNumberMax = 3;
             while (true) {
                 if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                     $this->server->settings()->update(['is_reachable' => false]);
@@ -67,19 +66,28 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $serverUptimeCheckNumber++;
                 sleep(5);
             }
+            $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);
             $applications = $this->server->applications();
             $databases = $this->server->databases();
             $previews = $this->server->previews();
-            if ($this->server->isProxyShouldRun()) {
-                $foundProxyContainer = $containers->filter(function ($value, $key) {
-                    return data_get($value, 'Name') === '/coolify-proxy';
-                })->first();
-                if (!$foundProxyContainer) {
-                    resolve(StartProxy::class)($this->server, false);
+
+            /// Check if proxy is running
+            $foundProxyContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-proxy';
+            })->first();
+            if (!$foundProxyContainer) {
+                if ($this->server->isProxyShouldRun()) {
+                    StartProxy::run($this->server, false);
                     $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
                 }
+            } else {
+                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
+                $this->server->save();
             }
             $foundApplications = [];
             $foundApplicationPreviews = [];
@@ -90,10 +98,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $labels = Arr::undot(format_docker_labels_to_json($labels));
                 $labelId = data_get($labels, 'coolify.applicationId');
                 if ($labelId) {
-                    if (str_contains($labelId,'-pr-')) {
+                    if (str_contains($labelId, '-pr-')) {
                         $previewId = (int) Str::after($labelId, '-pr-');
                         $applicationId = (int) Str::before($labelId, '-pr-');
-                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id',$previewId)->first();
+                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $previewId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
                             $statusFromDb = $preview->status;
@@ -130,10 +138,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                         }
                     }
                 }
-
             }
             $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
-            foreach($notRunningApplications as $applicationId) {
+            foreach ($notRunningApplications as $applicationId) {
                 $application = $applications->where('id', $applicationId)->first();
                 if ($application->status === 'exited') {
                     continue;
@@ -172,14 +179,14 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
-            foreach($notRunningDatabases as $database) {
+            foreach ($notRunningDatabases as $database) {
                 $database = $databases->where('id', $database)->first();
                 if ($database->status === 'exited') {
                     continue;
                 }
                 $database->update(['status' => 'exited']);
 
-                   $name = data_get($database, 'name');
+                $name = data_get($database, 'name');
                 $fqdn = data_get($database, 'fqdn');
 
                 $containerName = $name;
@@ -190,97 +197,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
-
-
-
-
-
-
-
-
-
-
-
-
-            return;
-            foreach ($applications as $application) {
-                $uuid = data_get($application, 'uuid');
-                $id = data_get($application, 'id');
-                $foundContainer = $containers->filter(function ($value, $key) use ($id, $uuid) {
-                    $labels = data_get($value, 'Config.Labels');
-                    $labels = Arr::undot(format_docker_labels_to_json($labels));
-                    $labelId = data_get($labels, 'coolify.applicationId');
-                    if ($labelId == $id) {
-                        return $value;
-                    }
-                    $isPR = Str::startsWith(data_get($value, 'Name'), "/$uuid");
-                    $isPR = Str::contains(data_get($value, 'Name'), "-pr-");
-                    if ($isPR) {
-                        ray('is pr');
-                        return false;
-                    }
-                    return $value;
-                })->first();
-                ray($foundContainer);
-                if ($foundContainer) {
-                    $containerStatus = data_get($foundContainer, 'State.Status');
-                    $databaseStatus = data_get($application, 'status');
-                    if ($containerStatus !== $databaseStatus) {
-                        $application->update(['status' => $containerStatus]);
-                    }
-                } else {
-                    $databaseStatus = data_get($application, 'status');
-                    if ($databaseStatus !== 'exited') {
-                        $application->update(['status' => 'exited']);
-                        $name = data_get($application, 'name');
-                        $fqdn = data_get($application, 'fqdn');
-                        $containerName = $name ? "$name ($fqdn)" : $fqdn;
-                        $project = data_get($application, 'environment.project');
-                        $environment = data_get($application, 'environment');
-                        $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $application->uuid;
-                        $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
-                    }
-                }
-                $previews = $application->previews;
-                foreach ($previews as $preview) {
-                    $foundContainer = $containers->filter(function ($value, $key) use ($id, $uuid, $preview) {
-                        $labels = data_get($value, 'Config.Labels');
-                        $labels = Arr::undot(format_docker_labels_to_json($labels));
-                        $labelId = data_get($labels, 'coolify.applicationId');
-                        if ($labelId == "$id-pr-{$preview->id}") {
-                            return $value;
-                        }
-                        return Str::startsWith(data_get($value, 'Name'), "/$uuid-pr-{$preview->id}");
-                    })->first();
-                }
-
-            }
-            foreach ($databases as $database) {
-                $uuid = data_get($database, 'uuid');
-                $foundContainer = $containers->filter(function ($value, $key) use ($uuid) {
-                    return Str::startsWith(data_get($value, 'Name'), "/$uuid");
-                })->first();
-
-                if ($foundContainer) {
-                    $containerStatus = data_get($foundContainer, 'State.Status');
-                    $databaseStatus = data_get($database, 'status');
-                    if ($containerStatus !== $databaseStatus) {
-                        $database->update(['status' => $containerStatus]);
-                    }
-                } else {
-                    $databaseStatus = data_get($database, 'status');
-                    if ($databaseStatus !== 'exited') {
-                        $database->update(['status' => 'exited']);
-                        $name = data_get($database, 'name');
-                        $containerName = $name;
-                        $project = data_get($database, 'environment.project');
-                        $environment = data_get($database, 'environment');
-                        $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
-                        $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
-                    }
-                }
-            }
-           // TODO Monitor other containers not managed by Coolify
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());

app/Notifications/Application/DeploymentFailed.php

@@ -14,7 +14,7 @@ class DeploymentFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public Application $application;
     public ?ApplicationPreview $preview = null;
 

app/Notifications/Application/DeploymentSuccess.php

@@ -14,7 +14,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public Application $application;
     public ApplicationPreview|null $preview = null;
 

app/Notifications/Application/StatusChanged.php

@@ -13,7 +13,7 @@ class StatusChanged extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
 
     public Application $application;
     public string $application_name;

app/Notifications/Channels/EmailChannel.php

@@ -6,27 +6,34 @@ use Exception;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Mail;
+use Log;
 
 class EmailChannel
 {
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
-        $this->bootConfigs($notifiable);
-        $recepients = $notifiable->getRecepients($notification);
+        try {
+            $this->bootConfigs($notifiable);
+            $recepients = $notifiable->getRecepients($notification);
+            ray($recepients);
+            if (count($recepients) === 0) {
+                throw new Exception('No email recipients found');
+            }
 
-        if (count($recepients) === 0) {
-            throw new Exception('No email recipients found');
+            $mailMessage = $notification->toMail($notifiable);
+            Mail::send(
+                [],
+                [],
+                fn (Message $message) => $message
+                    ->to($recepients)
+                    ->subject($mailMessage->subject)
+                    ->html((string)$mailMessage->render())
+            );
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            send_internal_notification("EmailChannel error: {$e->getMessage()}. Failed to send email to: " . implode(', ', $recepients) . " with subject: {$mailMessage->subject}");
+            throw $e;
         }
-
-        $mailMessage = $notification->toMail($notifiable);
-        Mail::send(
-            [],
-            [],
-            fn (Message $message) => $message
-                ->to($recepients)
-                ->subject($mailMessage->subject)
-                ->html((string)$mailMessage->render())
-        );
     }
 
     private function bootConfigs($notifiable): void

app/Notifications/Container/ContainerRestarted.php

@@ -12,7 +12,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
 
 
     public function __construct(public string $name, public Server $server, public ?string $url = null)

app/Notifications/Database/BackupFailed.php

@@ -3,8 +3,6 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use App\Notifications\Channels\DiscordChannel;
-use App\Notifications\Channels\EmailChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public string $name;
     public string $frequency;
 

app/Notifications/Database/BackupSuccess.php

@@ -3,8 +3,6 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use App\Notifications\Channels\DiscordChannel;
-use App\Notifications\Channels\EmailChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public string $name;
     public string $frequency;
 

bootstrap/helpers/proxy.php

@@ -96,7 +96,7 @@ function setup_default_redirect_404(string|null $redirect_url, Server $server)
     $traefik_default_redirect_file = "$traefik_dynamic_conf_path/default_redirect_404.yaml";
     ray($redirect_url);
     if (empty($redirect_url)) {
-        remote_process([
+        instant_remote_process([
             "rm -f $traefik_default_redirect_file",
         ], $server);
     } else {
@@ -157,7 +157,7 @@ function setup_default_redirect_404(string|null $redirect_url, Server $server)
 
         $base64 = base64_encode($yaml);
         ray("mkdir -p $traefik_dynamic_conf_path");
-        remote_process([
+        instant_remote_process([
             "mkdir -p $traefik_dynamic_conf_path",
             "echo '$base64' | base64 -d > $traefik_default_redirect_file",
         ], $server);

bootstrap/helpers/remoteProcess.php

@@ -7,25 +7,25 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\PrivateKey;
 use App\Models\Server;
-use App\Notifications\Server\NotReachable;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Sleep;
-use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\Contracts\Activity;
 
 function remote_process(
     array   $command,
     Server  $server,
-    string  $type = ActivityTypes::INLINE->value,
+    ?string  $type = null,
     ?string $type_uuid = null,
     ?Model  $model = null,
     bool    $ignore_errors = false,
 ): Activity {
-
+    if (is_null($type)) {
+        $type = ActivityTypes::INLINE->value;
+    }
     $command_string = implode("\n", $command);
     if (auth()->user()) {
         $teams = auth()->user()->teams->pluck('id');
@@ -55,7 +55,7 @@ function remote_process(
 //     }
 //     // processWithEnv()->run("echo '{$server->privateKey->private_key}' | ssh-add -d -");
 // }
-function addPrivateKeyToSshAgent(Server $server)
+function savePrivateKeyToFs(Server $server)
 {
     if (data_get($server, 'privateKey.private_key') === null) {
         throw new \Exception("Server {$server->name} does not have a private key");
@@ -72,7 +72,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
 {
     $user = $server->user;
     $port = $server->port;
-    $privateKeyLocation = addPrivateKeyToSshAgent($server);
+    $privateKeyLocation = savePrivateKeyToFs($server);
     $timeout = config('constants.ssh.command_timeout');
     $connectionTimeout = config('constants.ssh.connection_timeout');
     $serverInterval = config('constants.ssh.server_interval');
@@ -110,11 +110,28 @@ function instant_remote_process(array $command, Server $server, $throwError = tr
         if (!$throwError) {
             return null;
         }
-        throw new \RuntimeException($process->errorOutput(), $exitCode);
+        return excludeCertainErrors($process->errorOutput(), $exitCode);
     }
     return $output;
 }
-
+function excludeCertainErrors(string $errorOutput, ?int $exitCode = null) {
+    $ignoredErrors = collect([
+        'Permission denied (publickey',
+        'Could not resolve hostname',
+    ]);
+    $ignored = false;
+    foreach ($ignoredErrors as $ignoredError)  {
+        if (Str::contains($errorOutput, $ignoredError)) {
+            $ignored = true;
+            break;
+        }
+    }
+    if ($ignored) {
+        // TODO: Create new exception and disable in sentry
+        throw new \RuntimeException($errorOutput, $exitCode);
+    }
+    throw new \RuntimeException($errorOutput, $exitCode);
+}
 function decode_remote_command_output(?ApplicationDeploymentQueue $application_deployment_queue = null): Collection
 {
     $application = Application::find(data_get($application_deployment_queue, 'application_id'));

bootstrap/helpers/subscriptions.php

@@ -138,5 +138,6 @@ function allowedPathsForBoardingAccounts()
         ...allowedPathsForUnsubscribedAccounts(),
         'boarding',
         'livewire/message/boarding.index',
+        'livewire/message/activity-monitor'
     ];
 }

composer.json

@@ -22,6 +22,7 @@
         "lcobucci/jwt": "^5.0.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "livewire/livewire": "^v2.12.3",
+        "lorisleiva/laravel-actions": "^2.7",
         "masmerise/livewire-toaster": "^1.2",
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cf138424c896f30b035bc8cdff63e8d1",
+    "content-hash": "de2c45be3f03d43430549d963778dc4a",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -3059,6 +3059,153 @@
             ],
             "time": "2023-08-11T04:02:34+00:00"
         },
+        {
+            "name": "lorisleiva/laravel-actions",
+            "version": "v2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lorisleiva/laravel-actions.git",
+                "reference": "5250614fd6b77e8e2780be0206174e069e94661d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lorisleiva/laravel-actions/zipball/5250614fd6b77e8e2780be0206174e069e94661d",
+                "reference": "5250614fd6b77e8e2780be0206174e069e94661d",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "9.0 - 9.34 || ^9.36 || ^10.0",
+                "lorisleiva/lody": "^0.4",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.5",
+                "pestphp/pest": "^1.23",
+                "phpunit/phpunit": "^9.6"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Lorisleiva\\Actions\\ActionServiceProvider"
+                    ],
+                    "aliases": {
+                        "Action": "Lorisleiva\\Actions\\Facades\\Actions"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lorisleiva\\Actions\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Loris Leiva",
+                    "email": "loris.leiva@gmail.com",
+                    "homepage": "https://lorisleiva.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Laravel components that take care of one specific task",
+            "homepage": "https://github.com/lorisleiva/laravel-actions",
+            "keywords": [
+                "action",
+                "command",
+                "component",
+                "controller",
+                "job",
+                "laravel",
+                "object"
+            ],
+            "support": {
+                "issues": "https://github.com/lorisleiva/laravel-actions/issues",
+                "source": "https://github.com/lorisleiva/laravel-actions/tree/v2.7.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/lorisleiva",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-24T10:20:57+00:00"
+        },
+        {
+            "name": "lorisleiva/lody",
+            "version": "v0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lorisleiva/lody.git",
+                "reference": "1a43e8e423f3b2b64119542bc44a2071208fae16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lorisleiva/lody/zipball/1a43e8e423f3b2b64119542bc44a2071208fae16",
+                "reference": "1a43e8e423f3b2b64119542bc44a2071208fae16",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^8.0|^9.0|^10.0",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0",
+                "pestphp/pest": "^1.20.0",
+                "phpunit/phpunit": "^9.5.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Lorisleiva\\Lody\\LodyServiceProvider"
+                    ],
+                    "aliases": {
+                        "Lody": "Lorisleiva\\Lody\\Lody"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lorisleiva\\Lody\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Loris Leiva",
+                    "email": "loris.leiva@gmail.com",
+                    "homepage": "https://lorisleiva.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Load files and classes as lazy collections in Laravel.",
+            "homepage": "https://github.com/lorisleiva/lody",
+            "keywords": [
+                "classes",
+                "collection",
+                "files",
+                "laravel",
+                "load"
+            ],
+            "support": {
+                "issues": "https://github.com/lorisleiva/lody/issues",
+                "source": "https://github.com/lorisleiva/lody/tree/v0.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/lorisleiva",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-05T15:03:45+00:00"
+        },
         {
             "name": "masmerise/livewire-toaster",
             "version": "1.3.0",
@@ -13089,5 +13236,5 @@
         "php": "^8.2"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

config/sentry.php

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

config/toaster.php

@@ -30,7 +30,7 @@ return [
      *
      * Minimum: 3000 (in milliseconds)
      */
-    'duration' => 1500,
+    'duration' => 3000,
 
     /**
      * The horizontal position of each toast.

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.38';
+return '4.0.0-beta.43';

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

@@ -1,7 +1,7 @@
 @props([
     'showSubscribeButtons' => true,
 ])
-<div x-data="{ selected: 'yearly' }" class="w-full pb-20">
+<div x-data="{ selected: 'monthly' }" class="w-full pb-20">
     <div class="px-6 mx-auto lg:px-8">
         <div class="flex justify-center">
             <fieldset
@@ -24,80 +24,36 @@
         <div class="py-2 text-center"><span class="font-bold text-warning">{{ config('constants.limits.trial_period') }}
                 days trial</span> included on all plans, without credit card details.</div>
         <div x-show="selected === 'monthly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
-            <div>Save <span class="font-bold text-warning">1 month</span> annually with the yearly plans.
+            <div>Save <span class="font-bold text-warning">10%</span> annually with the yearly plans.
             </div>
         </div>
         <div x-show="selected === 'yearly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
             <div>
             </div>
         </div>
+        <div class="p-4 rounded bg-coolgray-400">
+            <h2 id="tier-hobby" class="flex items-start gap-4 text-4xl font-bold tracking-tight">Unlimited Trial
+                <x-forms.button><a class="font-bold text-white hover:no-underline"
+                        href="https://github.com/coollabsio/coolify">Get Started</a></x-forms.button>
+            </h2>
+            <p class="mt-4 text-sm leading-6">Start self-hosting <span class="text-warning">without limits</span> with
+                our
+                OSS version. Same features as the paid version, but you have to manage by yourself.</p>
+        </div>
         <div class="flow-root mt-12">
             <div
-                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-4 lg:divide-x lg:divide-y-0 xl:-mx-4">
-                <div class="px-8 pt-16 lg:pt-0">
-                    <h3 id="tier-trial" class="text-base font-semibold leading-7 text-white">Unlimited Trial</h3>
-                    <p class="flex items-baseline mt-6 gap-x-1">
-                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">Free</span>
-                        </span>
-                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">Still Free </span>
-                        </span>
-                    </p>
-                    <span x-show="selected === 'monthly'" x-cloak>
-                        <span>billed monthly</span>
-                    </span>
-                    <span x-show="selected === 'yearly'" x-cloak>
-                        <span>billed annually</span>
-                    </span>
-                    <a href="https://github.com/coollabsio/coolify" aria-describedby="tier-trial" class="buyme">Get
-                        Started</a>
-                    <p class="mt-10 text-sm leading-6 text-white h-[6.5rem]">Start self-hosting without limits with our
-                        OSS
-                        version.</p>
-                    <ul role="list" class="space-y-3 text-sm leading-6 ">
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            You manage everything
-                        </li>
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Community Support
-                        </li>
-                        <li class="flex font-bold text-white gap-x-3">
-                            <svg width="512" height="512" class="flex-none w-5 h-6 text-green-600"
-                                viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="2">
-                                    <path
-                                        d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
-                                    <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
-                                </g>
-                            </svg>
-                            + All upcoming features
-                        </li>
-                    </ul>
-                </div>
+                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-3 lg:divide-x lg:divide-y-0 xl:-mx-4">
+
                 <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
                     <h3 id="tier-basic" class="text-base font-semibold leading-7 text-white">Basic</h3>
                     <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
                             <span class="text-4xl font-bold tracking-tight text-white">$5</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                         <span x-show="selected === 'yearly'" x-cloak>
                             <span class="text-4xl font-bold tracking-tight text-white">$4</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                     </p>
                     <span x-show="selected === 'monthly'" x-cloak>
@@ -139,8 +95,8 @@
                         <li class="flex font-bold text-white gap-x-3">
                             <svg width="512" height="512" class="flex-none w-5 h-6 text-green-600"
                                 viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                    stroke-linejoin="round" stroke-width="2">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                    stroke-width="2">
                                     <path
                                         d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
                                     <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
@@ -154,12 +110,12 @@
                     <h3 id="tier-pro" class="text-base font-semibold leading-7 text-white">Pro</h3>
                     <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$29</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">$30</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                         <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$26</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">$27</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                     </p>
                     <span x-show="selected === 'monthly'" x-cloak>
@@ -192,7 +148,7 @@
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            Basic Support
+                            Included Email System
                         </li>
                         <li class="flex gap-x-3">
                             <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
@@ -201,7 +157,7 @@
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            Included Email System
+                            Email Support
                         </li>
                         <li class="flex font-bold text-white gap-x-3">
                             <svg width="512" height="512" class="flex-none w-5 h-6 text-green-600"
@@ -221,12 +177,12 @@
                     <h3 id="tier-ultimate" class="text-base font-semibold leading-7 text-white">Ultimate</h3>
                     <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$69</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                         <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$63</span>
-                            <span class="text-sm font-semibold leading-6 ">/month</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
+                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
                         </span>
                     </p>
                     <span x-show="selected === 'monthly'" x-cloak>
@@ -250,17 +206,9 @@
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            25 servers <x-helper helper="Bring Your Own Server. All you need is n SSH connection." />
-                        </li>
-                        <li class="flex font-bold text-white gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Priority Support
+                            ? servers <x-helper helper="Bring Your Own Server. All you need is n SSH connection." />
                         </li>
+
                         <li class="flex gap-x-3">
                             <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
                                 aria-hidden="true">
@@ -270,6 +218,15 @@
                             </svg>
                             Included Email System
                         </li>
+                        <li class="flex font-bold text-white gap-x-3">
+                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                                aria-hidden="true">
+                                <path fill-rule="evenodd"
+                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            Priority (Email/Chat) Support
+                        </li>
                         <li class="flex font-bold text-white gap-x-3">
                             <svg width="512" height="512" class="flex-none w-5 h-6 text-green-600"
                                 viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -285,176 +242,186 @@
                     </ul>
                 </div>
             </div>
-            <div class="pt-10">Need unlimited servers or official support for your Coolify instance? <a
-                    href="https://docs.coollabs.io/contact" class='text-warning'>Contact us.</a>
-            </div>
-        </div>
-    </div>
-    <div class="pt-8 pb-12 text-4xl font-bold text-center text-white">Included in all plans</div>
-    <div class="grid grid-cols-1 gap-10 md:grid-cols-2 gap-y-28">
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2"
-                            d="M3 7a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v2a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm12 13H6a3 3 0 0 1-3-3v-2a3 3 0 0 1 3-3h12M7 8v.01M7 16v.01M20 15l-2 3h3l-2 3" />
-                    </svg>
+            <div class="p-4 mt-10 rounded">
+                <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
+                    your self-hosted instance?
+                    <x-forms.button>
+                        <a class="font-bold text-white hover:no-underline"
+                            href="https://docs.coollabs.io/contact">Contact Us</a>
+                    </x-forms.button>
                 </div>
-                <div class="text-2xl font-semibold text-white">Bring Your Own Servers</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Bring your own server from any cloud providers, or even your own server at home! All you need is SSH
-                access. You will have full control over your server, and you can even use it for other purposes.
             </div>
         </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" stroke="white" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2">
-                            <path
-                                d="M7 7h10a2 2 0 0 1 2 2v1l1 1v3l-1 1v3a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-3l-1-1v-3l1-1V9a2 2 0 0 1 2-2zm3 9h4" />
-                            <circle cx="8.5" cy="11.5" r=".5" fill="#000000" />
-                            <circle cx="15.5" cy="11.5" r=".5" fill="#000000" />
-                            <path d="M9 7L8 3m7 4l1-4" />
-                        </g>
-                    </svg>
+        <div class="pt-8 pb-12 text-4xl font-bold text-center text-white">Included in all plans</div>
+        <div class="grid grid-cols-1 gap-10 md:grid-cols-2 gap-y-28">
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                stroke-linejoin="round" stroke-width="2"
+                                d="M3 7a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v2a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm12 13H6a3 3 0 0 1-3-3v-2a3 3 0 0 1 3-3h12M7 8v.01M7 16v.01M20 15l-2 3h3l-2 3" />
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Bring Your Own Servers</div>
                 </div>
-                <div class="text-2xl font-semibold text-white">Server Automations</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Once you connected your server, Coolify will start managing it and do a
-                lot of adminstrative tasks for you. You can also write your own scripts to
-                automate your server<span class="text-warning">*</span>.
-            </div>
-        </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" viewBox="0 0 24 24" class="icon"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2">
-                            <path d="M15 11h2a2 2 0 0 1 2 2v2m0 4a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6a2 2 0 0 1 2-2h4" />
-                            <path d="M11 16a1 1 0 1 0 2 0a1 1 0 1 0-2 0m-3-5V8m.347-3.631A4 4 0 0 1 16 6M3 3l18 18" />
-                        </g>
-                    </svg>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Bring your own server from any cloud providers, or even your own server at home! All you need is SSH
+                    access. You will have full control over your server, and you can even use it for other purposes.
                 </div>
-                <div class="text-2xl font-semibold text-white">No Vendor Lock-in</div>
             </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                You own your own data. All configurations saved on your own servers, so if
-                you decide to stop using Coolify, you can still continue to manage your
-                deployed resources.
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="none" stroke="white" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2">
+                                <path
+                                    d="M7 7h10a2 2 0 0 1 2 2v1l1 1v3l-1 1v3a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-3l-1-1v-3l1-1V9a2 2 0 0 1 2-2zm3 9h4" />
+                                <circle cx="8.5" cy="11.5" r=".5" fill="#000000" />
+                                <circle cx="15.5" cy="11.5" r=".5" fill="#000000" />
+                                <path d="M9 7L8 3m7 4l1-4" />
+                            </g>
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Server Automations</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Once you connected your server, Coolify will start managing it and do a
+                    lot of adminstrative tasks for you. You can also write your own scripts to
+                    automate your server<span class="text-warning">*</span>.
+                </div>
+            </div>
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" viewBox="0 0 24 24" class="icon"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2">
+                                <path
+                                    d="M15 11h2a2 2 0 0 1 2 2v2m0 4a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6a2 2 0 0 1 2-2h4" />
+                                <path
+                                    d="M11 16a1 1 0 1 0 2 0a1 1 0 1 0-2 0m-3-5V8m.347-3.631A4 4 0 0 1 16 6M3 3l18 18" />
+                            </g>
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">No Vendor Lock-in</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    You own your own data. All configurations saved on your own servers, so if
+                    you decide to stop using Coolify, you can still continue to manage your
+                    deployed resources.
+                </div>
             </div>
-        </div>
 
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                        stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <rect x="3" y="4" width="18" height="12" rx="1" />
-                        <path d="M7 20h10" />
-                        <path d="M9 16v4" />
-                        <path d="M15 16v4" />
-                        <path d="M7 10h2l2 3l2 -6l1 3h3" />
-                    </svg>
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <rect x="3" y="4" width="18" height="12" rx="1" />
+                            <path d="M7 20h10" />
+                            <path d="M9 16v4" />
+                            <path d="M15 16v4" />
+                            <path d="M7 10h2l2 3l2 -6l1 3h3" />
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Monitoring</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Coolify will automatically monitor your configured servers and deployed
+                    resources. Notifies you if something goes wrong on your favourite
+                    channels, like Discord, Telegram, via Email and more...
                 </div>
-                <div class="text-2xl font-semibold text-white">Monitoring</div>
             </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Coolify will automatically monitor your configured servers and deployed
-                resources. Notifies you if something goes wrong on your favourite
-                channels, like Discord, Telegram, via Email and more...
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2">
+                                <path d="M6 4h10l4 4v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2" />
+                                <path d="M10 14a2 2 0 1 0 4 0a2 2 0 1 0-4 0m4-10v4H8V4" />
+                            </g>
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Automatic Backups</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    We automatically backup your databases to any S3 compatible solution. If
+                    something goes wrong, you can easily restore your data with a few clicks.
+                </div>
+            </div>
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <polyline points="5 7 10 12 5 17" />
+                            <line x1="13" y1="17" x2="19" y2="17" />
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Powerful API</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Programatically deploy, query, and manage your servers & resources.
+                    Integrate to your CI/CD pipelines, or build your own custom integrations. <span
+                        class="text-warning">*</span>
+                </div>
+            </div>
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2">
+                                <path
+                                    d="M4 18a2 2 0 1 0 4 0a2 2 0 1 0-4 0M4 6a2 2 0 1 0 4 0a2 2 0 1 0-4 0m12 12a2 2 0 1 0 4 0a2 2 0 1 0-4 0M6 8v8" />
+                                <path d="M11 6h5a2 2 0 0 1 2 2v8" />
+                                <path d="m14 9l-3-3l3-3" />
+                            </g>
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Push to Deploy</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Git integration is default today. We support hosted (github.com,
+                    gitlab.com<span class="inline-block text-warning">*</span>) or self-hosted<span
+                        class="text-warning">*</span>
+                    (Github Enterprise, Gitlab) Git repositories.
+                </div>
+            </div>
+            <div>
+                <div class="flex items-center gap-4 mb-4">
+                    <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
+                        <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                stroke-linejoin="round" stroke-width="2"
+                                d="M10 13a2 2 0 1 0 4 0a2 2 0 0 0-4 0m-2 8v-1a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v1M15 5a2 2 0 1 0 4 0a2 2 0 0 0-4 0m2 5h2a2 2 0 0 1 2 2v1M5 5a2 2 0 1 0 4 0a2 2 0 0 0-4 0m-2 8v-1a2 2 0 0 1 2-2h2" />
+                        </svg>
+                    </div>
+                    <div class="text-2xl font-semibold text-white">Pull Request Deployments</div>
+                </div>
+                <div class="mt-1 text-base leading-7 text-gray-300">
+                    Automagically deploy new commits and pull requests separately to quickly
+                    review contributions and speed up your teamwork!
+                </div>
             </div>
         </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2">
-                            <path d="M6 4h10l4 4v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2" />
-                            <path d="M10 14a2 2 0 1 0 4 0a2 2 0 1 0-4 0m4-10v4H8V4" />
-                        </g>
-                    </svg>
-                </div>
-                <div class="text-2xl font-semibold text-white">Automatic Backups</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                We automatically backup your databases to any S3 compatible solution. If
-                something goes wrong, you can easily restore your data with a few clicks.
-            </div>
-        </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                        stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <polyline points="5 7 10 12 5 17" />
-                        <line x1="13" y1="17" x2="19" y2="17" />
-                    </svg>
-                </div>
-                <div class="text-2xl font-semibold text-white">Powerful API</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Programatically deploy, query, and manage your servers & resources.
-                Integrate to your CI/CD pipelines, or build your own custom integrations. <span
-                    class="text-warning">*</span>
-            </div>
-        </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2">
-                            <path
-                                d="M4 18a2 2 0 1 0 4 0a2 2 0 1 0-4 0M4 6a2 2 0 1 0 4 0a2 2 0 1 0-4 0m12 12a2 2 0 1 0 4 0a2 2 0 1 0-4 0M6 8v8" />
-                            <path d="M11 6h5a2 2 0 0 1 2 2v8" />
-                            <path d="m14 9l-3-3l3-3" />
-                        </g>
-                    </svg>
-                </div>
-                <div class="text-2xl font-semibold text-white">Push to Deploy</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Git integration is default today. We support hosted (github.com,
-                gitlab.com<span class="inline-block text-warning">*</span>) or self-hosted<span class="text-warning">*</span>
-                (Github Enterprise, Gitlab) Git repositories.
-            </div>
-        </div>
-        <div>
-            <div class="flex items-center gap-4 mb-4">
-                <div class="flex items-center justify-center w-10 h-10 text-white rounded-lg bg-coolgray-500">
-                    <svg width="512" height="512" class="icon" viewBox="0 0 24 24"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2"
-                            d="M10 13a2 2 0 1 0 4 0a2 2 0 0 0-4 0m-2 8v-1a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v1M15 5a2 2 0 1 0 4 0a2 2 0 0 0-4 0m2 5h2a2 2 0 0 1 2 2v1M5 5a2 2 0 1 0 4 0a2 2 0 0 0-4 0m-2 8v-1a2 2 0 0 1 2-2h2" />
-                    </svg>
-                </div>
-                <div class="text-2xl font-semibold text-white">Pull Request Deployments</div>
-            </div>
-            <div class="mt-1 text-base leading-7 text-gray-300">
-                Automagically deploy new commits and pull requests separately to quickly
-                review contributions and speed up your teamwork!
-            </div>
+        <div class="pt-20 text-xs">
+            <span class="text-warning">*</span> Some features are work in progress and will be available soon.
         </div>
     </div>
-    <div class="pt-20 text-xs">
-        <span class="text-warning">*</span> Some features are work in progress and will be available soon.
-    </div>
-</div>
-@isset($other)
-    {{ $other }}
-@endisset
+    @isset($other)
+        {{ $other }}
+    @endisset

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

@@ -1,5 +1,5 @@
 <div class="pb-6">
-        <livewire:server.proxy.modal :server="$server" />
+    <livewire:server.proxy.modal :server="$server" />
     <div class="flex items-center gap-2">
         <h1>Server</h1>
         @if ($server->settings->is_reachable)

resources/views/layouts/boarding.blade.php

@@ -1,9 +1,19 @@
 @extends('layouts.base')
 @section('body')
-<main class="min-h-screen hero">
-    <div class="hero-content">
-        {{ $slot }}
-    </div>
-</main>
-@parent
+    <x-modal noSubmit modalId="installDocker">
+        <x-slot:modalBody>
+            <livewire:activity-monitor header="Docker Installation Logs" />
+        </x-slot:modalBody>
+        <x-slot:modalSubmit>
+            <x-forms.button onclick="installDocker.close()" type="submit">
+                Close
+            </x-forms.button>
+        </x-slot:modalSubmit>
+    </x-modal>
+    <main class="min-h-screen hero">
+        <div class="hero-content">
+            {{ $slot }}
+        </div>
+    </main>
+    @parent
 @endsection

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

@@ -23,9 +23,12 @@
                         <x-highlighted text="Self-hosting with superpowers!" /></span>
                 </x-slot:question>
                 <x-slot:explanation>
-                    <p><x-highlighted text="Task automation:" /> You do not to manage your servers too much. Coolify do it for you.</p>
-                    <p><x-highlighted text="No vendor lock-in:" /> All configurations are stored on your server, so everything works without Coolify (except integrations and automations).</p>
-                    <p><x-highlighted text="Monitoring:" />You will get notified on your favourite platform (Discord, Telegram, Email, etc.) when something goes wrong, or an action needed from your side.</p>
+                    <p><x-highlighted text="Task automation:" /> You do not to manage your servers too much. Coolify do
+                        it for you.</p>
+                    <p><x-highlighted text="No vendor lock-in:" /> All configurations are stored on your server, so
+                        everything works without Coolify (except integrations and automations).</p>
+                    <p><x-highlighted text="Monitoring:" />You will get notified on your favourite platform (Discord,
+                        Telegram, Email, etc.) when something goes wrong, or an action needed from your side.</p>
                 </x-slot:explanation>
                 <x-slot:actions>
                     <x-forms.button class="justify-center box" wire:click="explanation">Next
@@ -43,9 +46,21 @@
                     <x-forms.button class="justify-center box" wire:target="setServerType('localhost')"
                         wire:click="setServerType('localhost')">Localhost
                     </x-forms.button>
+
                     <x-forms.button class="justify-center box" wire:target="setServerType('remote')"
                         wire:click="setServerType('remote')">Remote Server
                     </x-forms.button>
+                    @if (!$serverReachable)
+                        Localhost is not reachable with the following public key.
+                        <br /> <br />
+                        Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
+                        'root' or skip the boarding process and add a new private key manually to Coolify and to the
+                        server.
+                        <x-forms.input readonly id="serverPublicKey"></x-forms.input>
+                        <x-forms.button class="box" wire:target="setServerType('localhost')"
+                            wire:click="setServerType('localhost')">Check again
+                        </x-forms.button>
+                    @endif
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>Servers are the main building blocks, as they will host your applications, databases,
@@ -115,6 +130,17 @@
                             <x-forms.button type="submit">Use this Server</x-forms.button>
                         </form>
                     </div>
+                    @if (!$serverReachable)
+                    This server is not reachable with the following public key.
+                    <br /> <br />
+                    Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
+                    'root' or skip the boarding process and add a new private key manually to Coolify and to the
+                    server.
+                    <x-forms.input readonly id="serverPublicKey"></x-forms.input>
+                    <x-forms.button class="box" wire:target="validateServer"
+                        wire:click="validateServer">Check again
+                    </x-forms.button>
+                @endif
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>Private Keys are used to connect to a remote server through a secure shell, called SSH.</p>
@@ -194,25 +220,18 @@
     </div>
     <div>
         @if ($currentState === 'install-docker')
-            <x-modal modalId="installDocker">
-                <x-slot:modalBody>
-                    <livewire:activity-monitor header="Docker Installation Logs" />
-                </x-slot:modalBody>
-                <x-slot:modalSubmit>
-                    <x-forms.button onclick="installDocker.close()" type="submit">
-                        Close
-                    </x-forms.button>
-                </x-slot:modalSubmit>
-            </x-modal>
             <x-boarding-step title="Install Docker">
                 <x-slot:question>
                     Could not find Docker Engine on your server. Do you want me to install it for you?
                 </x-slot:question>
                 <x-slot:actions>
+                    @if ($dockerInstallationStarted)
                     <x-forms.button class="justify-center box" wire:click="installDocker"
                         onclick="installDocker.showModal()">
-                        Let's do
-                        it!</x-forms.button>
+                        Let's do it!</x-forms.button>
+                        <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
+                            Next</x-forms.button>
+                    @endif
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able

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

@@ -3,6 +3,6 @@
     <div class="">The destination server / network where your application will be deployed to.</div>
     <div class="py-4 ">
         <p>Server: {{ data_get($destination, 'server.name') }}</p>
-        <p>Destination Network: {{ $destination->network }}</p>
+        <p>Destination Network: {{ data_get($destination, 'server.network') }}</p>
     </div>
 </div>

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

@@ -48,10 +48,16 @@
             </x-forms.button>
         @endif
         @if ($server->settings->is_reachable && !$server->settings->is_usable && $server->id !== 0)
-            <x-forms.button class="mt-8 mb-4 box" onclick="installDocker.showModal()" wire:click.prevent='installDocker'
-                isHighlighted>
-                Install Docker Engine 24.0
-            </x-forms.button>
+            @if ($dockerInstallationStarted)
+                <x-forms.button class="mt-8 mb-4 box" wire:click.prevent='validateServer'>
+                    Validate Server
+                </x-forms.button>
+            @else
+                <x-forms.button class="mt-8 mb-4 box" onclick="installDocker.showModal()"
+                    wire:click.prevent='installDocker' isHighlighted>
+                    Install Docker Engine 24.0
+                </x-forms.button>
+            @endif
         @endif
         @if ($server->isFunctional())
             <h3 class="py-4">Settings</h3>

resources/views/livewire/server/proxy/status.blade.php

@@ -1,4 +1,3 @@
-
 <div class="flex gap-2" x-init="$wire.getProxyStatus">
     @if ($server->proxy->status === 'running')
         <x-status.running text="Proxy Running" />
@@ -7,7 +6,8 @@
     @else
         <x-status.stopped text="Proxy Stopped" />
     @endif
-    <button wire:click.prevent='getProxyStatusWithNoti'><svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <button wire:loading.remove.delay.longer wire:click.prevent='getProxyStatusWithNoti'>
+        <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <g fill="#FCD44F">
                 <path
                     d="M12.079 3v-.75V3Zm-8.4 8.333h-.75h.75Zm0 1.667l-.527.532a.75.75 0 0 0 1.056 0L3.68 13Zm2.209-1.134A.75.75 0 1 0 4.83 10.8l1.057 1.065ZM2.528 10.8a.75.75 0 0 0-1.056 1.065L2.528 10.8Zm16.088-3.408a.75.75 0 1 0 1.277-.786l-1.277.786ZM12.079 2.25c-5.047 0-9.15 4.061-9.15 9.083h1.5c0-4.182 3.42-7.583 7.65-7.583v-1.5Zm-9.15 9.083V13h1.5v-1.667h-1.5Zm1.28 2.2l1.679-1.667L4.83 10.8l-1.68 1.667l1.057 1.064Zm0-1.065L2.528 10.8l-1.057 1.065l1.68 1.666l1.056-1.064Zm15.684-5.86A9.158 9.158 0 0 0 12.08 2.25v1.5a7.658 7.658 0 0 1 6.537 3.643l1.277-.786Z" />

resources/views/livewire/subscription/pricing-plans.blade.php

@@ -2,29 +2,34 @@
     @if (config('subscription.provider') === 'stripe')
         <x-slot:basic>
             <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
-                class="w-full h-10 buyme" wire:click="subscribeStripe('basic-monthly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                class="w-full h-10 buyme" wire:click="subscribeStripe('basic-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
 
             <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
-                class="w-full h-10 buyme" wire:click="subscribeStripe('basic-yearly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                class="w-full h-10 buyme" wire:click="subscribeStripe('basic-yearly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
         </x-slot:basic>
         <x-slot:pro>
             <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-pro"
-                class="w-full h-10 buyme" wire:click="subscribeStripe('pro-monthly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                class="w-full h-10 buyme" wire:click="subscribeStripe('pro-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
 
             <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('pro-yearly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                wire:click="subscribeStripe('pro-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
         </x-slot:pro>
         <x-slot:ultimate>
             <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme" wire:click="subscribeStripe('ultimate-monthly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="https://docs.coollabs.io/contact" target="_blank">
+                    Contact Us</a>
             </x-forms.button>
 
             <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme" wire:click="subscribeStripe('ultimate-yearly')"> {{$isTrial ? 'Start Trial' : 'Subscribe' }}
+                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="https://docs.coollabs.io/contact" target="_blank">
+                    Contact Us</a>
             </x-forms.button>
         </x-slot:ultimate>
     @endif

versions.json

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