Merge branch 'next' into feat-db-ssl

2025-02-19 17:57:59 +01:00
parent f288852753 65b925252c
commit 9557957f18
24 changed files with 224 additions and 104 deletions
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Special thanks to our biggest sponsors!
 * [Juxtdigital](https://juxtdigital.dev/?ref=coolify.io) - A digital agency offering web development, design, and digital marketing services for businesses.
 * [Saasykit](https://saasykit.com/?ref=coolify.io) - A Laravel-based boilerplate providing essential components and features for building SaaS applications quickly.
 * [Massivegrid](https://massivegrid.com/?ref=coolify.io) - A cloud hosting provider offering scalable infrastructure solutions for businesses of all sizes.
-* [LiquidWeb](https://liquidweb.com/?utm_source=coolify.io) - Fast web hosting provider.
+* [LiquidWeb](https://liquidweb.com/?utm_source=coolify.io) - A Fast web hosting provider.


 ## Github Sponsors ($40+)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -6,14 +6,12 @@ use App\Jobs\CheckAndStartSentinelJob;
 use App\Jobs\CheckForUpdatesJob;
 use App\Jobs\CheckHelperImageJob;
 use App\Jobs\CleanupInstanceStuffsJob;
-use App\Jobs\CleanupStaleMultiplexedConnections;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\DockerCleanupJob;
 use App\Jobs\PullTemplatesFromCDN;
 use App\Jobs\RegenerateSslCertJob;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\ServerCheckJob;
-use App\Jobs\ServerCleanupMux;
 use App\Jobs\ServerStorageCheckJob;
 use App\Jobs\UpdateCoolifyJob;
 use App\Models\InstanceSettings;
@@ -24,6 +22,7 @@ use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;

 class Kernel extends ConsoleKernel
 {
@@ -102,10 +101,14 @@ class Kernel extends ConsoleKernel
            $servers = $this->allServers->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true)->get();
        }
        foreach ($servers as $server) {
-            if ($server->isSentinelEnabled()) {
-                $this->scheduleInstance->job(function () use ($server) {
-                    CheckAndStartSentinelJob::dispatch($server);
-                })->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
+            try {
+                if ($server->isSentinelEnabled()) {
+                    $this->scheduleInstance->job(function () use ($server) {
+                        CheckAndStartSentinelJob::dispatch($server);
+                    })->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
+                }
+            } catch (\Exception $e) {
+                Log::error('Error pulling images: '.$e->getMessage());
            }
        }
        $this->scheduleInstance->job(new CheckHelperImageJob)
@@ -141,35 +144,47 @@ class Kernel extends ConsoleKernel
        }

        foreach ($servers as $server) {
-            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
-            if (validate_timezone($serverTimezone) === false) {
-                $serverTimezone = config('app.timezone');
-            }
-
-            // Sentinel check
-            $lastSentinelUpdate = $server->sentinel_updated_at;
-            if (Carbon::parse($lastSentinelUpdate)->isBefore(now()->subSeconds($server->waitBeforeDoingSshCheck()))) {
-                // Check container status every minute if Sentinel does not activated
-                if (isCloud()) {
-                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
-                } else {
-                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
+            try {
+                $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+                if (validate_timezone($serverTimezone) === false) {
+                    $serverTimezone = config('app.timezone');
                }
-                // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();

-                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($server->settings->server_disk_usage_check_frequency)->timezone($serverTimezone)->onOneServer();
-            }
+                // Sentinel check
+                $lastSentinelUpdate = $server->sentinel_updated_at;
+                if (Carbon::parse($lastSentinelUpdate)->isBefore(now()->subSeconds($server->waitBeforeDoingSshCheck()))) {
+                    // Check container status every minute if Sentinel does not activated
+                    if (isCloud()) {
+                        $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
+                    } else {
+                        $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
+                    }
+                    // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();

-            $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
+                    $serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 * * * *');
+                    if (isset(VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency])) {
+                        $serverDiskUsageCheckFrequency = VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency];
+                    }
+                    $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($serverDiskUsageCheckFrequency)->timezone($serverTimezone)->onOneServer();
+                }

-            // Cleanup multiplexed connections every hour
-            // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
+                $dockerCleanupFrequency = data_get($server->settings, 'docker_cleanup_frequency', '0 * * * *');
+                if (isset(VALID_CRON_STRINGS[$dockerCleanupFrequency])) {
+                    $dockerCleanupFrequency = VALID_CRON_STRINGS[$dockerCleanupFrequency];
+                }
+                $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($dockerCleanupFrequency)->timezone($serverTimezone)->onOneServer();

-            // Temporary solution until we have better memory management for Sentinel
-            if ($server->isSentinelEnabled()) {
-                $this->scheduleInstance->job(function () use ($server) {
-                    $server->restartContainer('coolify-sentinel');
-                })->daily()->onOneServer();
+                // Cleanup multiplexed connections every hour
+                // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
+
+                // Temporary solution until we have better memory management for Sentinel
+                if ($server->isSentinelEnabled()) {
+                    $this->scheduleInstance->job(function () use ($server) {
+                        $server->restartContainer('coolify-sentinel');
+                    })->daily()->onOneServer();
+                }
+            } catch (\Exception $e) {
+                Log::error('Error checking resources: '.$e->getMessage());
            }
        }
    }
@@ -203,24 +218,28 @@ class Kernel extends ConsoleKernel
        }

        foreach ($finalScheduledBackups as $scheduled_backup) {
-            if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
-                $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
-            }
+            try {
+                if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
+                    $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
+                }
+                $server = $scheduled_backup->server();
+                $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);

-            $server = $scheduled_backup->server();
-            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+                if (validate_timezone($serverTimezone) === false) {
+                    $serverTimezone = config('app.timezone');
+                }

-            if (validate_timezone($serverTimezone) === false) {
-                $serverTimezone = config('app.timezone');
+                if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
+                    $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
+                }
+                $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+                $this->scheduleInstance->job(new DatabaseBackupJob(
+                    backup: $scheduled_backup
+                ))->cron($scheduled_backup->frequency)->timezone($serverTimezone)->onOneServer();
+            } catch (\Exception $e) {
+                Log::error('Error scheduling backup: '.$e->getMessage());
+                Log::error($e->getTraceAsString());
            }
