Merge branch 'next' into main

README.md

@@ -5,13 +5,13 @@ # About the Project
 
 Coolify is an open-source & self-hostable alternative to Heroku / Netlify / Vercel / etc. 
 
-It helps you to manage your servers, applications, databases on your own hardware, all you need is SSH connection. You can manage VPS, Bare Metal, Raspberry PI's anything.
+It helps you manage your servers, applications, and databases on your own hardware; you only need an SSH connection. You can manage VPS, Bare Metal, Raspberry PIs, and anything else.
 
-Imagine if you could have the ease of a cloud but with your own servers. That is **Coolify**.
+Imagine having the ease of a cloud but with your own servers. That is **Coolify**.
 
-No vendor lock-in, which means that all the configuration for your applications/databases/etc are saved to your server. So if you decide to stop using Coolify (oh nooo), you could still manage your running resources. You just lose the automations and all the magic. 🪄️
+No vendor lock-in, which means that all the configurations for your applications/databases/etc are saved to your server. So, if you decide to stop using Coolify (oh nooo), you could still manage your running resources. You lose the automations and all the magic. 🪄️
 
-For more information, take a look at our landing page [here](https://coolify.io).
+For more information, take a look at our landing page at [coolify.io](https://coolify.io).
 
 # Installation
 
@@ -22,36 +22,40 @@ # Installation
 
 # Support
 
-Contact us [here](https://coolify.io/docs/contact).
+Contact us at [coolify.io/docs/contact](https://coolify.io/docs/contact).
 
 # Donations
-To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
+To stay completely free and open-source, with no feature behind the paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the project's future development.
 
-https://coolify.io/sponsorships
+[coolify.io/sponsorships](https://coolify.io/sponsorships)
 
 Thank you so much!
 
 Special thanks to our biggest sponsors!
 
 <a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
-<a href="http://htznr.li/CoolifyXHetzner" target="_blank"><img src="./other/logos/hetzner.jpg" alt="hetzner logo" width="200"/></a>
+<a href="http://htznr.li/CoolifyXHetzner" target="_blank"><img src="./other/logos/hetzner.jpg" alt="hetzner logo" width="150"/></a>
-<a href="https://logto.io/?ref=coolify" target="_blank"><img src="./other/logos/logto.webp" alt="logto logo" width="200"/></a>
+<a href="https://logto.io/?ref=coolify" target="_blank"><img src="./other/logos/logto.webp" alt="logto logo" width="150"/></a>
-<a href="https://bc.direct/?utm_source=coolify.io" target="_blank"><img src="./other/logos/bc.png" alt="bc direct logo" width="200"/></a>
+<a href="https://bc.direct/?ref=coolify.io" target="_blank"><img src="./other/logos/bc.png" alt="bc direct logo" width="200"/></a>
-<a href="https://www.quantcdn.io/?utm_source=coolify.io" target="_blank"><img src="./other/logos/quant.svg" alt="quantcdn logo" width="200"/></a>
+<a href="https://www.quantcdn.io/?ref=coolify.io" target="_blank"><img src="./other/logos/quant.svg" alt="quantcdn logo" width="150"/></a>
-<a href="https://arcjet.com/?utm_source=coolify.io" target="_blank"><img src="./other/logos/arcjet.svg" alt="arcjet logo" width="200"/></a>
+<a href="https://arcjet.com/?ref=coolify.io" target="_blank"><img src="./other/logos/arcjet.svg" alt="arcjet logo" width="200"/></a>
-
+<a href="https://supa.guide/?ref=coolify.io" target="_blank"><img src="./other/logos/supaguide.png" alt="supaguide logo" width="200"/></a>
+<a href="https://tigrisdata.com/?ref=coolify.io" target="_blank"><img src="./other/logos/tigris.svg" alt="tigris logo" width="140"/></a>
+<a href="https://fractalnetworks.co/?ref=coolify.io" target="_blank"><img src="./other/logos/fractal.svg" alt="fractal logo" width="180"/></a>
+<a href="https://coolify.ad.vin/?ref=coolify.io" target="_blank"><img src="./other/logos/advin.png" alt="advin logo" width="250"/></a>
 
 ## Github Sponsors ($40+)
-<a href="https://serpapi.com/?utm_source=coolify.io"><img width="60px" alt="SerpAPI" src="https://github.com/serpapi.png"/></a>
+<a href="https://serpapi.com/?ref=coolify.io"><img width="60px" alt="SerpAPI" src="https://github.com/serpapi.png"/></a>
-<a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
+<a href="https://typebot.io/?ref=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
-<a href="https://www.runpod.io/?utm_source=coolify.io">
+<a href="https://www.runpod.io/?ref=coolify.io">
 <svg style="width:60px;height:60px;background:#fff;" xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 200 200"><g><path d="M74.5 51.1c-25.4 14.9-27 16-29.6 20.2-1.8 3-1.9 5.3-1.9 32.3 0 21.7.3 29.4 1.3 30.6 1.9 2.5 46.7 27.9 48.5 27.6 1.5-.3 1.7-3.1 2-27.7.2-21.9 0-27.8-1.1-29.5-.8-1.2-9.9-6.8-20.2-12.6-10.3-5.8-19.4-11.5-20.2-12.7-1.8-2.6-.9-5.9 1.8-7.4 1.6-.8 6.3 0 21.8 4C87.8 78.7 98 81 99.6 81c4.4 0 49.9-25.9 49.9-28.4 0-1.6-3.4-2.8-24-8.2-13.2-3.5-25.1-6.3-26.5-6.3-1.4.1-12.4 5.9-24.5 13z"></path><path d="m137.2 68.1-3.3 2.1 6.3 3.7c3.5 2 6.3 4.3 6.3 5.1 0 .9-8 6.1-19.4 12.6-10.6 6-20 11.9-20.7 12.9-1.2 1.6-1.4 7.2-1.2 29.4.3 24.8.5 27.6 2 27.9 1.8.3 46.6-25.1 48.6-27.6.9-1.2 1.2-8.8 1.2-30.2s-.3-29-1.2-30.2c-1.6-1.9-12.1-7.8-13.9-7.8-.8 0-2.9 1-4.7 2.1z"></path></g></svg></a>
-<a href="https://lightspeed.run/?utm_source=coolify.io"><img src="https://github.com/lightspeedrun.png" width="60px" alt="Lightspeed.run"/></a>
+<a href="https://lightspeed.run/?ref=coolify.io"><img src="https://github.com/lightspeedrun.png" width="60px" alt="Lightspeed.run"/></a>
-<a href="https://www.flint.sh/en/home?utm_source=coolify.io"> <img src="https://github.com/Flint-company.png" width="60px" alt="FlintCompany"/></a>
+<a href="https://www.flint.sh/en/home?ref=coolify.io"> <img src="https://github.com/Flint-company.png" width="60px" alt="FlintCompany"/></a>
-<a href="https://americancloud.com/?utm_source=coolify.io"><img src="https://github.com/American-Cloud.png" width="60px" alt="American Cloud"/></a>
+<a href="https://americancloud.com/?ref=coolify.io"><img src="https://github.com/American-Cloud.png" width="60px" alt="American Cloud"/></a>
-<a href="https://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
+<a href="https://cryptojobslist.com/?ref=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
-<a href="https://x.com/mrsmith9ja?utm_source=coolify.io"><img width="60px" alt="Thompson Edolo" src="https://github.com/verygreenboi.png"/></a>
+<a href="https://codext.link/coolify-io?ref=coolify.io"><img src="./other/logos/codext.jpg" width="60px" alt="Codext" /></a>
-<a href="https://www.uxwizz.com/?utm_source=coolify.io"><img width="60px" alt="UXWizz" src="https://github.com/UXWizz.png"/></a>
+<a href="https://x.com/mrsmith9ja?ref=coolify.io"><img width="60px" alt="Thompson Edolo" src="https://github.com/verygreenboi.png"/></a>
+<a href="https://www.uxwizz.com/?ref=coolify.io"><img width="60px" alt="UXWizz" src="https://github.com/UXWizz.png"/></a>
 <a href="https://github.com/Flowko"><img src="https://barrad.me/_ipx/f_webp&s_300x300/younes.jpg" width="60px" alt="Younes Barrad" /></a>
 <a href="https://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Automaze" /></a>
 <a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
@@ -83,9 +87,9 @@ ## Individuals
 
 # Cloud
 
-If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
+If you do not want to self-host Coolify, there is a paid cloud version available: [app.coolify.io](https://app.coolify.io)
 
-For more information & pricing, take a look at our landing page [here](https://coolify.io).
+For more information & pricing, take a look at our landing page [coolify.io](https://coolify.io).
 
 ## Why should I use the Cloud version?
 The recommended way to use Coolify is to have one server for Coolify and one (or more) for the resources you are deploying. A server is around 4-5$/month.
@@ -109,7 +113,7 @@ # Recognitions
 </a>
 </p>
 
-<a href="https://www.producthunt.com/posts/coolify?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-coolify" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=338273&theme=light" alt="Coolify - An&#0032;open&#0045;source&#0032;&#0038;&#0032;self&#0045;hostable&#0032;Heroku&#0044;&#0032;Netlify&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+<a href="https://www.producthunt.com/posts/coolify?ref=badge-featured&utm_medium=badge&utm_souce=badge-coolify" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=338273&theme=light" alt="Coolify - An&#0032;open&#0045;source&#0032;&#0038;&#0032;self&#0045;hostable&#0032;Heroku&#0044;&#0032;Netlify&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 

app/Actions/Database/StopDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Events\DatabaseStatusChanged;
 use App\Models\ServiceDatabase;
 use App\Models\StandaloneClickhouse;
 use App\Models\StandaloneDragonfly;
@@ -28,5 +29,6 @@ public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|St
         instant_remote_process(["docker rm -f {$uuid}-proxy"], $server);
         $database->is_public = false;
         $database->save();
+        DatabaseStatusChanged::dispatch();
     }
 }

app/Actions/Server/StartSentinel.php

@@ -12,12 +12,15 @@ class StartSentinel
     public function handle(Server $server, $version = 'latest', bool $restart = false)
     {
         if ($restart) {
-            instant_remote_process(['docker rm -f coolify-sentinel'], $server, false);
+            StopSentinel::run($server);
         }
+        $metrics_history = $server->settings->metrics_history_days;
+        $refresh_rate = $server->settings->metrics_refresh_rate_seconds;
+        $token = $server->settings->metrics_token;
         instant_remote_process([
-            "docker run --rm --pull always -d -e \"SCHEDULER=true\" --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/app/metrics -v /data/coolify/logs:/app/logs --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version",
+            "docker run --rm --pull always -d -e \"TOKEN={$token}\" -e \"SCHEDULER=true\" -e \"METRICS_HISTORY={$metrics_history}\" -e \"REFRESH_RATE={$refresh_rate}\" --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/app/metrics -v /data/coolify/logs:/app/logs --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version",
             'chown -R 9999:root /data/coolify/metrics /data/coolify/logs',
             'chmod -R 700 /data/coolify/metrics /data/coolify/logs',
-        ], $server, false);
+        ], $server, true);
     }
 }

app/Actions/Server/StopSentinel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopSentinel
+{
+    use AsAction;
+
+    public function handle(Server $server)
+    {
+        instant_remote_process(['docker rm -f coolify-sentinel'], $server, false);
+    }
+}

app/Console/Kernel.php

@@ -61,7 +61,7 @@ private function pull_images($schedule)
     {
         $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
-            if (config('coolify.is_sentinel_enabled')) {
+            if ($server->isSentinelEnabled()) {
                 $schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer();
             }
             $schedule->job(new PullHelperImageJob($server))->everyFiveMinutes()->onOneServer();

app/Http/Controllers/Webhook/Bitbucket.php

@@ -130,12 +130,23 @@ public function manual(Request $request)
                         $deployment_uuid = new Cuid2(7);
                         $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                         if (! $found) {
-                            ApplicationPreview::create([
+                            if ($application->build_pack === 'dockercompose') {
-                                'git_type' => 'bitbucket',
+                                $pr_app = ApplicationPreview::create([
-                                'application_id' => $application->id,
+                                    'git_type' => 'bitbucket',
-                                'pull_request_id' => $pull_request_id,
+                                    'application_id' => $application->id,
-                                'pull_request_html_url' => $pull_request_html_url,
+                                    'pull_request_id' => $pull_request_id,
-                            ]);
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                    'docker_compose_domains' => $application->docker_compose_domains,
+                                ]);
+                                $pr_app->generate_preview_fqdn_compose();
+                            } else {
+                                ApplicationPreview::create([
+                                    'git_type' => 'bitbucket',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
                         }
                         queue_application_deployment(
                             application: $application,

app/Http/Controllers/Webhook/Gitea.php

@@ -165,12 +165,24 @@ public function manual(Request $request)
                             $deployment_uuid = new Cuid2(7);
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if (! $found) {
-                                ApplicationPreview::create([
+                                if ($application->build_pack === 'dockercompose') {
-                                    'git_type' => 'gitea',
+                                    $pr_app = ApplicationPreview::create([
-                                    'application_id' => $application->id,
+                                        'git_type' => 'gitea',
-                                    'pull_request_id' => $pull_request_id,
+                                        'application_id' => $application->id,
-                                    'pull_request_html_url' => $pull_request_html_url,
+                                        'pull_request_id' => $pull_request_id,
-                                ]);
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                        'docker_compose_domains' => $application->docker_compose_domains,
+                                    ]);
+                                    $pr_app->generate_preview_fqdn_compose();
+                                } else {
+                                    ApplicationPreview::create([
+                                        'git_type' => 'gitea',
+                                        'application_id' => $application->id,
+                                        'pull_request_id' => $pull_request_id,
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                    ]);
+                                }
+
                             }
                             queue_application_deployment(
                                 application: $application,

app/Http/Controllers/Webhook/Github.php

@@ -170,12 +170,23 @@ public function manual(Request $request)
                             $deployment_uuid = new Cuid2(7);
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if (! $found) {
-                                ApplicationPreview::create([
+                                if ($application->build_pack === 'dockercompose') {
-                                    'git_type' => 'github',
+                                    $pr_app = ApplicationPreview::create([
-                                    'application_id' => $application->id,
+                                        'git_type' => 'github',
-                                    'pull_request_id' => $pull_request_id,
+                                        'application_id' => $application->id,
-                                    'pull_request_html_url' => $pull_request_html_url,
+                                        'pull_request_id' => $pull_request_id,
-                                ]);
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                        'docker_compose_domains' => $application->docker_compose_domains,
+                                    ]);
+                                    $pr_app->generate_preview_fqdn_compose();
+                                } else {
+                                    ApplicationPreview::create([
+                                        'git_type' => 'github',
+                                        'application_id' => $application->id,
+                                        'pull_request_id' => $pull_request_id,
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                    ]);
+                                }
                             }
                             queue_application_deployment(
                                 application: $application,

app/Http/Controllers/Webhook/Gitlab.php

@@ -180,12 +180,23 @@ public function manual(Request $request)
                             $deployment_uuid = new Cuid2(7);
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if (! $found) {
-                                ApplicationPreview::create([
+                                if ($application->build_pack === 'dockercompose') {
-                                    'git_type' => 'gitlab',
+                                    $pr_app = ApplicationPreview::create([
-                                    'application_id' => $application->id,
+                                        'git_type' => 'gitlab',
-                                    'pull_request_id' => $pull_request_id,
+                                        'application_id' => $application->id,
-                                    'pull_request_html_url' => $pull_request_html_url,
+                                        'pull_request_id' => $pull_request_id,
-                                ]);
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                        'docker_compose_domains' => $application->docker_compose_domains,
+                                    ]);
+                                    $pr_app->generate_preview_fqdn_compose();
+                                } else {
+                                    ApplicationPreview::create([
+                                        'git_type' => 'gitlab',
+                                        'application_id' => $application->id,
+                                        'pull_request_id' => $pull_request_id,
+                                        'pull_request_html_url' => $pull_request_html_url,
+                                    ]);
+                                }
                             }
                             queue_application_deployment(
                                 application: $application,

app/Jobs/ApplicationDeploymentJob.php

@@ -9,6 +9,7 @@
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\ApplicationPreview;
+use App\Models\EnvironmentVariable;
 use App\Models\GithubApp;
 use App\Models\GitlabApp;
 use App\Models\Server;
@@ -827,6 +828,9 @@ private function save_environment_variables()
             if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                 $envs->push("COOLIFY_BRANCH={$local_branch}");
             }
+            if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
+                $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
+            }
             foreach ($sorted_environment_variables_preview as $env) {
                 $real_value = $env->real_value;
                 if ($env->version === '4.0.0-beta.239') {
@@ -868,6 +872,9 @@ private function save_environment_variables()
             if ($this->application->environment_variables->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                 $envs->push("COOLIFY_BRANCH={$local_branch}");
             }
+            if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
+                $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
+            }
             foreach ($sorted_environment_variables as $env) {
                 $real_value = $env->real_value;
                 if ($env->version === '4.0.0-beta.239') {
@@ -877,7 +884,6 @@ private function save_environment_variables()
                         $real_value = '\''.$real_value.'\'';
                     } else {
                         $real_value = escapeEnvVariables($env->real_value);
-                        ray($real_value);
                     }
                 }
                 $envs->push($env->key.'='.$real_value);
@@ -946,9 +952,8 @@ private function save_environment_variables()
         }
     }
 
-    private function framework_based_notification()
+    private function laravel_finetunes()
     {
-        // Laravel old env variables
         if ($this->pull_request_id === 0) {
             $nixpacks_php_fallback_path = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
             $nixpacks_php_root_dir = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
@@ -956,9 +961,22 @@ private function framework_based_notification()
             $nixpacks_php_fallback_path = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
             $nixpacks_php_root_dir = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
         }
-        if ($nixpacks_php_fallback_path?->value === '/index.php' && $nixpacks_php_root_dir?->value === '/app/public' && $this->newVersionIsHealthy === false) {
+        if (! $nixpacks_php_fallback_path) {
-            $this->application_deployment_queue->addLogEntry('There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/resources/laravel', 'stderr');
+            $nixpacks_php_fallback_path = new EnvironmentVariable();
+            $nixpacks_php_fallback_path->key = 'NIXPACKS_PHP_FALLBACK_PATH';
+            $nixpacks_php_fallback_path->value = '/index.php';
+            $nixpacks_php_fallback_path->application_id = $this->application->id;
+            $nixpacks_php_fallback_path->save();
         }
+        if (! $nixpacks_php_root_dir) {
+            $nixpacks_php_root_dir = new EnvironmentVariable();
+            $nixpacks_php_root_dir->key = 'NIXPACKS_PHP_ROOT_DIR';
+            $nixpacks_php_root_dir->value = '/app/public';
+            $nixpacks_php_root_dir->application_id = $this->application->id;
+            $nixpacks_php_root_dir->save();
+        }
+
+        return [$nixpacks_php_fallback_path, $nixpacks_php_root_dir];
     }
 
     private function rolling_update()
@@ -1005,7 +1023,6 @@ private function rolling_update()
                 $this->application_deployment_queue->addLogEntry('Rolling update completed.');
             }
         }
-        $this->framework_based_notification();
     }
 
     private function health_check()
@@ -1366,17 +1383,20 @@ private function generate_nixpacks_confs()
                 throw new RuntimeException('Nixpacks failed to detect the application type. Please check the documentation of Nixpacks: https://nixpacks.com/docs/providers');
             }
         }
+
         if ($this->saved_outputs->get('nixpacks_plan')) {
             $this->nixpacks_plan = $this->saved_outputs->get('nixpacks_plan');
             if ($this->nixpacks_plan) {
                 $this->application_deployment_queue->addLogEntry("Found application type: {$this->nixpacks_type}.");
                 $this->application_deployment_queue->addLogEntry("If you need further customization, please check the documentation of Nixpacks: https://nixpacks.com/docs/providers/{$this->nixpacks_type}");
                 $parsed = Toml::Parse($this->nixpacks_plan);
+
                 // Do any modifications here
                 $this->generate_env_variables();
                 $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
                 $aptPkgs = data_get($parsed, 'phases.setup.aptPkgs', []);
                 if (count($aptPkgs) === 0) {
+                    $aptPkgs = ['curl', 'wget'];
                     data_set($parsed, 'phases.setup.aptPkgs', ['curl', 'wget']);
                 } else {
                     if (! in_array('curl', $aptPkgs)) {
@@ -1388,6 +1408,12 @@ private function generate_nixpacks_confs()
                     data_set($parsed, 'phases.setup.aptPkgs', $aptPkgs);
                 }
                 data_set($parsed, 'variables', $merged_envs->toArray());
+                $is_laravel = data_get($parsed, 'variables.IS_LARAVEL', false);
+                if ($is_laravel) {
+                    $variables = $this->laravel_finetunes();
+                    data_set($parsed, 'variables.NIXPACKS_PHP_FALLBACK_PATH', $variables[0]->value);
+                    data_set($parsed, 'variables.NIXPACKS_PHP_ROOT_DIR', $variables[1]->value);
+                }
                 $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
                 $this->application_deployment_queue->addLogEntry("Final Nixpacks plan: {$this->nixpacks_plan}", hidden: true);
             }
@@ -1841,13 +1867,25 @@ private function build_image()
                     $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /dev/null"), 'hidden' => true]);
                     if ($this->force_rebuild) {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), 'hidden' => true,
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"), 'hidden' => true,
                         ]);
+                        $build_command = "docker build --no-cache {$this->addHosts} --network host -f {$this->workdir}/.nixpacks/Dockerfile {$this->build_args} --progress plain -t {$this->build_image_name} {$this->workdir}";
                     } else {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), 'hidden' => true,
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"), 'hidden' => true,
                         ]);
+                        $build_command = "docker build {$this->addHosts} --network host -f {$this->workdir}/.nixpacks/Dockerfile {$this->build_args} --progress plain -t {$this->build_image_name} {$this->workdir}";
                     }
+
+                    $base64_build_command = base64_encode($build_command);
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"), 'hidden' => true,
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'), 'hidden' => true,
+                        ]
+                    );
                     $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm /artifacts/thegameplan.json'), 'hidden' => true]);
                 } else {
                     if ($this->force_rebuild) {
@@ -1866,7 +1904,6 @@ private function build_image()
                         ]
                     );
                 }