-
-            if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
-                $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
-            }
-            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
-            $this->scheduleInstance->job(new DatabaseBackupJob(
-                backup: $scheduled_backup
-            ))->cron($scheduled_backup->frequency)->timezone($serverTimezone)->onOneServer();
        }
    }

@@ -267,18 +286,23 @@ class Kernel extends ConsoleKernel
        }

        foreach ($finalScheduledTasks as $scheduled_task) {
-            $server = $scheduled_task->server();
-            if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
-                $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
-            }
-            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+            try {
+                $server = $scheduled_task->server();
+                if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
+                    $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
+                }
+                $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);

-            if (validate_timezone($serverTimezone) === false) {
-                $serverTimezone = config('app.timezone');
+                if (validate_timezone($serverTimezone) === false) {
+                    $serverTimezone = config('app.timezone');
+                }
+                $this->scheduleInstance->job(new ScheduledTaskJob(
+                    task: $scheduled_task
+                ))->cron($scheduled_task->frequency)->timezone($serverTimezone)->onOneServer();
+            } catch (\Exception $e) {
+                Log::error('Error scheduling task: '.$e->getMessage());
+                Log::error($e->getTraceAsString());
            }
-            $this->scheduleInstance->job(new ScheduledTaskJob(
-                task: $scheduled_task
-            ))->cron($scheduled_task->frequency)->timezone($serverTimezone)->onOneServer();
        }
    }