-
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
 LABEL coolify.deploymentId={$this->deployment_uuid}
@@ -1929,13 +1966,24 @@ private function build_image()
                     $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /dev/null"), 'hidden' => true]);
                     if ($this->force_rebuild) {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), 'hidden' => true,
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"), 'hidden' => true,
                         ]);
+                        $build_command = "docker build --no-cache {$this->addHosts} --network host -f {$this->workdir}/.nixpacks/Dockerfile {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
                     } else {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), 'hidden' => true,
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"), 'hidden' => true,
                         ]);
+                        $build_command = "docker build {$this->addHosts} --network host -f {$this->workdir}/.nixpacks/Dockerfile {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
                     }
+                    $base64_build_command = base64_encode($build_command);
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"), 'hidden' => true,
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'), 'hidden' => true,
+                        ]
+                    );
                     $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm /artifacts/thegameplan.json'), 'hidden' => true]);
                 } else {
                     if ($this->force_rebuild) {
@@ -2184,10 +2232,14 @@ public function failed(Throwable $exception): void
             ray($code);
             if ($code !== 69420) {
                 // 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one
-                $this->application_deployment_queue->addLogEntry('Deployment failed. Removing the new version of your application.', 'stderr');
+                if ($this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name)) {
-                $this->execute_remote_command(
+                    // do not remove already running container
-                    ["docker rm -f $this->container_name >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true]
+                } else {
-                );
+                    $this->application_deployment_queue->addLogEntry('Deployment failed. Removing the new version of your application.', 'stderr');
+                    $this->execute_remote_command(
+                        ["docker rm -f $this->container_name >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true]
+                    );
+                }
             }
         }
     }

app/Jobs/DockerCleanupJob.php

@@ -60,7 +60,7 @@ public function handle(): void
                 Log::info('No need to clean up '.$this->server->name);
             }
         } catch (\Throwable $e) {
-            send_internal_notification('DockerCleanupJob failed with: '.$e->getMessage());
+            // send_internal_notification('DockerCleanupJob failed with: '.$e->getMessage());
             ray($e->getMessage());
             throw $e;
         }

app/Jobs/PullSentinelImageJob.php

@@ -50,7 +50,7 @@ public function handle(): void
             }
             ray('Sentinel image is up to date');
         } catch (\Throwable $e) {
-            send_internal_notification('PullSentinelImageJob failed with: '.$e->getMessage());
+            // send_internal_notification('PullSentinelImageJob failed with: '.$e->getMessage());
             ray($e->getMessage());
             throw $e;
         }

app/Jobs/ServerStatusJob.php

@@ -46,7 +46,7 @@ public function handle()
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
                 $this->remove_unnecessary_coolify_yaml();
-                if (config('coolify.is_sentinel_enabled')) {
+                if ($this->server->isSentinelEnabled()) {
                     $this->server->checkSentinel();
                 }
             }

app/Livewire/Boarding/Index.php