--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -2284,7 +2284,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
        } else {
            if ($this->use_build_server) {
                $this->execute_remote_command(
-                    ["{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", 'hidden' => true],
+                    ["{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --pull always --build -d", 'hidden' => true],
                );
            } else {
                $this->execute_remote_command(
--- a/app/Livewire/Destination/New/Docker.php
+++ b/app/Livewire/Destination/New/Docker.php
@@ -35,10 +35,18 @@ class Docker extends Component
        $this->network = new Cuid2;
        $this->servers = Server::isUsable()->get();
        if ($server_id) {
-            $this->selectedServer = $this->servers->find($server_id) ?: $this->servers->first();
+            $foundServer = $this->servers->find($server_id) ?: $this->servers->first();
+            if (! $foundServer) {
+                throw new \Exception('Server not found.');
+            }
+            $this->selectedServer = $foundServer;
            $this->serverId = $this->selectedServer->id;
        } else {
-            $this->selectedServer = $this->servers->first();
+            $foundServer = $this->servers->first();
+            if (! $foundServer) {
+                throw new \Exception('Server not found.');
+            }
+            $this->selectedServer = $foundServer;
            $this->serverId = $this->selectedServer->id;
        }
        $this->generateName();
--- a/app/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -53,13 +53,13 @@ class DeploymentNavbar extends Component
    public function cancel()
    {
        $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
-        $build_server_id = $this->application_deployment_queue->build_server_id;
+        $build_server_id = $this->application_deployment_queue->build_server_id ?? $this->application->destination->server_id;
        $server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
        try {
            if ($this->application->settings->is_build_server_enabled) {
-                $server = Server::find($build_server_id);
+                $server = Server::ownedByCurrentTeam()->find($build_server_id);
            } else {
-                $server = Server::find($server_id);
+                $server = Server::ownedByCurrentTeam()->find($server_id);
            }
            if ($this->application_deployment_queue->logs) {
                $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
--- a/app/Livewire/Project/Service/Configuration.php
+++ b/app/Livewire/Project/Service/Configuration.php
@@ -32,7 +32,7 @@ class Configuration extends Component
        return [
            "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status',
            'check_status',
-            'refresh' => '$refresh',
+            'refreshStatus' => '$refresh',
        ];
    }

@@ -99,7 +99,7 @@ class Configuration extends Component
            $this->service->databases->each(function ($database) {
                $database->refresh();
            });
-            $this->dispatch('refresh');
+            $this->dispatch('refreshStatus');
        } catch (\Exception $e) {
            return handleError($e, $this);
        }
--- a/app/Livewire/Project/Service/Navbar.php
+++ b/app/Livewire/Project/Service/Navbar.php
@@ -40,6 +40,7 @@ class Navbar extends Component
        return [
            "echo-private:user.{$userId},ServiceStatusChanged" => 'serviceStarted',
            'envsUpdated' => '$refresh',
+            'refreshStatus' => '$refresh',
        ];
    }

--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -7,6 +7,7 @@ use App\Actions\Server\StopSentinel;
 use App\Events\ServerReachabilityChanged;
 use App\Models\Server;
 use Livewire\Attributes\Computed;
+use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;

@@ -50,6 +51,9 @@ class Show extends Component
    #[Validate(['required'])]
    public bool $isBuildServer;

+    #[Locked]
+    public bool $isBuildServerLocked = false;
+
    #[Validate(['required'])]
    public bool $isMetricsEnabled;

@@ -95,6 +99,9 @@ class Show extends Component
        try {
            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
            $this->syncData();
+            if (! $this->server->isEmpty()) {
+                $this->isBuildServerLocked = true;
+            }
        } catch (\Throwable $e) {
            return handleError($e, $this);
        }
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -43,8 +43,18 @@ class S3Storage extends BaseModel
    public function testConnection(bool $shouldSave = false)
    {
        try {
-            set_s3_target($this);
-            Storage::disk('custom-s3')->files();
+            $disk = Storage::build([
+                'driver' => 's3',
+                'region' => $this['region'],
+                'key' => $this['key'],
+                'secret' => $this['secret'],
+                'bucket' => $this['bucket'],
+                'endpoint' => $this['endpoint'],
+                'use_path_style_endpoint' => true,
+            ]);
+            // Test the connection by listing files with ListObjectsV2 (S3)
+            $disk->files();
+
            $this->unusable_email_sent = false;
            $this->is_usable = true;
        } catch (\Throwable $e) {
@@ -53,13 +63,14 @@ class S3Storage extends BaseModel
                $mail = new MailMessage;
                $mail->subject('Coolify: S3 Storage Connection Error');
                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
-                $users = collect([]);
-                $members = $this->team->members()->get();
-                foreach ($members as $user) {
-                    if ($user->isAdmin()) {
-                        $users->push($user);
-                    }
-                }
+
+                // Load the team with its members and their roles explicitly
+                $team = $this->team()->with(['members' => function ($query) {
+                    $query->withPivot('role');
+                }])->first();
+
+                // Get admins directly from the pivot relationship for this specific team
+                $users = $team->members()->wherePivotIn('role', ['admin', 'owner'])->get(['users.id', 'users.email']);
                foreach ($users as $user) {
                    send_user_an_email($mail, $user->email);
                }
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1341,4 +1341,11 @@ $schema://$host {
            throw new \Exception('Invalid proxy type.');
        }
    }
+
+    public function isEmpty()
+    {
+        return $this->applications()->count() == 0 &&
+            $this->databases()->count() == 0 &&
+            $this->services()->count() == 0;
+    }
 }
--- a/bootstrap/helpers/s3.php
+++ b/bootstrap/helpers/s3.php
@@ -1,17 +0,0 @@
-<?php
-
-use App\Models\S3Storage;
-
-function set_s3_target(S3Storage $s3)
-{
-    config()->set('filesystems.disks.custom-s3', [
-        'driver' => 's3',
-        'region' => $s3['region'],
-        'key' => $s3['key'],
-        'secret' => $s3['secret'],
-        'bucket' => $s3['bucket'],
-        'endpoint' => $s3['endpoint'],
-        'use_path_style_endpoint' => true,
-        'aws_url' => $s3->awsUrl(),
-    ]);
-}
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@

 return [
    'coolify' => [
-        'version' => '4.0.0-beta.392',
+        'version' => '4.0.0-beta.394',
        'helper_version' => '1.0.6',
        'realtime_version' => '1.0.5',
        'self_hosted' => env('SELF_HOSTED', true),
--- a/public/svgs/convex.svg
+++ b/public/svgs/convex.svg
@@ -0,0 +1,12 @@
+<svg width="382" height="146" viewBox="0 0 382 146" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M114.794 86.6648C111.454 83.6785 109.784 79.2644 109.784 73.434C109.784 67.6036 111.487 63.1896 114.896 60.2033C118.301 57.217 122.959 55.721 128.865 55.721C131.319 55.721 133.486 55.8973 135.372 56.2613C137.258 56.6197 139.063 57.2283 140.786 58.0929V67.5524C138.106 66.2157 135.064 65.5445 131.659 65.5445C128.66 65.5445 126.445 66.1417 125.018 67.3363C123.586 68.5308 122.873 70.5615 122.873 73.434C122.873 76.2099 123.575 78.2178 124.986 79.4578C126.391 80.7035 128.617 81.3236 131.665 81.3236C134.891 81.3236 137.955 80.5329 140.862 78.9573V88.8547C137.636 90.3849 133.615 91.1471 128.801 91.1471C122.797 91.1471 118.133 89.6511 114.794 86.6648Z" fill="white"/>
+<path d="M143.77 73.4279C143.77 67.643 145.337 63.246 148.471 60.2312C151.605 57.2165 156.328 55.7148 162.645 55.7148C169.006 55.7148 173.761 57.2222 176.922 60.2312C180.078 63.2403 181.656 67.643 181.656 73.4279C181.656 85.2366 175.318 91.1409 162.645 91.1409C150.06 91.1466 143.77 85.2423 143.77 73.4279ZM167.179 79.4574C168.109 78.2116 168.574 76.2037 168.574 73.4335C168.574 70.7089 168.109 68.7123 167.179 67.4439C166.25 66.1754 164.737 65.544 162.645 65.544C160.603 65.544 159.122 66.1811 158.214 67.4439C157.306 68.7123 156.853 70.7089 156.853 73.4335C156.853 76.2094 157.306 78.2173 158.214 79.4574C159.122 80.7031 160.597 81.3231 162.645 81.3231C164.737 81.3231 166.244 80.6974 167.179 79.4574Z" fill="white"/>
+<path d="M184.638 56.4315H196.629L196.97 59.014C198.288 58.0583 199.969 57.2677 202.011 56.6477C204.054 56.0276 206.167 55.7148 208.35 55.7148C212.392 55.7148 215.343 56.7671 217.207 58.8718C219.071 60.9764 220.001 64.2244 220.001 68.627V90.4299H207.194V69.9865C207.194 68.4564 206.864 67.3585 206.205 66.6873C205.546 66.0161 204.443 65.6862 202.898 65.6862C201.947 65.6862 200.968 65.9137 199.969 66.3688C198.969 66.8239 198.131 67.4097 197.445 68.1265V90.4299H184.638V56.4315Z" fill="white"/>
+<path d="M220.038 56.4317H233.391L239.524 76.3689L245.658 56.4317H259.011L246.268 90.4301H232.775L220.038 56.4317Z" fill="white"/>
+<path d="M263.043 87.5062C259.195 84.4687 257.396 79.1957 257.396 73.5018C257.396 67.9558 258.828 63.3882 262.097 60.2312C265.366 57.0743 270.349 55.7148 276.639 55.7148C282.426 55.7148 286.976 57.1255 290.3 59.9468C293.618 62.7682 295.282 66.6191 295.282 71.4939V77.4494H270.927C271.532 79.2184 272.299 80.4983 274.185 81.289C276.071 82.0796 278.703 82.4721 282.07 82.4721C284.08 82.4721 286.133 82.3071 288.219 81.9715C288.954 81.8521 290.165 81.6644 290.802 81.5222V89.7871C287.619 90.6972 283.377 91.1523 278.595 91.1523C272.159 91.1466 266.89 90.5437 263.043 87.5062ZM281.826 70.1344C281.826 68.4507 279.984 64.8273 276.282 64.8273C272.942 64.8273 270.738 68.3938 270.738 70.1344H281.826Z" fill="white"/>
+<path d="M305.338 73.1437L293.346 56.4317H307.245L331.773 90.4301H317.74L312.287 82.825L306.835 90.4301H292.865L305.338 73.1437Z" fill="white"/>
+<path d="M317.431 56.4317H331.265L320.647 71.3178L313.622 61.7786L317.431 56.4317Z" fill="white"/>
+<path d="M82.2808 87.6517C89.652 86.8381 96.6012 82.9353 100.427 76.4211C98.6156 92.533 80.8853 102.717 66.413 96.4643C65.0795 95.8897 63.9316 94.9339 63.1438 93.705C59.8915 88.6302 58.8224 82.1729 60.3585 76.313C64.7475 83.8399 73.6717 88.4538 82.2808 87.6517Z" fill="white"/>
+<path d="M60.0895 71.5852C57.1016 78.4464 56.9722 86.4797 60.6353 93.0906C47.7442 83.453 47.8848 62.8294 60.4778 53.2885C61.6425 52.4067 63.0267 51.8833 64.4785 51.8036C70.4486 51.4907 76.5144 53.7835 80.7683 58.0561C72.1254 58.1415 63.7076 63.643 60.0895 71.5852Z" fill="white"/>
+<path d="M84.9366 60.1673C80.5757 54.1253 73.7503 50.0119 66.2722 49.8868C80.7277 43.3669 98.5086 53.9375 100.444 69.5659C100.624 71.0167 100.388 72.4959 99.7409 73.8044C97.04 79.2547 92.032 83.4819 86.1801 85.0464C90.4678 77.144 89.9388 67.4893 84.9366 60.1673Z" fill="white"/>
+</svg>
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -26,7 +26,7 @@
        @endphp
        @if ($showUnhealthyHelper)
            <x-helper
-                helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/traefik/healthcheck/' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
+                helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/proxy/traefik/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
                <x-slot:icon>
                    <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
                        xmlns="http://www.w3.org/2000/svg">
--- a/resources/views/livewire/project/application/deployment/show.blade.php
+++ b/resources/views/livewire/project/application/deployment/show.blade.php
@@ -108,16 +108,16 @@
                <div id="logs" class="flex flex-col font-mono">
                    @forelse ($this->logLines as $line)
                        <div @class([
-                            'mt-2' => $line['command'] ?? false,
+                            'mt-2' => isset($line['command']) && $line['command'],
                            'flex gap-2 dark:hover:bg-coolgray-500 hover:bg-gray-100',
                        ])>
                            <span x-show="showTimestamps" class="shrink-0 text-gray-500">{{ $line['timestamp'] }}</span>
                            <span @class([
                                'text-coollabs dark:text-warning' => $line['hidden'],
                                'text-red-500' => $line['stderr'],
-                                'font-bold' => $line['command'] ?? false,
+                                'font-bold' => isset($line['command']) && $line['command'],
                                'whitespace-pre-wrap',
-                            ])>{!! $line['line'] !!}</span>
+                            ])>{!! (isset($line['command']) && $line['command'] ? '[CMD]: ' : '') . trim($line['line']) !!}</span>
                        </div>
                    @empty
                        <span class="font-mono text-neutral-400 mb-2">No logs yet.</span>
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -1,4 +1,4 @@
-<nav wire:poll.5000ms="check_status">
+<nav wire:poll.10000ms="check_status">
    <x-resources.breadcrumbs :resource="$database" :parameters="$parameters" />
    <x-slide-over @startdatabase.window="slideOverOpen = true" closeWithX fullScreen>
        <x-slot:title>Database Startup</x-slot:title>
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -39,7 +39,7 @@
            @if ($currentRoute === 'project.service.configuration')
                <livewire:project.service.stack-form :service="$service" />
                <h3>Services</h3>
-                <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-1" wire:poll.10s="check_status">
+                <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-1" wire:poll.10000ms="check_status">
                    @foreach ($applications as $application)
                        <div @class([
                            'border-l border-dashed border-red-500 ' => str(
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -134,7 +134,14 @@
                    <div class="w-full">
                        @if (!$server->isLocalhost())
                            <div class="w-96">
-                                <x-forms.checkbox instantSave id="isBuildServer" label="Use it as a build server?" />
+                                @if ($isBuildServerLocked)
+                                    <x-forms.checkbox disabled instantSave id="isBuildServer"
+                                        helper="You can't use this server as a build server because it has defined resources."
+                                        label="Use it as a build server?" />
+                                @else
+                                    <x-forms.checkbox instantSave id="isBuildServer"
+                                        label="Use it as a build server?" />
+                                @endif
                            </div>

                            @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)
--- a/resources/views/livewire/storage/create.blade.php
+++ b/resources/views/livewire/storage/create.blade.php
@@ -1,6 +1,6 @@
 <div class="w-full">
    <div class="mb-4">For more details, please visit the <a class="underline dark:text-warning"
-            href="https://coolify.io/docs/knowledge-base/s3" target="_blank">Coolify Docs</a>.</div>
+            href="https://coolify.io/docs/knowledge-base/s3/introduction" target="_blank">Coolify Docs</a>.</div>
    <form class="flex flex-col gap-2" wire:submit='submit'>
        <div class="flex gap-2">
            <x-forms.input required label="Name" id="name" />
--- a/resources/views/livewire/subscription/pricing-plans.blade.php
+++ b/resources/views/livewire/subscription/pricing-plans.blade.php
@@ -1,4 +1,4 @@
-<div x-data="{ selected: 'monthly' }" class="w-full pb-20">
+<div x-data="{ selected: 'monthly' }" class="w-full pb-20 pt-10">
    <div class="px-6 mx-auto lg:px-8">
        <div class="flex justify-center">
            <fieldset
--- a/templates/compose/convex.yaml
+++ b/templates/compose/convex.yaml
@@ -0,0 +1,40 @@
+# documentation: https://docs.convex.dev/
+# slogan: Convex is the open-source reactive database for app developers.
+# tags: database, reactive, database, ai, agents, chatbot, api, team, bot, flows
+# logo: svgs/convex.svg
+# port: 6791
+
+services:
+  backend:
+    image: ghcr.io/get-convex/convex-backend:4499dd4fd7f2148687a7774599c613d052950f46
+    volumes:
+      - data:/convex/data
+    environment:
+      - SERVICE_FQDN_BACKEND_3210
+      - INSTANCE_NAME=${INSTANCE_NAME:-self-hosted-convex}
+      - INSTANCE_SECRET=${SERVICE_HEX_32_SECRET}
+      - CONVEX_RELEASE_VERSION_DEV=${CONVEX_RELEASE_VERSION_DEV:-}
+      - ACTIONS_USER_TIMEOUT_SECS=${ACTIONS_USER_TIMEOUT_SECS:-}
+      - CONVEX_CLOUD_ORIGIN=${SERVICE_FQDN_CONVEX_6791}
+      - CONVEX_SITE_ORIGIN=${SERVICE_FQDN_CONVEX_6791}/http
+      - DATABASE_URL=${DATABASE_URL:-}
+      - DISABLE_BEACON=${DISABLE_BEACON:-}
+      - REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:-}
+      - CONVEX_SELF_HOSTED_URL=${SERVICE_FQDN_CONVEX_6791}
+    healthcheck:
+      test: curl -f http://127.0.0.1:3210/version
+      interval: 5s
+      start_period: 5s
+
+  dashboard:
+    image: ghcr.io/get-convex/convex-dashboard:4499dd4fd7f2148687a7774599c613d052950f46
+    environment:
+      - SERVICE_FQDN_CONVEX_6791
+      - NEXT_PUBLIC_DEPLOYMENT_URL=$SERVICE_FQDN_BACKEND_3210
+    depends_on:
+      backend:
+        condition: service_healthy
+    healthcheck:
+      test: wget -qO- http://127.0.0.1:6791/
+      interval: 5s
+      start_period: 5s
--- a/templates/compose/fider.yaml
+++ b/templates/compose/fider.yaml
@@ -38,7 +38,7 @@ services:
      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
      - POSTGRES_DB=${POSTGRES_DB:-fider}
    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "$SERVICE_USER_POSTGRES"]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
      interval: 5s
      timeout: 20s
      retries: 10
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -497,6 +497,26 @@
        "minversion": "0.0.0",
        "port": "8443"
    },
+    "convex": {
+        "documentation": "https://docs.convex.dev/?utm_source=coolify.io",
+        "slogan": "Convex is the open-source reactive database for app developers.",
+        "compose": "c2VydmljZXM6CiAgYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9nZXQtY29udmV4L2NvbnZleC1iYWNrZW5kOjQ0OTlkZDRmZDdmMjE0ODY4N2E3Nzc0NTk5YzYxM2QwNTI5NTBmNDYnCiAgICB2b2x1bWVzOgogICAgICAtICdkYXRhOi9jb252ZXgvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9CQUNLRU5EXzMyMTAKICAgICAgLSAnSU5TVEFOQ0VfTkFNRT0ke0lOU1RBTkNFX05BTUU6LXNlbGYtaG9zdGVkLWNvbnZleH0nCiAgICAgIC0gJ0lOU1RBTkNFX1NFQ1JFVD0ke1NFUlZJQ0VfSEVYXzMyX1NFQ1JFVH0nCiAgICAgIC0gJ0NPTlZFWF9SRUxFQVNFX1ZFUlNJT05fREVWPSR7Q09OVkVYX1JFTEVBU0VfVkVSU0lPTl9ERVY6LX0nCiAgICAgIC0gJ0FDVElPTlNfVVNFUl9USU1FT1VUX1NFQ1M9JHtBQ1RJT05TX1VTRVJfVElNRU9VVF9TRUNTOi19JwogICAgICAtICdDT05WRVhfQ0xPVURfT1JJR0lOPSR7U0VSVklDRV9GUUROX0NPTlZFWF82NzkxfScKICAgICAgLSAnQ09OVkVYX1NJVEVfT1JJR0lOPSR7U0VSVklDRV9GUUROX0NPTlZFWF82NzkxfS9odHRwJwogICAgICAtICdEQVRBQkFTRV9VUkw9JHtEQVRBQkFTRV9VUkw6LX0nCiAgICAgIC0gJ0RJU0FCTEVfQkVBQ09OPSR7RElTQUJMRV9CRUFDT046LX0nCiAgICAgIC0gJ1JFREFDVF9MT0dTX1RPX0NMSUVOVD0ke1JFREFDVF9MT0dTX1RPX0NMSUVOVDotfScKICAgICAgLSAnQ09OVkVYX1NFTEZfSE9TVEVEX1VSTD0ke1NFUlZJQ0VfRlFETl9DT05WRVhfNjc5MX0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDogJ2N1cmwgLWYgaHR0cDovLzEyNy4wLjAuMTozMjEwL3ZlcnNpb24nCiAgICAgIGludGVydmFsOiA1cwogICAgICBzdGFydF9wZXJpb2Q6IDVzCiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdnaGNyLmlvL2dldC1jb252ZXgvY29udmV4LWRhc2hib2FyZDo0NDk5ZGQ0ZmQ3ZjIxNDg2ODdhNzc3NDU5OWM2MTNkMDUyOTUwZjQ2JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0NPTlZFWF82NzkxCiAgICAgIC0gTkVYVF9QVUJMSUNfREVQTE9ZTUVOVF9VUkw9JFNFUlZJQ0VfRlFETl9CQUNLRU5EXzMyMTAKICAgIGRlcGVuZHNfb246CiAgICAgIGJhY2tlbmQ6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6Njc5MS8nCiAgICAgIGludGVydmFsOiA1cwogICAgICBzdGFydF9wZXJpb2Q6IDVzCg==",
+        "tags": [
+            "database",
+            "reactive",
+            "database",
+            "ai",
+            "agents",
+            "chatbot",
+            "api",
+            "team",
+            "bot",
+            "flows"
+        ],
+        "logo": "svgs/convex.svg",
+        "minversion": "0.0.0",
+        "port": "6791"
+    },
    "cryptgeon": {
        "documentation": "https://github.com/cupcakearmy/cryptgeon?utm_source=coolify.io",
        "slogan": "Secure note / file sharing service inspired by PrivNote.",
@@ -781,7 +801,7 @@
    "fider": {
        "documentation": "https://fider.io?utm_source=coolify.io",
        "slogan": "Fider is a feedback platform for collecting and managing user feedback.",
-        "compose": "c2VydmljZXM6CiAgZmlkZXI6CiAgICBpbWFnZTogJ2dldGZpZGVyL2ZpZGVyOnN0YWJsZScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSURFUl8zMDAwCiAgICAgIC0gQkFTRV9VUkw9JFNFUlZJQ0VfRlFETl9GSURFUl8zMDAwCiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyRTRVJWSUNFX1VTRVJfUE9TVEdSRVM6JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNAZGF0YWJhc2U6NTQzMi9maWRlcj9zc2xtb2RlPWRpc2FibGUnCiAgICAgIC0gSldUX1NFQ1JFVD0kU0VSVklDRV9QQVNTV09SRF82NF9GSURFUgogICAgICAtICdFTUFJTF9OT1JFUExZPSR7RU1BSUxfTk9SRVBMWTotbm9yZXBseUBleGFtcGxlLmNvbX0nCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9BUEk9JEVNQUlMX01BSUxHVU5fQVBJCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9ET01BSU49JEVNQUlMX01BSUxHVU5fRE9NQUlOCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9SRUdJT049JEVNQUlMX01BSUxHVU5fUkVHSU9OCiAgICAgIC0gJ0VNQUlMX1NNVFBfSE9TVD0ke0VNQUlMX1NNVFBfSE9TVDotc210cC5tYWlsZ3VuLmNvbX0nCiAgICAgIC0gJ0VNQUlMX1NNVFBfUE9SVD0ke0VNQUlMX1NNVFBfUE9SVDotNTg3fScKICAgICAgLSAnRU1BSUxfU01UUF9VU0VSTkFNRT0ke0VNQUlMX1NNVFBfVVNFUk5BTUU6LXBvc3RtYXN0ZXJAbWFpbGd1bi5jb219JwogICAgICAtIEVNQUlMX1NNVFBfUEFTU1dPUkQ9JEVNQUlMX1NNVFBfUEFTU1dPUkQKICAgICAgLSBFTUFJTF9TTVRQX0VOQUJMRV9TVEFSVFRMUz0kRU1BSUxfU01UUF9FTkFCTEVfU1RBUlRUTFMKICAgICAgLSBFTUFJTF9BV1NTRVNfUkVHSU9OPSRFTUFJTF9BV1NTRVNfUkVHSU9OCiAgICAgIC0gRU1BSUxfQVdTU0VTX0FDQ0VTU19LRVlfSUQ9JEVNQUlMX0FXU1NFU19BQ0NFU1NfS0VZX0lECiAgICAgIC0gRU1BSUxfQVdTU0VTX1NFQ1JFVF9BQ0NFU1NfS0VZPSRFTUFJTF9BV1NTRVNfU0VDUkVUX0FDQ0VTU19LRVkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSAvYXBwL2ZpZGVyCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTAKICBkYXRhYmFzZToKICAgIGltYWdlOiAncG9zdGdyZXM6MTInCiAgICB2b2x1bWVzOgogICAgICAtICdwZ19kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWZpZGVyfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBwZ19pc3JlYWR5CiAgICAgICAgLSAnLVUnCiAgICAgICAgLSAkU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgZmlkZXI6CiAgICBpbWFnZTogJ2dldGZpZGVyL2ZpZGVyOnN0YWJsZScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSURFUl8zMDAwCiAgICAgIC0gQkFTRV9VUkw9JFNFUlZJQ0VfRlFETl9GSURFUl8zMDAwCiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyRTRVJWSUNFX1VTRVJfUE9TVEdSRVM6JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNAZGF0YWJhc2U6NTQzMi9maWRlcj9zc2xtb2RlPWRpc2FibGUnCiAgICAgIC0gSldUX1NFQ1JFVD0kU0VSVklDRV9QQVNTV09SRF82NF9GSURFUgogICAgICAtICdFTUFJTF9OT1JFUExZPSR7RU1BSUxfTk9SRVBMWTotbm9yZXBseUBleGFtcGxlLmNvbX0nCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9BUEk9JEVNQUlMX01BSUxHVU5fQVBJCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9ET01BSU49JEVNQUlMX01BSUxHVU5fRE9NQUlOCiAgICAgIC0gRU1BSUxfTUFJTEdVTl9SRUdJT049JEVNQUlMX01BSUxHVU5fUkVHSU9OCiAgICAgIC0gJ0VNQUlMX1NNVFBfSE9TVD0ke0VNQUlMX1NNVFBfSE9TVDotc210cC5tYWlsZ3VuLmNvbX0nCiAgICAgIC0gJ0VNQUlMX1NNVFBfUE9SVD0ke0VNQUlMX1NNVFBfUE9SVDotNTg3fScKICAgICAgLSAnRU1BSUxfU01UUF9VU0VSTkFNRT0ke0VNQUlMX1NNVFBfVVNFUk5BTUU6LXBvc3RtYXN0ZXJAbWFpbGd1bi5jb219JwogICAgICAtIEVNQUlMX1NNVFBfUEFTU1dPUkQ9JEVNQUlMX1NNVFBfUEFTU1dPUkQKICAgICAgLSBFTUFJTF9TTVRQX0VOQUJMRV9TVEFSVFRMUz0kRU1BSUxfU01UUF9FTkFCTEVfU1RBUlRUTFMKICAgICAgLSBFTUFJTF9BV1NTRVNfUkVHSU9OPSRFTUFJTF9BV1NTRVNfUkVHSU9OCiAgICAgIC0gRU1BSUxfQVdTU0VTX0FDQ0VTU19LRVlfSUQ9JEVNQUlMX0FXU1NFU19BQ0NFU1NfS0VZX0lECiAgICAgIC0gRU1BSUxfQVdTU0VTX1NFQ1JFVF9BQ0NFU1NfS0VZPSRFTUFJTF9BV1NTRVNfU0VDUkVUX0FDQ0VTU19LRVkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSAvYXBwL2ZpZGVyCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTAKICBkYXRhYmFzZToKICAgIGltYWdlOiAncG9zdGdyZXM6MTInCiAgICB2b2x1bWVzOgogICAgICAtICdwZ19kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWZpZGVyfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtZCAkJHtQT1NUR1JFU19EQn0gLVUgJCR7UE9TVEdSRVNfVVNFUn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
        "tags": [
            "feedback",
            "user-feedback"
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.392"
+            "version": "4.0.0-beta.394"
        },
        "nightly": {
-            "version": "4.0.0-beta.393"
+            "version": "4.0.0-beta.395"
        },
        "helper": {
            "version": "1.0.6"