@@ -12,7 +12,7 @@
 
 class Index extends Component
 {
-    protected $listeners = ['serverInstalled' => 'validateServer'];
+    protected $listeners = ['refreshBoardingIndex' => 'validateServer'];
 
     public string $currentState = 'welcome';
 

app/Livewire/Charts/ServerCpu.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Livewire\Charts;
+
+use App\Models\Server as ModelsServer;
+use Livewire\Component;
+
+class ServerCpu extends Component
+{
+    public ModelsServer $server;
+
+    public $chartId = 'server-cpu';
+
+    public $data;
+
+    public $categories;
+
+    public int $interval = 5;
+
+    public bool $poll = true;
+
+    public function render()
+    {
+        return view('livewire.charts.server-cpu');
+    }
+
+    public function pollData()
+    {
+        if ($this->poll || $this->interval <= 10) {
+            $this->loadData();
+            if ($this->interval > 10) {
+                $this->poll = false;
+            }
+        }
+    }
+
+    public function loadData()
+    {
+        try {
+            $metrics = $this->server->getCpuMetrics($this->interval);
+            $metrics = collect($metrics)->map(function ($metric) {
+                return [$metric[0], $metric[1]];
+            });
+            $this->dispatch("refreshChartData-{$this->chartId}", [
+                'seriesData' => $metrics,
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function setInterval()
+    {
+        if ($this->interval <= 10) {
+            $this->poll = true;
+        }
+        $this->loadData();
+    }
+}

app/Livewire/Charts/ServerMemory.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Livewire\Charts;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class ServerMemory extends Component
+{
+    public Server $server;
+
+    public $chartId = 'server-memory';
+
+    public $data;
+
+    public $categories;
+
+    public int $interval = 5;
+
+    public bool $poll = true;
+
+    public function render()
+    {
+        return view('livewire.charts.server-memory');
+    }
+
+    public function pollData()
+    {
+        if ($this->poll || $this->interval <= 10) {
+            $this->loadData();
+            if ($this->interval > 10) {
+                $this->poll = false;
+            }
+        }
+    }
+
+    public function loadData()
+    {
+        try {
+            $metrics = $this->server->getMemoryMetrics($this->interval);
+            $metrics = collect($metrics)->map(function ($metric) {
+                return [$metric[0], $metric[1]];
+            });
+            $this->dispatch("refreshChartData-{$this->chartId}", [
+                'seriesData' => $metrics,
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function setInterval()
+    {
+        if ($this->interval <= 10) {
+            $this->poll = true;
+        }
+        $this->loadData();
+    }
+}

app/Livewire/Project/Application/DeploymentNavbar.php

@@ -54,9 +54,9 @@ public function force_start()
 
     public function cancel()
     {
+        $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
+        $server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
         try {
-            $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
-            $server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
             $server = Server::find($server_id);
             if ($this->application_deployment_queue->logs) {
                 $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
@@ -84,6 +84,7 @@ public function cancel()
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
+            next_after_cancel($server);
         }
     }
 }

app/Livewire/Project/Application/General.php

@@ -347,7 +347,9 @@ public function set_redirect()
     public function submit($showToaster = true)
     {
         try {
-            $this->set_redirect();
+            if ($this->application->isDirty('redirect')) {
+                $this->set_redirect();
+            }
             $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
             $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
             $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {

app/Livewire/Project/Application/Previews.php

@@ -131,6 +131,12 @@ public function add(int $pull_request_id, ?string $pull_request_html_url = null)
         }
     }
 
+    public function add_and_deploy(int $pull_request_id, ?string $pull_request_html_url = null)
+    {
+        $this->add($pull_request_id, $pull_request_html_url);
+        $this->deploy($pull_request_id, $pull_request_html_url);
+    }
+
     public function deploy(int $pull_request_id, ?string $pull_request_html_url = null)
     {
         try {

app/Livewire/Project/Database/Heading.php

@@ -12,7 +12,6 @@
 use App\Actions\Database\StartRedis;
 use App\Actions\Database\StopDatabase;
 use App\Actions\Docker\GetContainersStatus;
-use App\Jobs\ContainerStatusJob;
 use Livewire\Component;
 
 class Heading extends Component

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

@@ -25,7 +25,17 @@ class General extends Component
 
     public ?string $db_url_public = null;
 
-    protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+
+        return [
+            "echo-private:user.{$userId},DatabaseStatusChanged" => 'database_stopped',
+            'refresh',
+            'save_init_script',
+            'delete_init_script',
+        ];
+    }
 
     protected $rules = [
         'database.name' => 'required',
@@ -69,6 +79,11 @@ public function mount()
         $this->server = data_get($this->database, 'destination.server');
     }
 
+    public function database_stopped()
+    {
+        $this->dispatch('success', 'Database proxy stopped. Database is no longer publicly accessible.');
+    }
+
     public function instantSaveAdvanced()
     {
         try {

app/Livewire/Project/New/PublicGitRepository.php

@@ -128,8 +128,8 @@ public function load_branch()
             ) {
                 $this->repository_url = $this->repository_url.'.git';
             }
-            if (str($this->repository_url)->contains('github.com')) {
+            if (str($this->repository_url)->contains('github.com') && str($this->repository_url)->endsWith('.git')) {
-                $this->repository_url = str($this->repository_url)->before('.git')->value();
+                $this->repository_url = str($this->repository_url)->beforeLast('.git')->value();
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -140,7 +140,6 @@ public function load_branch()
             $this->get_branch();
             $this->selected_branch = $this->git_branch;
         } catch (\Throwable $e) {
-            ray($e->getMessage());
             if (! $this->branch_found && $this->git_branch == 'main') {
                 try {
                     $this->git_branch = 'master';

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

@@ -112,7 +112,6 @@ public function saveVariables($isPreview)
             $this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete();
         } else {
             $variables = parseEnvFormatToArray($this->variables);
-            ray($variables, $this->variables);
             $this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete();
         }
         foreach ($variables as $key => $variable) {

app/Livewire/Project/Shared/Logs.php

@@ -64,7 +64,7 @@ public function loadMetrics()
         return;
         $server = data_get($this->resource, 'destination.server');
         if ($server->isFunctional()) {
-            $this->cpu = $server->getMetrics();
+            $this->cpu = $server->getCpuMetrics();
         }
     }
 

app/Livewire/Project/Shared/Metrics.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use Livewire\Component;
+
+class Metrics extends Component
+{
+    public $resource;
+
+    public $chartId = 'container-cpu';
+
+    public $data;
+
+    public $categories;
+
+    public int $interval = 5;
+
+    public bool $poll = true;
+
+    public function pollData()
+    {
+        if ($this->poll || $this->interval <= 10) {
+            $this->loadData();
+            if ($this->interval > 10) {
+                $this->poll = false;
+            }
+        }
+    }
+
+    public function loadData()
+    {
+        try {
+            $metrics = $this->resource->getMetrics($this->interval);
+            $cpuMetrics = collect($metrics)->map(function ($metric) {
+                return [$metric[0], $metric[1]];
+            });
+            $memoryMetrics = collect($metrics)->map(function ($metric) {
+                return [$metric[0], $metric[2]];
+            });
+            $this->dispatch("refreshChartData-{$this->chartId}-cpu", [
+                'seriesData' => $cpuMetrics,
+            ]);
+            $this->dispatch("refreshChartData-{$this->chartId}-memory", [
+                'seriesData' => $memoryMetrics,
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function setInterval()
+    {
+        if ($this->interval <= 10) {
+            $this->poll = true;
+        }
+        $this->loadData();
+    }
+
+    public function render()
+    {
+        return view('livewire.project.shared.metrics');
+    }
+}

app/Livewire/Server/ConfigureCloudflareTunnels.php

@@ -21,7 +21,7 @@ public function alreadyConfigured()
             $server->settings->is_cloudflare_tunnel = true;
             $server->settings->save();
             $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
-            $this->dispatch('serverInstalled');
+            $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -37,7 +37,7 @@ public function submit()
             $server->save();
             $server->settings->save();
             $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
-            $this->dispatch('serverInstalled');
+            $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Form.php

@@ -2,6 +2,9 @@
 
 namespace App\Livewire\Server;
 
+use App\Actions\Server\StartSentinel;
+use App\Actions\Server\StopSentinel;
+use App\Jobs\PullSentinelImageJob;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -36,7 +39,12 @@ class Form extends Component
         'server.settings.is_build_server' => 'required|boolean',
         'server.settings.concurrent_builds' => 'required|integer|min:1',
         'server.settings.dynamic_timeout' => 'required|integer|min:1',
+        'server.settings.is_metrics_enabled' => 'required|boolean',
+        'server.settings.metrics_token' => 'required',
+        'server.settings.metrics_refresh_rate_seconds' => 'required|integer|min:1',
+        'server.settings.metrics_history_days' => 'required|integer|min:1',
         'wildcard_domain' => 'nullable|url',
+        'server.settings.is_server_api_enabled' => 'required|boolean',
     ];
 
     protected $validationAttributes = [
@@ -52,7 +60,11 @@ class Form extends Component
         'server.settings.is_build_server' => 'Build Server',
         'server.settings.concurrent_builds' => 'Concurrent Builds',
         'server.settings.dynamic_timeout' => 'Dynamic Timeout',
-
+        'server.settings.is_metrics_enabled' => 'Metrics',
+        'server.settings.metrics_token' => 'Metrics Token',
+        'server.settings.metrics_refresh_rate_seconds' => 'Metrics Interval',
+        'server.settings.metrics_history_days' => 'Metrics History',
+        'server.settings.is_server_api_enabled' => 'Server API',
     ];
 
     public function mount()
@@ -69,18 +81,59 @@ public function serverInstalled()
 
     public function updatedServerSettingsIsBuildServer()
     {
-        $this->dispatch('serverInstalled');
+        $this->dispatch('refreshServerShow');
         $this->dispatch('serverRefresh');
         $this->dispatch('proxyStatusUpdated');
     }
 
+    public function checkPortForServerApi()
+    {
+        try {
+            if ($this->server->settings->is_server_api_enabled === true) {
+                $this->server->checkServerApi();
+                $this->dispatch('success', 'Server API is reachable.');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function instantSave()
     {
         try {
             refresh_server_connection($this->server->privateKey);
             $this->validateServer(false);
             $this->server->settings->save();
+            $this->server->save();
             $this->dispatch('success', 'Server updated.');
+            $this->dispatch('refreshServerShow');
+            if ($this->server->isSentinelEnabled()) {
+                PullSentinelImageJob::dispatchSync($this->server);
+                ray('Sentinel is enabled');
+                if ($this->server->settings->isDirty('is_metrics_enabled')) {
+                    $this->dispatch('reloadWindow');
+                }
+                if ($this->server->settings->isDirty('is_server_api_enabled') && $this->server->settings->is_server_api_enabled === true) {
+                    ray('Starting sentinel');
+
+                }
+            } else {
+                ray('Sentinel is not enabled');
+                StopSentinel::dispatch($this->server);
+            }
+            // $this->checkPortForServerApi();
+
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function restartSentinel()
+    {
+        try {
+            $version = get_latest_sentinel_version();
+            StartSentinel::run($this->server, $version, true);
+            $this->dispatch('success', 'Sentinel restarted.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Show.php

@@ -14,7 +14,7 @@ class Show extends Component
 
     public $parameters = [];
 
-    protected $listeners = ['serverInstalled' => '$refresh'];
+    protected $listeners = ['refreshServerShow' => '$refresh'];
 
     public function mount()
     {

app/Livewire/Server/ValidateAndInstall.php

@@ -143,7 +143,8 @@ public function validateDockerVersion()
         } else {
             $this->docker_version = $this->server->validateDockerEngineVersion();
             if ($this->docker_version) {
-                $this->dispatch('serverInstalled');
+                $this->dispatch('refreshServerShow');
+                $this->dispatch('refreshBoardingIndex');
                 $this->dispatch('success', 'Server validated.');
             } else {
                 $this->error = 'Docker Engine version is not 22+. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';

app/Models/Application.php

@@ -235,11 +235,6 @@ public function gitCommitLink($link): string
 
             return "{$this->source->html_url}/{$this->git_repository}/commit/{$link}";
         }
-        if (strpos($this->git_repository, 'git@') === 0) {
-            $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
-
-            return "https://{$git_repository}/commit/{$link}";
-        }
         if (str($this->git_repository)->contains('bitbucket')) {
             $git_repository = str_replace('.git', '', $this->git_repository);
             $url = Url::fromString($git_repository);
@@ -248,6 +243,11 @@ public function gitCommitLink($link): string
 
             return $url->__toString();
         }
+        if (strpos($this->git_repository, 'git@') === 0) {
+            $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
+
+            return "https://{$git_repository}/commit/{$link}";
+        }
 
         return $this->git_repository;
     }
@@ -532,7 +532,7 @@ public function isDeploymentInprogress()
 
     public function get_last_successful_deployment()
     {
-        return ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'finished')->where('pull_request_id', 0)->orderBy('created_at', 'desc')->first();
+        return ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', ApplicationDeploymentStatus::FINISHED)->where('pull_request_id', 0)->orderBy('created_at', 'desc')->first();
     }
 
     public function get_last_days_deployments()
@@ -1177,5 +1177,32 @@ public static function getDomainsByUuid(string $uuid): array
         }
 
         return [];
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
     }
 }

app/Models/Server.php

@@ -5,12 +5,11 @@
 use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyTypes;
 use App\Jobs\PullSentinelImageJob;
-use App\Notifications\Server\Revived;
-use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
@@ -462,10 +461,44 @@ public function forceDisableServer()
         Storage::disk('ssh-mux')->delete($this->muxFilename());
     }
 
+    public function isSentinelEnabled()
+    {
+        return $this->isMetricsEnabled() || $this->isServerApiEnabled();
+    }
+
+    public function isMetricsEnabled()
+    {
+        return $this->settings->is_metrics_enabled;
+    }
+
+    public function isServerApiEnabled()
+    {
+        return $this->settings->is_server_api_enabled;
+    }
+
+    public function checkServerApi()
+    {
+        if ($this->isServerApiEnabled()) {
+            $server_ip = $this->ip;
+            if (isDev()) {
+                if ($this->id === 0) {
+                    $server_ip = 'localhost';
+                }
+            }
+            $command = "curl -s http://{$server_ip}:12172/api/health";
+            $process = Process::timeout(5)->run($command);
+            if ($process->failed()) {
+                ray($process->exitCode(), $process->output(), $process->errorOutput());
+                throw new \Exception("Server API is not reachable on http://{$server_ip}:12172");
+            }
+
+        }
+    }
+
     public function checkSentinel()
     {
         ray("Checking sentinel on server: {$this->name}");
-        if ($this->is_metrics_enabled) {
+        if ($this->isSentinelEnabled()) {
             $sentinel_found = instant_remote_process(['docker inspect coolify-sentinel'], $this, false);
             $sentinel_found = json_decode($sentinel_found, true);
             $status = data_get($sentinel_found, '0.State.Status', 'exited');
@@ -478,21 +511,57 @@ public function checkSentinel()
         }
     }
 
-    public function getMetrics()
+    public function getCpuMetrics(int $mins = 5)
     {
-        if ($this->is_metrics_enabled) {
+        if ($this->isMetricsEnabled()) {
-            $from = now()->subMinutes(5)->toIso8601ZuluString();
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $cpu = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl http://localhost:8888/api/cpu/history?from=$from'"], $this, false);
+            $cpu = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->metrics_token}\" http://localhost:8888/api/cpu/history?from=$from'"], $this, false);
+            if (str($cpu)->contains('error')) {
+                $error = json_decode($cpu, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
             $cpu = str($cpu)->explode("\n")->skip(1)->all();
             $parsedCollection = collect($cpu)->flatMap(function ($item) {
                 return collect(explode("\n", trim($item)))->map(function ($line) {
-                    [$time, $value] = explode(',', trim($line));
+                    [$time, $cpu_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 0);
 
-                    return [(int) $time, (float) $value];
+                    return [(int) $time, (float) $cpu_usage_percent];
                 });
-            })->toArray();
+            });
 
-            return $parsedCollection;
+            return $parsedCollection->toArray();
+        }
+    }
+
+    public function getMemoryMetrics(int $mins = 5)
+    {
+        if ($this->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $memory = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->metrics_token}\" http://localhost:8888/api/memory/history?from=$from'"], $this, false);
+            if (str($memory)->contains('error')) {
+                $error = json_decode($memory, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $memory = str($memory)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($memory)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $used, $free, $usedPercent] = explode(',', trim($line));
+                    $usedPercent = number_format($usedPercent, 0);
+
+                    return [(int) $time, (float) $usedPercent];
+                });
+            });
+
+            return $parsedCollection->toArray();
         }
     }
 

app/Models/Service.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
+use Symfony\Component\Yaml\Yaml;
 
 class Service extends BaseModel
 {
@@ -837,6 +838,13 @@ public function saveComposeConfigs()
         $commands[] = "mkdir -p $workdir";
         $commands[] = "cd $workdir";
 
+        $json = Yaml::parse($this->docker_compose);
+        foreach ($json['services'] as $service => $config) {
+            $envs = collect($config['environment']);
+            $envs->push("COOLIFY_CONTAINER_NAME=$service-{$this->uuid}");
+            data_set($json, "services.$service.environment", $envs->toArray());
+        }
+        $this->docker_compose = Yaml::dump($json);
         $docker_compose_base64 = base64_encode($this->docker_compose);
         $commands[] = "echo $docker_compose_base64 | base64 -d | tee docker-compose.yml > /dev/null";
         $envs = $this->environment_variables()->get();

app/Models/StandaloneClickhouse.php

@@ -226,4 +226,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneDragonfly.php

@@ -226,4 +226,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneKeydb.php

@@ -226,4 +226,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneMariadb.php

@@ -226,4 +226,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneMongodb.php

@@ -246,4 +246,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneMysql.php

@@ -227,4 +227,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandalonePostgresql.php

@@ -227,4 +227,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/Models/StandaloneRedis.php

@@ -222,4 +222,33 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+
+    public function getMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = str($metrics)->explode("\n")->skip(1)->all();
+            $parsedCollection = collect($metrics)->flatMap(function ($item) {
+                return collect(explode("\n", trim($item)))->map(function ($line) {
+                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
+                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+
+                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
+                });
+            });
+
+            return $parsedCollection->toArray();
+        }
+    }
 }

app/View/Components/ApexCharts.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\View\Components;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class ApexCharts extends Component
+{
+    public string $chartId;
+
+    public $seriesData;
+
+    public $categories;
+
+    public $seriesName;
+
+    public function __construct($chartId, $seriesData, $categories, $seriesName = '')
+    {
+        $this->chartId = $chartId;
+        $this->seriesData = $seriesData;
+        $this->categories = $categories;
+        $this->seriesName = $seriesName ?? 'Series';
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.apex-charts');
+    }
+}

bootstrap/helpers/applications.php

@@ -65,7 +65,7 @@ function force_start_deployment(ApplicationDeploymentQueue $deployment)
 function queue_next_deployment(Application $application)
 {
     $server_id = $application->destination->server_id;
-    $next_found = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->get()->sortBy('created_at')->first();
+    $next_found = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', ApplicationDeploymentStatus::QUEUED)->get()->sortBy('created_at')->first();
     if ($next_found) {
         $next_found->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
@@ -79,7 +79,7 @@ function queue_next_deployment(Application $application)
 
 function next_queuable(string $server_id, string $application_id): bool
 {
-    $deployments = ApplicationDeploymentQueue::where('server_id', $server_id)->whereIn('status', ['in_progress', 'queued'])->get()->sortByDesc('created_at');
+    $deployments = ApplicationDeploymentQueue::where('server_id', $server_id)->whereIn('status', ['in_progress', ApplicationDeploymentStatus::QUEUED])->get()->sortByDesc('created_at');
     $same_application_deployments = $deployments->where('application_id', $application_id);
     $in_progress = $same_application_deployments->filter(function ($value, $key) {
         return $value->status === 'in_progress';
@@ -98,3 +98,26 @@ function next_queuable(string $server_id, string $application_id): bool
 
     return true;
 }
+function next_after_cancel(?Server $server = null)
+{
+    if ($server) {
+        $next_found = ApplicationDeploymentQueue::where('server_id', data_get($server, 'id'))->where('status', ApplicationDeploymentStatus::QUEUED)->get()->sortBy('created_at');
+        if ($next_found->count() > 0) {
+            foreach ($next_found as $next) {
+                $server = Server::find($next->server_id);
+                $concurrent_builds = $server->settings->concurrent_builds;
+                $inprogress_deployments = ApplicationDeploymentQueue::where('server_id', $next->server_id)->whereIn('status', [ApplicationDeploymentStatus::QUEUED])->get()->sortByDesc('created_at');
+                if ($inprogress_deployments->count() < $concurrent_builds) {
+                    $next->update([
+                        'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+                    ]);
+
+                    dispatch(new ApplicationDeploymentJob(
+                        application_deployment_queue_id: $next->id,
+                    ));
+                }
+                break;
+            }
+        }
+    }
+}

bootstrap/helpers/shared.php

@@ -79,6 +79,10 @@ function backup_dir(): string
 {
     return base_configuration_dir().'/backups';
 }
+function metrics_dir(): string
+{
+    return base_configuration_dir().'/metrics';
+}
 
 function generate_readme_file(string $name, string $updated_at): string
 {
@@ -158,10 +162,10 @@ function get_route_parameters(): array
 function get_latest_sentinel_version(): string
 {
     try {
-        $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
+        $response = Http::get('https://cdn.coollabs.io/sentinel/versions.json');
         $versions = $response->json();
 
-        return data_get($versions, 'coolify.sentinel.version');
+        return data_get($versions, 'sentinel.version');
     } catch (\Throwable $e) {
         //throw $e;
         ray($e->getMessage());
@@ -2282,3 +2286,10 @@ function isAnyDeploymentInprogress()
     echo "No deployments in progress.\n";
     exit(0);
 }
+
+function generateSentinelToken()
+{
+    $token = Str::random(64);
+
+    return $token;
+}

config/constants.php

@@ -22,8 +22,8 @@
     ],
     'services' => [
         // Temporary disabled until cache is implemented
-        'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
+        // 'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
-        // 'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
+        'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
     ],
     'limits' => [
         'trial_period' => 0,

config/coolify.php

@@ -14,5 +14,4 @@
     'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'),
     'is_horizon_enabled' => env('HORIZON_ENABLED', true),
     'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
-    'is_sentinel_enabled' => env('SENTINEL_ENABLED', false),
 ];

config/sentry.php

@@ -7,7 +7,7 @@
 
     // 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.297',
+    'release' => '4.0.0-beta.298',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/session.php

@@ -18,7 +18,7 @@
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'redis'),
+    'driver' => env('SESSION_DRIVER', 'database'),
 
     /*
     |--------------------------------------------------------------------------

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.297';
+return '4.0.0-beta.298';

database/migrations/2024_06_18_105948_move_server_metrics.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('is_metrics_enabled');
+        });
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->boolean('is_metrics_enabled')->default(false);
+            $table->integer('metrics_refresh_rate_seconds')->default(5);
+            $table->integer('metrics_history_days')->default(30);
+            $table->string('metrics_token')->default(generateSentinelToken());
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->boolean('is_metrics_enabled')->default(true);
+        });
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('is_metrics_enabled');
+            $table->dropColumn('metrics_refresh_rate_seconds');
+            $table->dropColumn('metrics_history_days');
+            $table->dropColumn('metrics_token');
+        });
+    }
+};

database/migrations/2024_06_20_102551_add_server_api_sentinel.php

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

lang/ar.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "تسجيل الدخول",
+    "auth.login.azure": "تسجيل الدخول باستخدام Microsoft",
+    "auth.login.bitbucket": "تسجيل الدخول باستخدام Bitbucket",
+    "auth.login.github": "تسجيل الدخول باستخدام GitHub",
+    "auth.login.gitlab": "تسجيل الدخول باستخدام Gitlab",
+    "auth.login.google": "تسجيل الدخول باستخدام Google",
+    "auth.already_registered": "هل سبق لك التسجيل؟",
+    "auth.confirm_password": "تأكيد كلمة المرور",
+    "auth.forgot_password": "نسيت كلمة المرور",
+    "auth.forgot_password_send_email": "إرسال بريد إلكتروني لإعادة تعيين كلمة المرور",
+    "auth.register_now": "تسجيل",
+    "auth.logout": "تسجيل الخروج",
+    "auth.register": "تسجيل",
+    "auth.registration_disabled": "تم تعطيل التسجيل. يرجى التواصل مع المسؤول.",
+    "auth.reset_password": "إعادة تعيين كلمة المرور",
+    "auth.failed": "هذه البيانات لا تتطابق مع سجلاتنا.",
+    "auth.failed.callback": "فشل في معالجة استدعاء من مزود تسجيل الدخول.",
+    "auth.failed.password": "كلمة المرور المقدمة غير صحيحة.",
+    "auth.failed.email": "لا يمكننا العثور على مستخدم بهذا البريد الإلكتروني.",
+    "auth.throttle": "عدد محاولات تسجيل الدخول كثيرة جدًا. يرجى المحاولة مرة أخرى في :seconds ثانية.",
+    "input.name": "الاسم",
+    "input.email": "البريد الإلكتروني",
+    "input.password": "كلمة المرور",
+    "input.password.again": "كلمة المرور مرة أخرى",
+    "input.code": "الرمز لمرة واحدة",
+    "input.recovery_code": "رمز الاسترداد",
+    "button.save": "حفظ",
+    "repository.url": "<span class='text-helper'>أمثلة</span><br>للمستودعات العامة، استخدم <span class='text-helper'>https://...</span>.<br>للمستودعات الخاصة، استخدم <span class='text-helper'>git@...</span>.<br><br>سيتم تحديد الفرع <span class='text-helper'>main</span> لـ <span class='text-helper'>https://github.com/coollabsio/coolify-examples</span><br>سيتم تحديد الفرع <span class='text-helper'>nodejs-fastify</span> لـ <span class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify</span><br>سيتم تحديد الفرع <span class='text-helper'>main</span> لـ <span class='text-helper'>https://gitea.com/sedlav/expressjs.git</span><br>سيتم تحديد الفرع <span class='text-helper'>main</span> لـ <span class='text-helper'>https://gitlab.com/andrasbacsai/nodejs-example.git</span>."
+}

lang/de.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Anmelden",
+    "auth.login.azure": "Mit Microsoft anmelden",
+    "auth.login.bitbucket": "Mit Bitbucket anmelden",
+    "auth.login.github": "Mit GitHub anmelden",
+    "auth.login.gitlab": "Mit GitLab anmelden",
+    "auth.login.google": "Mit Google anmelden",
+    "auth.already_registered": "Bereits registriert?",
+    "auth.confirm_password": "Passwort bestätigen",
+    "auth.forgot_password": "Passwort vergessen",
+    "auth.forgot_password_send_email": "Passwort zurücksetzen E-Mail senden",
+    "auth.register_now": "Registrieren",
+    "auth.logout": "Abmelden",
+    "auth.register": "Registrieren",
+    "auth.registration_disabled": "Registrierung ist deaktiviert. Bitte kontaktiere einen Administrator.",
+    "auth.reset_password": "Passwort zurücksetzen",
+    "auth.failed": "Diese Anmeldedaten wurden nicht gefunden.",
+    "auth.failed.callback": "Fehlerhafte Verarbeitung der Antwort des Anmeldeanbieters.",
+    "auth.failed.password": "Das angegebene Passwort ist inkorrekt.",
+    "auth.failed.email": "Wir können keinen Benutzer mit dieser E-Mail Adresse finden.",
+    "auth.throttle": "Zu viele Anmeldeversuche. Bitte versuche es in :seconds Sekunden erneut.",
+    "input.name": "Name",
+    "input.email": "E-Mail",
+    "input.password": "Passwort",
+    "input.password.again": "Passwort wiederholen",
+    "input.code": "Einmalcode",
+    "input.recovery_code": "Wiederherstellungscode",
+    "button.save": "Speichern",
+    "repository.url": "<span class='text-helper'>Beispiele</span><br>Für öffentliche Repositories benutze <span class='text-helper'>https://...</span>.<br>Für private Repositories benutze <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> Branch wird ausgewählt<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> Branch wird ausgewählt.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> Branch wird ausgewählt.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> Branch wird ausgewählt."
+}

lang/es.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Iniciar Sesión",
+    "auth.login.azure": "Acceder con Microsoft",
+    "auth.login.bitbucket": "Acceder con Bitbucket",
+    "auth.login.github": "Acceder con GitHub",
+    "auth.login.gitlab": "Acceder con Gitlab",
+    "auth.login.google": "Acceder con Google",
+    "auth.already_registered": "¿Ya estás registrado?",
+    "auth.confirm_password": "Confirmar contraseña",
+    "auth.forgot_password": "¿Olvidaste tu contraseña?",
+    "auth.forgot_password_send_email": "Enviar correo de recuperación de contraseña",
+    "auth.register_now": "Registrar",
+    "auth.logout": "Cerrar sesión",
+    "auth.register": "Registrar",
+    "auth.registration_disabled": "El registro está desactivado. Por favor contacta con el administrador.",
+    "auth.reset_password": "Cambiar contraseña",
+    "auth.failed": "Las credenciales no coinciden con nuestro registro..",
+    "auth.failed.callback": "Falló el proceso de inicio de sesión con el proveedor.",
+    "auth.failed.password": "La contraseña es incorrecta.",
+    "auth.failed.email": "No encontramos un usuario con ese correo.",
+    "auth.throttle": "Demasiados intentos. Por favor inténtalo en :seconds segundos.",
+    "input.name": "Nombre",
+    "input.email": "Correo",
+    "input.password": "Contraseña",
+    "input.password.again": "Escribe la contraseña otra vez",
+    "input.code": "Código de único uso",
+    "input.recovery_code": "Código de recuperación",
+    "button.save": "Guardar",
+    "repository.url": "<span class='text-helper'>Examples</span><br>Para repositorios públicos, usar <span class='text-helper'>https://...</span>.<br>Para repositorios privados, usar <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> la rama 'main' será seleccionada.<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> la rama 'nodejs-fastify' será seleccionada.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> la rama 'main' será seleccionada.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> la rama 'main' será seleccionada."
+}

lang/fr.json

@@ -0,0 +1,30 @@
+{
+  "auth.login": "Connexion",
+  "auth.login.azure": "Connexion avec Microsoft",
+  "auth.login.bitbucket": "Connexion avec Bitbucket",
+  "auth.login.github": "Connexion avec GitHub",
+  "auth.login.gitlab": "Connexion avec Gitlab",
+  "auth.login.google": "Connexion avec Google",
+  "auth.already_registered": "Déjà enregistré ?",
+  "auth.confirm_password": "Confirmer le mot de passe",
+  "auth.forgot_password": "Mot de passe oublié",
+  "auth.forgot_password_send_email": "Envoyer l'email de réinitialisation de mot de passe",
+  "auth.register_now": "S'enregistrer",
+  "auth.logout": "Déconnexion",
+  "auth.register": "S'enregistrer",
+  "auth.registration_disabled": "L'enregistrement est désactivé. Merci de contacter l'administateur.",
+  "auth.reset_password": "Réinitialiser le mot de passe",
+  "auth.failed": "Aucune correspondance n'a été trouvé pour les informations d'identification renseignées.",
+  "auth.failed.callback": "Erreur lors du processus de retour de la plateforme de connexion.",
+  "auth.failed.password": "Le mot de passe renseigné est incorrect.",
+  "auth.failed.email": "Aucun utilisateur avec cette adresse email n'a été trouvé.",
+  "auth.throttle": "Trop de tentatives de connexion. Merci de réessayer dans :seconds secondes.",
+  "input.name": "Nom",
+  "input.email": "Email",
+  "input.password": "Mot de passe",
+  "input.password.again": "Mot de passe identique",
+  "input.code": "Code à usage unique",
+  "input.recovery_code": "Code de récupération",
+  "button.save": "Sauvegarder",
+  "repository.url": "<span class='text-helper'>Exemples</span><br>Pour les dépôts publiques, utilisez <span class='text-helper'>https://...</span>.<br>Pour les dépôts privés, utilisez <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> sera la branche selectionnée<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> sera la branche selectionnée.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> sera la branche selectionnée.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> sera la branche selectionnée."
+}

lang/it.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Accedi",
+    "auth.login.azure": "Accedi con Microsoft",
+    "auth.login.bitbucket": "Accedi con Bitbucket",
+    "auth.login.github": "Accedi con GitHub",
+    "auth.login.gitlab": "Accedi con Gitlab",
+    "auth.login.google": "Accedi con Google",
+    "auth.already_registered": "Già registrato?",
+    "auth.confirm_password": "Conferma password",
+    "auth.forgot_password": "Password dimenticata",
+    "auth.forgot_password_send_email": "Invia email per reimpostare la password",
+    "auth.register_now": "Registrati",
+    "auth.logout": "Esci",
+    "auth.register": "Registrati",
+    "auth.registration_disabled": "La registrazione è disabilitata. Si prega di contattare l'amministratore.",
+    "auth.reset_password": "Reimposta password",
+    "auth.failed": "Queste credenziali non corrispondono ai nostri record.",
+    "auth.failed.callback": "Errore durante l'elaborazione del callback dal provider di accesso.",
+    "auth.failed.password": "La password fornita non è corretta.",
+    "auth.failed.email": "Non possiamo trovare un utente con questo indirizzo email.",
+    "auth.throttle": "Troppi tentativi di accesso. Per favore riprova tra :seconds secondi.",
+    "input.name": "Nome",
+    "input.email": "Email",
+    "input.password": "Password",
+    "input.password.again": "Ripeti password",
+    "input.code": "Codice monouso",
+    "input.recovery_code": "Codice di recupero",
+    "button.save": "Salva",
+    "repository.url": "<span class='text-helper'>Esempi</span><br>Per i repository pubblici, utilizza <span class='text-helper'>https://...</span>.<br>Per i repository privati, utilizza <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples verrà selezionato il branch <span class='text-helper'>main</span><br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify verrà selezionato il branch <span class='text-helper'>nodejs-fastify</span>.<br>https://gitea.com/sedlav/expressjs.git verrà selezionato il branch <span class='text-helper'>main</span>.<br>https://gitlab.com/andrasbacsai/nodejs-example.git verrà selezionato il branch <span class='text-helper'>main</span>."
+}

lang/ja.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "ログイン",
+    "auth.login.azure": "Microsoftでログイン",
+    "auth.login.bitbucket": "Bitbucketでログイン",
+    "auth.login.github": "GitHubでログイン",
+    "auth.login.gitlab": "Gitlabでログイン",
+    "auth.login.google": "Googleでログイン",
+    "auth.already_registered": "すでに登録済みですか？",
+    "auth.confirm_password": "パスワードを確認",
+    "auth.forgot_password": "パスワードを忘れた",
+    "auth.forgot_password_send_email": "パスワードリセットメールを送信",
+    "auth.register_now": "今すぐ登録",
+    "auth.logout": "ログアウト",
+    "auth.register": "登録",
+    "auth.registration_disabled": "登録は無効です。管理者に連絡してください。",
+    "auth.reset_password": "パスワードをリセット",
+    "auth.failed": "これらの資格情報は記録と一致しません。",
+    "auth.failed.callback": "ログインプロバイダーからのコールバックの処理に失敗しました。",
+    "auth.failed.password": "提供されたパスワードが正しくありません。",
+    "auth.failed.email": "そのメールアドレスのユーザーが見つかりません。",
+    "auth.throttle": "ログイン試行回数が多すぎます。:seconds秒後にもう一度お試しください。",
+    "input.name": "名前",
+    "input.email": "メール",
+    "input.password": "パスワード",
+    "input.password.again": "パスワード再入力",
+    "input.code": "ワンタイムコード",
+    "input.recovery_code": "リカバリーコード",
+    "button.save": "保存",
+    "repository.url": "<span class='text-helper'>例</span><br>公開リポジトリの場合は<span class='text-helper'>https://...</span>を使用してください。<br>プライベートリポジトリの場合は<span class='text-helper'>git@...</span>を使用してください。<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span>ブランチが選択されます<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span>ブランチが選択されます。<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span>ブランチが選択されます。<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span>ブランチが選択されます。"
+}

lang/pt.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Entrar",
+    "auth.login.azure": "Entrar com Microsoft",
+    "auth.login.bitbucket": "Entrar com Bitbucket",
+    "auth.login.github": "Entrar com GitHub",
+    "auth.login.gitlab": "Entrar com Gitlab",
+    "auth.login.google": "Entrar com Google",
+    "auth.already_registered": "Já tem uma conta?",
+    "auth.confirm_password": "Confirmar senha",
+    "auth.forgot_password": "Esqueceu a senha?",
+    "auth.forgot_password_send_email": "Enviar e-mail de redefinição de senha",
+    "auth.register_now": "Cadastrar-se",
+    "auth.logout": "Sair",
+    "auth.register": "Cadastrar",
+    "auth.registration_disabled": "Cadastro desativado. Por favor, entre em contato com o administrador.",
+    "auth.reset_password": "Redefinir senha",
+    "auth.failed": "Essas credenciais não correspondem aos nossos registros.",
+    "auth.failed.callback": "Falha ao processar o callback do provedor de login.",
+    "auth.failed.password": "A senha fornecida está incorreta.",
+    "auth.failed.email": "Não encontramos um usuário com esse endereço de e-mail.",
+    "auth.throttle": "Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.",
+    "input.name": "Nome",
+    "input.email": "E-mail",
+    "input.password": "Senha",
+    "input.password.again": "Repetir senha",
+    "input.code": "Código único",
+    "input.recovery_code": "Código de recuperação",
+    "button.save": "Salvar",
+    "repository.url": "<span class='text-helper'>Exemplos</span><br>Para repositórios públicos, use <span class='text-helper'>https://...</span>.<br>Para repositórios privados, use <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>a branch main</span> será selecionada<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>a branch nodejs-fastify</span> será selecionada.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>a branch main</span> será selecionada.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>a branch main</span> será selecionada."
+}

lang/tr.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Giriş",
+    "auth.login.azure": "Microsoft ile Giriş Yap",
+    "auth.login.bitbucket": "Bitbucket ile Giriş Yap",
+    "auth.login.github": "GitHub ile Giriş Yap",
+    "auth.login.gitlab": "GitLab ile Giriş Yap",
+    "auth.login.google": "Google ile Giriş Yap",
+    "auth.already_registered": "Zaten kayıtlı mısınız?",
+    "auth.confirm_password": "Şifreyi Onayla",
+    "auth.forgot_password": "Şifremi Unuttum",
+    "auth.forgot_password_send_email": "Şifre sıfırlama e-postası gönder",
+    "auth.register_now": "Kayıt Ol",
+    "auth.logout": "Çıkış Yap",
+    "auth.register": "Kayıt Ol",
+    "auth.registration_disabled": "Kayıt devre dışı bırakıldı. Lütfen yöneticiyle iletişime geçin.",
+    "auth.reset_password": "Şifreyi Sıfırla",
+    "auth.failed": "Bu kimlik bilgileri kayıtlarımızla eşleşmiyor.",
+    "auth.failed.callback": "Giriş sağlayıcıdan gelen istek işlenemedi.",
+    "auth.failed.password": "Sağlanan şifre yanlış.",
+    "auth.failed.email": "Bu e-posta adresiyle bir kullanıcı bulamıyoruz.",
+    "auth.throttle": "Çok fazla giriş denemesi. Lütfen :seconds saniye sonra tekrar deneyin.",
+    "input.name": "İsim",
+    "input.email": "E-posta",
+    "input.password": "Şifre",
+    "input.password.again": "Şifreyi Tekrar Girin",
+    "input.code": "Tek Kullanımlık Kod",
+    "input.recovery_code": "Kurtarma Kodu",
+    "button.save": "Kaydet",
+    "repository.url": "<span class='text-helper'>Örnekler</span><br>Halka açık depolar için <span class='text-helper'>https://...</span> kullanın.<br>Özel depolar için <span class='text-helper'>git@...</span> kullanın.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> dalı seçilecek<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> dalı seçilecek.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> dalı seçilecek.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> dalı seçilecek."
+}

lang/vi.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Đăng Nhập",
+    "auth.login.azure": "Đăng Nhập Bằng Microsoft",
+    "auth.login.bitbucket": "Đăng Nhập Bằng Bitbucket",
+    "auth.login.github": "Đăng Nhập Bằng GitHub",
+    "auth.login.gitlab": "Đăng Nhập Bằng Gitlab",
+    "auth.login.google": "Đăng Nhập Bằng Google",
+    "auth.already_registered": "Đã đăng ký?",
+    "auth.confirm_password": "Nhập lại mật khẩu",
+    "auth.forgot_password": "Quên mật khẩu",
+    "auth.forgot_password_send_email": "Gửi email đặt lại mật khẩu",
+    "auth.register_now": "Đăng ký ngay",
+    "auth.logout": "Đăng xuất",
+    "auth.register": "Đăng ký",
+    "auth.registration_disabled": "Đăng ký không khả dụng. Vui lòng liên hệ quản trị viên.",
+    "auth.reset_password": "Đặt lại mật khẩu",
+    "auth.failed": "Thông tin đăng nhập không khớp với bất kỳ tài khoản nào.",
+    "auth.failed.callback": "Xử lý thông tin từ nhà cung cấp đăng nhập thất bại.",
+    "auth.failed.password": "Mật khẩu bạn cung cấp không chính xác.",
+    "auth.failed.email": "Không có người dùng nào đã đăng ký với email đó.",
+    "auth.throttle": "Quá nhiều lần đăng nhập thất bại. Vui lòng thử lại sau :seconds giây.",
+    "input.name": "Tên",
+    "input.email": "Email",
+    "input.password": "Mật khẩu",
+    "input.password.again": "Mật khẩu lần nữa",
+    "input.code": "One-time code",
+    "input.recovery_code": "Mã khôi phục",
+    "button.save": "Lưu",
+    "repository.url": "<span class='text-helper'>Ví dụ</span><br>Với repo công khai, sử dụng <span class='text-helper'>https://...</span>.<br>Với repo riêng tư, sử dụng <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>nhánh chính</span> sẽ được chọn<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nhánh nodejs-fastify</span> sẽ được chọn.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>nhánh chính</span> sẽ được chọn.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>nhánh chính</span> sẽ được chọn."
+}

other/logos/fractal.svg

@@ -0,0 +1,40 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_2" data-name="Layer 2" viewBox="0 0 503.18 149.2">
+  <defs>
+    <style>
+      .cls-1 {
+        letter-spacing: -.03em;
+      }
+
+      .cls-1, .cls-2 {
+        fill: #fff;
+        font-family: Aileron-Black, Aileron;
+        font-size: 67.77px;
+        font-weight: 800;
+      }
+
+      .cls-2 {
+        letter-spacing: -.03em;
+      }
+
+      .cls-3 {
+        fill: #ed1c24;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1-2" data-name="Layer 1">
+    <text class="cls-2"><tspan x="93.62" y="115.07">Networks</tspan></text>
+    <text class="cls-1" transform="translate(94.99 61.31)"><tspan x="0" y="0">Fractal</tspan></text>
+    <g id="_Group_" data-name="&amp;lt;Group&amp;gt;">
+      <path class="cls-3" d="m15.81,91.71l-7.51,4.22c-3.1,1.73-5.04,4.99-5.08,8.53l-.12,8.6c-.05,3.82,4.05,6.27,7.39,4.42l7.51-4.22c3.1-1.73,5.04-4.99,5.08-8.53l.12-8.6c.05-3.82-4.05-6.27-7.39-4.42Z"/>
+      <path class="cls-3" d="m36.24,49.91l-27.53,15.41c-3.1,1.73-5.04,4.99-5.08,8.53l-.12,8.6c-.05,3.82,4.05,6.27,7.39,4.42l27.53-15.41c3.1-1.73,5.04-4.99,5.08-8.53l.12-8.6c.05-3.82-4.05-6.27-7.39-4.42Z"/>
+      <path class="cls-3" d="m56.68,8.1L9.12,34.73c-3.1,1.73-5.04,4.99-5.08,8.53l-.12,8.6c-.05,3.82,4.05,6.27,7.39,4.42l47.56-26.63c3.1-1.73,5.04-4.99,5.08-8.53l.12-8.6c.05-3.82-4.05-6.27-7.39-4.42Z"/>
+    </g>
+  </g>
+<style xmlns="" class="darkreader darkreader--fallback">html, body, body :not(iframe) {
+    background-color: #181a1b !important;
+    border-color: #776e62 !important;
+    color: #e8e6e3 !important;
+}
+div[style*="background-color: rgb(135, 135, 135)"] {
+    background-color: #878787 !important;
+}</style></svg>

other/logos/tigris.svg

@@ -0,0 +1,16 @@
+<svg width="59" height="24" viewBox="0 0 59 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1046_262)">
+<path d="M27.1504 1.51153V0.285861H30.2514V12.3573C30.2671 13.4155 30.036 14.4637 29.575 15.4181C29.1341 16.3145 28.4319 17.0568 27.5601 17.5491C26.5655 18.0894 25.4436 18.3562 24.3106 18.3216C22.7757 18.3941 21.2609 17.951 20.0096 17.0624C18.9212 16.2185 18.2113 14.9806 18.0349 13.6176H21.0868C21.2442 14.2081 21.6103 14.7227 22.1194 15.0643C22.7076 15.4371 23.3975 15.6191 24.0941 15.5856C24.4993 15.6034 24.9034 15.5409 25.284 15.4025C25.6647 15.2641 26.0141 15.052 26.3121 14.7785C26.6157 14.4492 26.8479 14.0596 26.993 13.6366C27.1381 13.2135 27.194 12.7636 27.156 12.3182V9.92158C26.8546 10.7287 26.3032 11.4174 25.5809 11.8896C24.7884 12.3964 23.8608 12.6542 22.9197 12.6274C21.9385 12.6408 20.9718 12.3819 20.1301 11.8795C19.2829 11.3571 18.6087 10.5992 18.1889 9.69944C17.7268 8.64345 17.4879 7.50484 17.4879 6.35284C17.4879 5.20084 17.7268 4.06223 18.1889 3.00623C18.6075 2.10763 19.2829 1.35079 20.1301 0.830606C20.9718 0.326047 21.9385 0.0670711 22.9197 0.082699C23.9523 0.131815 26.3266 0.131814 27.1515 1.51042L27.1504 1.51153ZM21.5411 3.79991C20.9651 4.54558 20.6526 5.45981 20.6526 6.40084C20.6526 7.34186 20.9651 8.2561 21.5411 9.00177C22.1707 9.60791 23.0135 9.94502 23.8898 9.94056C24.7649 9.93609 25.6044 9.59005 26.2273 8.97721C26.8245 8.24828 27.1515 7.33516 27.1515 6.39414C27.1515 5.45312 26.8256 4.54 26.2273 3.81107C25.9281 3.49628 25.5653 3.24735 25.1623 3.08214C24.7605 2.91693 24.3262 2.83767 23.892 2.85107C23.4544 2.83209 23.0191 2.90688 22.6128 3.07098C22.2075 3.23507 21.8414 3.484 21.5411 3.80102V3.79991Z" fill="white"/>
+<path d="M24.6813 23.9318C23.9389 23.9318 23.1988 23.8793 22.4643 23.7744C17.2692 23.022 13.2104 19.8038 12.1187 15.5765C11.8619 14.1342 11.7681 12.6686 11.8374 11.2062V5.40381H14.9484V11.2308C14.8948 12.4252 14.9562 13.6207 15.1315 14.8029C15.9062 17.8191 18.9637 20.1376 22.9086 20.708C25.936 21.1456 29.8217 20.5059 31.7183 17.4161L32.2117 16.4561C33.7667 13.297 37.1791 13.2669 39.0065 13.2479H40.1417C40.471 13.1999 40.7914 13.1006 41.0894 12.9532C41.6442 12.6831 42.112 12.2622 42.4401 11.7409C42.7683 11.2196 42.9436 10.6168 42.9458 10.0006V5.4239H46.0569V10.0006C46.0547 11.5545 45.4853 13.0548 44.455 14.2213C43.4247 15.3878 42.0037 16.1402 40.4565 16.3389H39.0344C36.5652 16.3634 35.5337 16.7329 35.0001 17.8146L34.432 18.9465C32.5108 22.1011 28.8963 23.9318 24.679 23.9318H24.6813Z" fill="white"/>
+<path d="M35.8999 1.82169V0.227643H32.7743V11.866C32.7743 11.9117 32.7855 11.9564 32.8067 11.9966C32.8279 12.0368 32.8602 12.0702 32.8993 12.0948C32.9384 12.1194 32.9819 12.1328 33.0277 12.135C33.0735 12.1372 33.1192 12.1283 33.1594 12.1071C33.9642 11.732 34.8115 11.4529 35.6833 11.2755C35.7436 11.2632 35.7983 11.2308 35.8385 11.1828C35.8775 11.1359 35.8999 11.0756 35.901 11.0142V6.58485C35.901 4.46281 37.053 3.40123 39.3581 3.40123H40.2668V0.0702489C39.309 0.0501559 36.8052 0.227645 35.901 1.82169H35.8999Z" fill="white"/>
+<path d="M13.4515 4.07001L13.13 3.36676C12.9458 2.96936 12.6232 2.65234 12.2213 2.47597L11.5103 2.17569L12.2113 1.85532C12.612 1.67336 12.9313 1.34853 13.1054 0.944434L13.4113 0.235596L13.7328 0.934386C13.9136 1.33513 14.2396 1.65327 14.6459 1.82518L15.3525 2.12992L14.6515 2.45029C14.2507 2.63225 13.9315 2.95708 13.7573 3.36118L13.4515 4.07001Z" fill="#50FFAB"/>
+<path d="M5.92662 6.04346V2.82523H8.97853V0.19751H0.0895996V2.82523H2.75081V6.02895C2.75081 9.30635 4.14281 13.1296 8.97742 13.1296V10.5856C6.50821 10.6001 5.92551 8.70132 5.92551 6.04346H5.92662Z" fill="white"/>
+<path d="M44.5019 4.07001L44.1805 3.36676C43.9963 2.96825 43.6714 2.65122 43.2673 2.47597L42.5563 2.17569L43.2618 1.85532C43.6614 1.67113 43.9795 1.34741 44.1559 0.944434L44.4618 0.235596L44.7777 0.934386C44.9585 1.33513 45.2856 1.65327 45.6908 1.82518L46.4019 2.12992L45.7008 2.45029C45.3001 2.63225 44.9808 2.95708 44.8067 3.36118L44.5008 4.07001H44.5019Z" fill="#50FFAB"/>
+<path d="M58.038 7.20003C57.5792 6.71779 57.0054 6.36059 56.3691 6.16189C55.5609 5.92077 54.736 5.73993 53.8999 5.62049C53.1375 5.5111 52.3874 5.32468 51.6629 5.06458C51.453 4.99872 51.2688 4.86812 51.1394 4.69063C51.0099 4.51314 50.9407 4.29882 50.9418 4.08002C50.9462 3.86347 51.0121 3.65249 51.1304 3.47054C51.2487 3.28858 51.4162 3.14347 51.6127 3.05193C52.2277 2.75947 52.9075 2.62551 53.5874 2.66347C54.8588 2.64561 56.1124 2.97156 57.2119 3.60784L58.3483 1.36858C57.6841 0.993514 56.9641 0.725608 56.2151 0.576026C55.3611 0.380677 54.4882 0.282445 53.613 0.281329C52.1786 0.206538 50.7576 0.581608 49.5487 1.35407C49.0798 1.66998 48.6992 2.09863 48.4402 2.59984C48.1812 3.10105 48.0528 3.65919 48.0674 4.22291C48.0071 4.99314 48.2471 5.75668 48.7394 6.35389C49.2015 6.85621 49.7898 7.22682 50.4428 7.42663C51.2767 7.67221 52.1284 7.85305 52.9913 7.96803C53.728 8.06403 54.4536 8.22924 55.1591 8.46031C55.3578 8.51835 55.5308 8.64003 55.6525 8.80635C55.7741 8.97268 55.8367 9.17472 55.8311 9.38012C55.8311 10.3122 54.947 10.7766 53.1788 10.7732C51.5725 10.809 49.9751 10.5299 48.4781 9.95165V12.4119C49.9204 12.95 51.453 13.2056 52.9913 13.1643C54.7595 13.1643 56.157 12.8116 57.184 12.1061C57.6618 11.8036 58.0536 11.385 58.3226 10.8882C58.5916 10.3915 58.7278 9.83556 58.7189 9.27184C58.7702 8.51947 58.5258 7.77603 58.038 7.20003Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1046_262">
+<rect width="58.7163" height="24" fill="white" transform="translate(0.0494385)"/>
+</clipPath>
+</defs>
+</svg>

package-lock.json

@@ -19,9 +19,9 @@
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.38",
                 "pusher-js": "8.4.0-rc2",
-                "tailwindcss": "3.4.3",
+                "tailwindcss": "3.4.4",
                 "vite": "4.5.3",
-                "vue": "3.4.27"
+                "vue": "3.4.29"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -36,9 +36,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.24.5",
+            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
-            "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
+            "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -535,51 +535,51 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz",
-            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+            "integrity": "sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.24.4",
+                "@babel/parser": "^7.24.7",
-                "@vue/shared": "3.4.27",
+                "@vue/shared": "3.4.29",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz",
-            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+            "integrity": "sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.27",
+                "@vue/compiler-core": "3.4.29",
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.29.tgz",
-            "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+            "integrity": "sha512-zygDcEtn8ZimDlrEQyLUovoWgKQic6aEQqRXce2WXBvSeHbEbcAsXyCk9oG33ZkyWH4sl9D3tkYc1idoOkdqZQ==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.24.4",
+                "@babel/parser": "^7.24.7",
-                "@vue/compiler-core": "3.4.27",
+                "@vue/compiler-core": "3.4.29",
-                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-dom": "3.4.29",
-                "@vue/compiler-ssr": "3.4.27",
+                "@vue/compiler-ssr": "3.4.29",
-                "@vue/shared": "3.4.27",
+                "@vue/shared": "3.4.29",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.10",
                 "postcss": "^8.4.38",
@@ -587,25 +587,25 @@
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.29.tgz",
-            "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+            "integrity": "sha512-rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-dom": "3.4.29",
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -617,64 +617,74 @@
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.29.tgz",
-            "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
+            "integrity": "sha512-s8fmX3YVR/Rk5ig0ic0NuzTNjK2M7iLuVSZyMmCzN/+Mjuqqif1JasCtEtmtoJWF32pAtUjyuT2ljNKNLeOmnQ==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.4.27",
+                "@vue/reactivity": "3.4.29",
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.29.tgz",
-            "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
+            "integrity": "sha512-w8+KV+mb1a8ornnGQitnMdLfE0kXmteaxLdccm2XwdFxXst4q/Z7SEboCV5SqJNpZbKFeaRBBJBhW24aJyGINg==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.29.tgz",
-            "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
+            "integrity": "sha512-gI10atCrtOLf/2MPPMM+dpz3NGulo9ZZR9d1dWo4fYvm+xkfvRrw1ZmJ7mkWtiJVXSsdmPbcK1p5dZzOCKDN0g==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.4.27",
+                "@vue/reactivity": "3.4.29",
-                "@vue/shared": "3.4.27",
+                "@vue/runtime-core": "3.4.29",
+                "@vue/shared": "3.4.29",
                 "csstype": "^3.1.3"
             }
         },
+        "node_modules/@vue/runtime-dom/node_modules/@vue/reactivity": {
+            "version": "3.4.29",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.29.tgz",
+            "integrity": "sha512-w8+KV+mb1a8ornnGQitnMdLfE0kXmteaxLdccm2XwdFxXst4q/Z7SEboCV5SqJNpZbKFeaRBBJBhW24aJyGINg==",
+            "dev": true,
+            "dependencies": {
+                "@vue/shared": "3.4.29"
+            }
+        },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.29.tgz",
-            "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
+            "integrity": "sha512-HMLCmPI2j/k8PVkSBysrA2RxcxC5DgBiCdj7n7H2QtR8bQQPqKAe8qoaxLcInzouBmzwJ+J0x20ygN/B5mYBng==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.4.27",
+                "@vue/compiler-ssr": "3.4.29",
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             },
             "peerDependencies": {
-                "vue": "3.4.27"
+                "vue": "3.4.29"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -789,11 +799,11 @@
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
+            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -1094,9 +1104,9 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
+            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -1897,9 +1907,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.3",
+            "version": "3.4.4",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
-            "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+            "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
@@ -2082,16 +2092,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.29.tgz",
-            "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
+            "integrity": "sha512-8QUYfRcYzNlYuzKPfge1UWC6nF9ym0lx7mpGVPJYNhddxEf3DD0+kU07NTL0sXuiT2HuJuKr/iEO8WvXvT0RSQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-dom": "3.4.29",
-                "@vue/compiler-sfc": "3.4.27",
+                "@vue/compiler-sfc": "3.4.29",
-                "@vue/runtime-dom": "3.4.27",
+                "@vue/runtime-dom": "3.4.29",
-                "@vue/server-renderer": "3.4.27",
+                "@vue/server-renderer": "3.4.29",
-                "@vue/shared": "3.4.27"
+                "@vue/shared": "3.4.29"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2103,9 +2113,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.4.27",
+            "version": "3.4.29",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz",
-            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -13,9 +13,9 @@
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.38",
         "pusher-js": "8.4.0-rc2",
-        "tailwindcss": "3.4.3",
+        "tailwindcss": "3.4.4",
         "vite": "4.5.3",
-        "vue": "3.4.27"
+        "vue": "3.4.29"
     },
     "dependencies": {
         "@tailwindcss/forms": "0.5.7",

resources/views/layouts/base.blade.php

@@ -38,6 +38,7 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/pusher/8.3.0/pusher.min.js"
             integrity="sha512-tXL5mrkSoP49uQf2jO0LbvzMyFgki//znmq0wYXGq94gVF6TU0QlrSbwGuPpKTeN1mIjReeqKZ4/NJPjHN1d2Q=="
             crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
     @endauth
 </head>
 @section('body')
@@ -59,6 +60,20 @@
                     document.documentElement.classList.remove('dark')
                 }
             }
+            let theme = localStorage.theme
+            let baseColor = '#FCD452'
+            let textColor = '#ffffff'
+
+            function checkTheme() {
+                theme = localStorage.theme
+                if (theme == 'dark') {
+                    baseColor = '#FCD452'
+                    textColor = '#ffffff'
+                } else {
+                    baseColor = 'black'
+                    textColor = '#000000'
+                }
+            }
             @auth
             window.Pusher = Pusher;
             window.Echo = new Echo({

resources/views/livewire/charts/server-cpu.blade.php

@@ -0,0 +1,116 @@
+<div @if ($poll) wire:poll.5000ms='pollData' @endif x-init="$wire.loadData()">
+    <h3>CPU (%)</h3>
+    <x-forms.select label="Interval" wire:change="setInterval" id="interval">
+        <option value="5">5 minutes (live)</option>
+        <option value="10">10 minutes (live)</option>
+        <option value="30">30 minutes</option>
+        <option value="60">1 hour</option>
+        <option value="720">12 hours</option>
+        <option value="10080">1 week</option>
+        <option value="43200">30 days</option>
+    </x-forms.select>
+    <div wire:ignore id="{!! $chartId !!}"></div>
+
+    <script>
+        checkTheme();
+        const optionsServerCpu = {
+            stroke: {
+                curve: 'straight',
+            },
+            chart: {
+                height: '150px',
+                id: '{!! $chartId !!}',
+                type: 'area',
+                toolbar: {
+                    show: false,
+                    tools: {
+                        download: true,
+                        selection: false,
+                        zoom: false,
+                        zoomin: false,
+                        zoomout: false,
+                        pan: false,
+                        reset: false
+                    },
+                },
+                animations: {
+                    enabled: false,
+                },
+            },
+            fill: {
+                type: 'gradient',
+            },
+            dataLabels: {
+                enabled: false,
+                offsetY: -10,
+                style: {
+                    colors: ['#FCD452'],
+                },
+                background: {
+                    enabled: false,
+                }
+            },
+            grid: {
+                show: true,
+                borderColor: '',
+            },
+            colors: [baseColor],
+            xaxis: {
+                type: 'datetime',
+            },
+            series: [{
+                data: []
+            }],
+            noData: {
+                text: 'Loading...',
+                style: {
+                    color: textColor,
+                }
+            },
+            tooltip: {
+                enabled: false,
+            },
+            legend: {
+                show: false
+            }
+        }
+        const serverCpuChart = new ApexCharts(document.getElementById(`{!! $chartId !!}`), optionsServerCpu);
+        serverCpuChart.render();
+        document.addEventListener('livewire:init', () => {
+            Livewire.on('refreshChartData-{!! $chartId !!}', (chartData) => {
+                checkTheme();
+                serverCpuChart.updateOptions({
+                    series: [{
+                        data: chartData[0].seriesData,
+                    }],
+                    colors: [baseColor],
+                    xaxis: {
+                        type: 'datetime',
+                        labels: {
+                            show: true,
+                            style: {
+                                colors: textColor,
+                            }
+                        }
+                    },
+                    yaxis: {
+                        show: true,
+                        labels: {
+                            show: true,
+                            style: {
+                                colors: textColor,
+                            }
+                        }
+                    },
+                    noData: {
+                        text: 'Loading...',
+                        style: {
+                            color: textColor,
+                        }
+                    }
+                });
+            });
+        });
+    </script>
+
+</div>

resources/views/livewire/charts/server-memory.blade.php

@@ -0,0 +1,123 @@
+<div @if ($poll) wire:poll.5000ms='pollData' @endif x-init="$wire.loadData()">
+    <h3>Memory (MB)</h3>
+    <x-forms.select label="Interval" wire:change="setInterval" id="interval">
+        <option value="5">5 minutes (live)</option>
+        <option value="10">10 minutes (live)</option>
+        <option value="30">30 minutes</option>
+        <option value="60">1 hour</option>
+        <option value="720">12 hours</option>
+        <option value="10080">1 week</option>
+        <option value="43200">30 days</option>
+    </x-forms.select>
+    <div wire:ignore id="{!! $chartId !!}"></div>
+
+    <script>
+        checkTheme();
+        const optionsServerMemory = {
+            stroke: {
+                curve: 'straight',
+            },
+            chart: {
+                height: '150px',
+                id: '{!! $chartId !!}',
+                type: 'area',
+                toolbar: {
+                    show: false,
+                    tools: {
+                        download: true,
+                        selection: false,
+                        zoom: false,
+                        zoomin: false,
+                        zoomout: false,
+                        pan: false,
+                        reset: false
+                    },
+                },
+                animations: {
+                    enabled: false,
+                },
+            },
+            fill: {
+                type: 'gradient',
+            },
+            dataLabels: {
+                enabled: false,
+                offsetY: -10,
+                style: {
+                    colors: ['#FCD452'],
+                },
+                background: {
+                    enabled: false,
+                }
+            },
+            grid: {
+                show: true,
+                borderColor: '',
+            },
+            colors: [baseColor],
+            xaxis: {
+                type: 'datetime',
+                labels: {
+                    show: true,
+                    style: {
+                        colors: textColor,
+                    }
+                }
+            },
+            series: [{
+                data: []
+            }],
+            noData: {
+                text: 'Loading...',
+                style: {
+                    color: textColor,
+                }
+            },
+            tooltip: {
+                enabled: false,
+            },
+            legend: {
+                show: false
+            }
+        }
+        const serverMemoryChart = new ApexCharts(document.getElementById(`{!! $chartId !!}`), optionsServerMemory);
+        serverMemoryChart.render();
+        document.addEventListener('livewire:init', () => {
+            Livewire.on('refreshChartData-{!! $chartId !!}', (chartData) => {
+                checkTheme();
+                serverMemoryChart.updateOptions({
+                    series: [{
+                        data: chartData[0].seriesData,
+                    }],
+                    colors: [baseColor],
+                    xaxis: {
+                        type: 'datetime',
+                        labels: {
+                            show: true,
+                            style: {
+                                colors: textColor,
+                            }
+                        }
+                    },
+                    yaxis: {
+                        min: 0,
+                        show: true,
+                        labels: {
+                            show: true,
+                            style: {
+                                colors: textColor,
+                            }
+                        }
+                    },
+                    noData: {
+                        text: 'Loading...',
+                        style: {
+                            color: textColor,
+                        }
+                    }
+                });
+            });
+        });
+    </script>
+
+</div>

resources/views/livewire/dashboard.blade.php

@@ -39,9 +39,9 @@
                                     Add Resource</span>
                             </a>
                             <a class="hover:underline"
-                            href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                                href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
-                            Settings
+                                Settings
-                        </a>
+                            </a>
                         </div>
                     </div>
                 </div>
@@ -161,7 +161,6 @@
         </div>
     @endif
 
-
     <script>
         function gotoProject(uuid, environment = 'production') {
             window.location.href = '/project/' + uuid + '/' + environment;

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

@@ -74,6 +74,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
+                @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics
+            </a>
             <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
                 @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
             </a>
@@ -126,6 +129,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'metrics'">
+                <livewire:project.shared.metrics :resource="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'tags'">
                 <livewire:project.shared.tags :resource="$application" />
             </div>

resources/views/livewire/project/application/deployment/index.blade.php

@@ -46,7 +46,7 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                         {{ $deployment->status }}
                     </div>
                     @if (data_get($deployment, 'is_webhook') || data_get($deployment, 'pull_request_id'))
-                        <div class="flex gap-1">
+                        <div class="flex items-center gap-1">
                             @if (data_get($deployment, 'is_webhook'))
                                 Webhook
                             @endif
@@ -55,12 +55,19 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                     |
                                 @endif
                                 Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                                (SHA
+                            @endif
-                                @if (data_get($deployment, 'commit'))
+                            @if (data_get($deployment, 'commit'))
-                                    {{ data_get($deployment, 'commit') }})
+                                <div class="dark:hover:text-white"
-                                @else
+                                    x-on:click.stop="goto('{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}')">
-                                    HEAD)
+                                    <div class="text-xs underline">
-                                @endif
+                                        @if ($deployment->commitMessage())
+                                            ({{ data_get_str($deployment, 'commit')->limit(7) }} -
+                                            {{ $deployment->commitMessage() }})
+                                        @else
+                                            {{ data_get_str($deployment, 'commit')->limit(7) }}
+                                        @endif
+                                    </div>
+                                </div>
                             @endif
                         </div>
                     @else
@@ -98,7 +105,7 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             Finished <span x-text="measure_since_started()">0s</span> in
                             <span class="font-bold" x-text="measure_finished_time()">0s</span>
                         @else
-                            Running for  <span class="font-bold" x-text="measure_since_started()">0s</span>
+                            Running for <span class="font-bold" x-text="measure_since_started()">0s</span>
                         @endif
 
                     </div>

resources/views/livewire/project/application/deployment/show.blade.php

@@ -89,7 +89,7 @@ class="fixed top-4 right-16" x-on:click="toggleScroll"><svg class="icon" viewBox
                     @if (decode_remote_command_output($application_deployment_queue)->count() > 0)
                         @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                             <span @class([
-                                'dark:text-warning whitespace-pre-line' => $line['hidden'],
+                                'text-coollabs dark:text-warning whitespace-pre-line' => $line['hidden'],
                                 'text-red-500 font-bold whitespace-pre-line' => $line['type'] == 'stderr',
                             ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
                                     <br><br>[COMMAND] {{ $line['command'] }}<br>[OUTPUT]

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

@@ -45,7 +45,7 @@ class="dark:text-warning">{{ $application->destination->server->name }}</span>.<
                                             Configure
                                         </x-forms.button>
                                         <x-forms.button
-                                            wire:click="deploy('{{ data_get($pull_request, 'number') }}', '{{ data_get($pull_request, 'html_url') }}')">
+                                            wire:click="add_and_deploy('{{ data_get($pull_request, 'number') }}', '{{ data_get($pull_request, 'html_url') }}')">
                                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
                                                 viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
                                                 fill="none" stroke-linecap="round" stroke-linejoin="round">

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

@@ -27,8 +27,7 @@
 
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
-                <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository" readonly
+                <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository" label="Repository" />
-                    label="Repository" />
                 <x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
             </div>
             <div class="flex items-end gap-2">

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

@@ -42,6 +42,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
+                @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics
+            </a>
             <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
                 @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
             </a>
@@ -92,6 +95,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$database" />
             </div>
+            <div x-cloak x-show="activeTab === 'metrics'">
+                <livewire:project.shared.metrics :resource="$database" />
+            </div>
             <div x-cloak x-show="activeTab === 'tags'">
                 <livewire:project.shared.tags :resource="$database" />
             </div>

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

@@ -172,7 +172,8 @@ class="w-4 h-4 dark:text-warning text-coollabs"
                     <h2>Storages</h2>
                 </div>
                 <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-                <span class="dark:text-warning">Please modify storage layout in your Docker Compose file.</span>
+                <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to
+                    your compose file (General tab).</div>
                 @foreach ($applications as $application)
                     <livewire:project.service.storage wire:key="application-{{ $application->id }}"
                         :resource="$application" />

resources/views/livewire/project/shared/environment-variable/all.blade.php

@@ -6,19 +6,21 @@
                 <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
                     <livewire:project.shared.environment-variable.add />
                 </x-modal-input>
+                <x-forms.button
+                    wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
             @endif
-            <x-forms.button
-                wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
         <div>Environment variables (secrets) for this resource.</div>
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
             <div class="w-64 pt-2">
                 <x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically"
-                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order." instantSave></x-forms.checkbox>
+                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order."
+                    instantSave></x-forms.checkbox>
             </div>
         @endif
         @if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose')
             <div class="pt-4 dark:text-warning text-coollabs">Hardcoded variables are not shown here.</div>
+            <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a variable, you must add it to your compose file (General tab).</div>
         @endif
     </div>
     @if ($view === 'normal')

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

@@ -19,7 +19,7 @@
                         @forelse (data_get($server,'containers',[]) as $container)
                             <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="data_get($container, 'Names')" />
                         @empty
-                            <div class="pt-2">No containers are not running on server: {{ $server->name }}</div>
+                            <div class="pt-2">No containers are running on server: {{ $server->name }}</div>
                         @endforelse
                     </div>
                 </div>
@@ -41,7 +41,7 @@
                     <div> No functional server found for the database.</div>
                 @endif
             @empty
-                <div class="pt-2">No containers are not running.</div>
+                <div class="pt-2">No containers are running.</div>
             @endforelse
         </div>
     @elseif ($type === 'service')
@@ -56,7 +56,7 @@
                     <div> No functional server found for the service.</div>
                 @endif
             @empty
-                <div class="pt-2">No containers are not running.</div>
+                <div class="pt-2">No containers are running.</div>
             @endforelse
         </div>
     @endif

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

@@ -0,0 +1,243 @@
+<div>
+    <div class="flex items-center gap-2 ">
+        <h2>Metrics</h2>
+    </div>
+    <div class="pb-4">Basic metrics for your container.</div>
+    @if ($resource->getMorphClass() === 'App\Models\Application' && $resource->build_pack === 'dockercompose')
+        <div class="alert alert-warning">Metrics are not available for Docker Compose applications yet!</div>
+    @else
+        @if (!str($resource->status)->contains('running'))
+            <div class="alert alert-warning">Metrics are only available when the application is running!</div>
+        @else
+            <x-forms.select label="Interval" wire:change="setInterval" id="interval">
+                <option value="5">5 minutes (live)</option>
+                <option value="10">10 minutes (live)</option>
+                <option value="30">30 minutes</option>
+                <option value="60">1 hour</option>
+                <option value="720">12 hours</option>
+                <option value="10080">1 week</option>
+                <option value="43200">30 days</option>
+            </x-forms.select>
+            <div @if ($poll) wire:poll.5000ms='pollData' @endif x-init="$wire.loadData()"
+                class="pt-5">
+                <h4>CPU (%)</h4>
+                <div wire:ignore id="{!! $chartId !!}-cpu"></div>
+
+                <script>
+                    checkTheme();
+                    const optionsServerCpu = {
+                        stroke: {
+                            curve: 'straight',
+                        },
+                        chart: {
+                            height: '150px',
+                            id: '{!! $chartId !!}-cpu',
+                            type: 'area',
+                            toolbar: {
+                                show: false,
+                                tools: {
+                                    download: true,
+                                    selection: false,
+                                    zoom: false,
+                                    zoomin: false,
+                                    zoomout: false,
+                                    pan: false,
+                                    reset: false
+                                },
+                            },
+                            animations: {
+                                enabled: false,
+                            },
+                        },
+                        fill: {
+                            type: 'gradient',
+                        },
+                        dataLabels: {
+                            enabled: false,
+                            offsetY: -10,
+                            style: {
+                                colors: ['#FCD452'],
+                            },
+                            background: {
+                                enabled: false,
+                            }
+                        },
+                        grid: {
+                            show: true,
+                            borderColor: '',
+                        },
+                        colors: [baseColor],
+                        xaxis: {
+                            type: 'datetime',
+                        },
+                        series: [{
+                            data: []
+                        }],
+                        noData: {
+                            text: 'Loading...',
+                            style: {
+                                color: textColor,
+                            }
+                        },
+                        tooltip: {
+                            enabled: false,
+                        },
+                        legend: {
+                            show: false
+                        }
+                    }
+                    const serverCpuChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-cpu`), optionsServerCpu);
+                    serverCpuChart.render();
+                    document.addEventListener('livewire:init', () => {
+                        Livewire.on('refreshChartData-{!! $chartId !!}-cpu', (chartData) => {
+                            checkTheme();
+                            serverCpuChart.updateOptions({
+                                series: [{
+                                    data: chartData[0].seriesData,
+                                }],
+                                colors: [baseColor],
+                                xaxis: {
+                                    type: 'datetime',
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                yaxis: {
+                                    show: true,
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                noData: {
+                                    text: 'Loading...',
+                                    style: {
+                                        color: textColor,
+                                    }
+                                }
+                            });
+                        });
+                    });
+                </script>
+
+                <h3>Memory (MB)</h3>
+                <div wire:ignore id="{!! $chartId !!}-memory"></div>
+
+                <script>
+                    checkTheme();
+                    const optionsServerMemory = {
+                        stroke: {
+                            curve: 'straight',
+                        },
+                        chart: {
+                            height: '150px',
+                            id: '{!! $chartId !!}-memory',
+                            type: 'area',
+                            toolbar: {
+                                show: false,
+                                tools: {
+                                    download: true,
+                                    selection: false,
+                                    zoom: false,
+                                    zoomin: false,
+                                    zoomout: false,
+                                    pan: false,
+                                    reset: false
+                                },
+                            },
+                            animations: {
+                                enabled: false,
+                            },
+                        },
+                        fill: {
+                            type: 'gradient',
+                        },
+                        dataLabels: {
+                            enabled: false,
+                            offsetY: -10,
+                            style: {
+                                colors: ['#FCD452'],
+                            },
+                            background: {
+                                enabled: false,
+                            }
+                        },
+                        grid: {
+                            show: true,
+                            borderColor: '',
+                        },
+                        colors: [baseColor],
+                        xaxis: {
+                            type: 'datetime',
+                            labels: {
+                                show: true,
+                                style: {
+                                    colors: textColor,
+                                }
+                            }
+                        },
+                        series: [{
+                            data: []
+                        }],
+                        noData: {
+                            text: 'Loading...',
+                            style: {
+                                color: textColor,
+                            }
+                        },
+                        tooltip: {
+                            enabled: false,
+                        },
+                        legend: {
+                            show: false
+                        }
+                    }
+                    const serverMemoryChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-memory`),
+                        optionsServerMemory);
+                    serverMemoryChart.render();
+                    document.addEventListener('livewire:init', () => {
+                        Livewire.on('refreshChartData-{!! $chartId !!}-memory', (chartData) => {
+                            checkTheme();
+                            serverMemoryChart.updateOptions({
+                                series: [{
+                                    data: chartData[0].seriesData,
+                                }],
+                                colors: [baseColor],
+                                xaxis: {
+                                    type: 'datetime',
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                yaxis: {
+                                    min: 0,
+                                    show: true,
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                noData: {
+                                    text: 'Loading...',
+                                    style: {
+                                        color: textColor,
+                                    }
+                                }
+                            });
+                        });
+                    });
+                </script>
+            </div>
+        @endif
+    @endif
+</div>

resources/views/livewire/project/shared/storages/show.blade.php

@@ -2,8 +2,15 @@
     <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
             @if ($isFirst)
-                <x-forms.input id="storage.name" label="Volume Name" required
+                @if (
-                    helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                    $storage->resource_type === 'App\Models\ServiceApplication' ||
+                        $storage->resource_type === 'App\Models\ServiceDatabase')
+                    <x-forms.input id="storage.name" label="Volume Name" required readonly
+                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                @else
+                    <x-forms.input id="storage.name" label="Volume Name" required
+                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                @endif
                 @if ($isService || $startedAt)
                     <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
                         label="Source Path"
@@ -19,7 +26,7 @@
                 </x-forms.button>
             @else
                 <x-forms.input id="storage.name" required readonly />
-                <x-forms.input id="storage.host_path"  readonly />
+                <x-forms.input id="storage.host_path" readonly />
                 <x-forms.input id="storage.mount_path" required readonly />
             @endif
         @else

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

@@ -144,6 +144,29 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                 <x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required
                     helper="You can define the maximum duration for a deployment to run before timing it out." />
             </div>
+            <div class="flex items-center gap-2">
+                <h3 class="py-4">Sentinel</h3>
+                @if ($server->isSentinelEnabled())
+                    <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
+                @endif
+            </div>
+            <div class="w-64">
+                <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled" label="Enable Metrics" />
+                {{-- <x-forms.checkbox instantSave id="server.settings.is_server_api_enabled" label="Enable Server API"
+                    helper="You need to open port 12172 on your firewall. This API will be used to gather data from your server, which makes Coolify a lot faster than relying on SSH connections." />
+                <x-forms.button wire:click='checkPortForServerApi'>Check Port for Server API</x-forms.button> --}}
+            </div>
+            <div class="pt-4">
+                <div class="flex flex-wrap gap-2 sm:flex-nowrap">
+                    <x-forms.input type="password" id="server.settings.metrics_token" label="Metrics token" required
+                        helper="Token for collector (Sentinel)." />
+                    <x-forms.input id="server.settings.metrics_refresh_rate_seconds" label="Metrics rate (seconds)"
+                        required
+                        helper="The interval for gathering metrics. Lower means more disk space will be used." />
+                    <x-forms.input id="server.settings.metrics_history_days" label="Metrics history (days)" required
+                        helper="How many days should the metrics data should be reserved." />
+                </div>
+            </div>
         @endif
     </form>
 </div>

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

@@ -5,4 +5,10 @@
     <x-server.navbar :server="$server" :parameters="$parameters" />
     <livewire:server.form :server="$server" />
     <livewire:server.delete :server="$server" />
+    @if ($server->isFunctional() && $server->isMetricsEnabled())
+        <div class="pt-10">
+            <livewire:charts.server-cpu :server="$server" />
+            <livewire:charts.server-memory :server="$server" />
+        </div>
+    @endif
 </div>

scripts/cloud_upgrade.sh

@@ -1,9 +1,9 @@
 set -e
 export IMAGE=$1
-docker exec coolify sh -c "php artisan tinker --execute='isAnyDeploymentInprogress()'"
 docker system prune -af
 docker compose pull
 read -p "Press Enter to update Coolify to $IMAGE..." </dev/tty
+docker exec coolify sh -c "php artisan tinker --execute='isAnyDeploymentInprogress()'"
 docker compose up --remove-orphans --force-recreate -d --wait
 echo $IMAGE > last_version
 docker compose logs -f

scripts/install.sh

@@ -27,6 +27,11 @@ if [ "$OS_TYPE" = "linuxmint" ]; then
     OS_TYPE="ubuntu"
 fi
 
+#Check if the OS is zorin, if so, change it to ubuntu
+if [ "$OS_TYPE" = "zorin" ]; then
+    OS_TYPE="ubuntu"
+fi
+
 if [ "$OS_TYPE" = "arch" ] || [ "$OS_TYPE" = "archarm" ]; then
     OS_VERSION="rolling"
 else

versions.json

@@ -1,10 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.297"
+            "version": "4.0.0-beta.298"
-        },
-        "sentinel": {
-            "version": "0.0.4"
         }
     }
 }