Merge pull request #1936 from coollabsio/next

v4.0.0-beta.250

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -21,6 +21,6 @@ body:
   - type: input
     attributes:
       label: Version
-      description: Coolify's version (see bottom left corner).
+      description: Coolify's version (see top of your screen).
     validations:
       required: true

.github/workflows/coolify-helper-next.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/coolify-helper.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/coolify-testing-host.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/docker-image.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:

.tinkerwell/snippets/DeleteUser.php

@@ -1,22 +0,0 @@
-<?php
-
-use App\Models\User;
-
-$email = 'test@example.com';
-$user = User::whereEmail($email)->first();
-$teams = $user->teams;
-foreach ($teams as $team) {
-    $servers = $team->servers;
-    if ($servers->count() > 0) {
-        foreach ($servers as $server) {
-            dump($server);
-            $server->delete();
-        }
-    }
-    dump($team);
-    $team->delete();
-}
-if ($user) {
-    dump($user);
-    $user->delete();
-}

.tinkerwell/snippets/SendEmail.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * @label Send Email
- * @description Send email to all users
- */
-
-use App\Models\User;
-use Illuminate\Support\Facades\Mail;
-
-set_transanctional_email_settings();
-
-$users = User::whereEmail('test@example.com');
-foreach ($users as $user) {
-  Mail::send([], [], function ($message) use ($user) {
-    $message
-      ->to($user->email)
-      ->subject("Testing")
-      ->text(
-        <<<EOF
-Hello,
-
-Welcome to Coolify Cloud.
-Here is your user id: $user->id
-
-EOF
-      );
-  });
-}

CONTRIBUTION.md

@@ -30,5 +30,5 @@ Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if y
 Mails are caught by Mailpit: `localhost:8025`
 
 ## New Service Contribution
-Check out the docs [here](https://coolify.io/docs/how-to-add-a-service).
+Check out the docs [here](https://coolify.io/docs/resources/services/add-service).
 

README.md

@@ -28,15 +28,16 @@ https://coolify.io/sponsorships
 
 Thank you so much!
 
-Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
+Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 
 <a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
-<a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
 
 ## Github Sponsors ($40+)
+<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://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></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://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></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://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/Niki2k1"><img src="https://github.com/Niki2k1.png" width="60px" alt="Niklas Lausch" /></a>

app/Actions/CoolifyTask/PrepareCoolifyTask.php

@@ -39,7 +39,7 @@ class PrepareCoolifyTask
 
     public function __invoke(): Activity
     {
-        $job = new CoolifyTask($this->activity, ignore_errors: $this->remoteProcessArgs->ignore_errors, call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish);
+        $job = new CoolifyTask($this->activity, ignore_errors: $this->remoteProcessArgs->ignore_errors, call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish, call_event_data: $this->remoteProcessArgs->call_event_data);
         dispatch($job);
         $this->activity->refresh();
         return $this->activity;

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -21,6 +21,8 @@ class RunRemoteProcess
 
     public $call_event_on_finish = null;
 
+    public $call_event_data = null;
+
     protected $time_start;
 
     protected $current_time;
@@ -34,7 +36,7 @@ class RunRemoteProcess
     /**
      * Create a new job instance.
      */
-    public function __construct(Activity $activity, bool $hide_from_output = false, bool $ignore_errors = false, $call_event_on_finish = null)
+    public function __construct(Activity $activity, bool $hide_from_output = false, bool $ignore_errors = false, $call_event_on_finish = null, $call_event_data = null)
     {
 
         if ($activity->getExtraProperty('type') !== ActivityTypes::INLINE->value) {
@@ -45,6 +47,7 @@ class RunRemoteProcess
         $this->hide_from_output = $hide_from_output;
         $this->ignore_errors = $ignore_errors;
         $this->call_event_on_finish = $call_event_on_finish;
+        $this->call_event_data = $call_event_data;
     }
 
     public static function decodeOutput(?Activity $activity = null): string
@@ -111,9 +114,15 @@ class RunRemoteProcess
         }
         if ($this->call_event_on_finish) {
             try {
-                event(resolve("App\\Events\\$this->call_event_on_finish", [
-                    'userId' => $this->activity->causer_id,
-                ]));
+                if ($this->call_event_data) {
+                    event(resolve("App\\Events\\$this->call_event_on_finish", [
+                        "data" => $this->call_event_data,
+                    ]));
+                } else {
+                    event(resolve("App\\Events\\$this->call_event_on_finish", [
+                        'userId' => $this->activity->causer_id,
+                    ]));
+                }
             } catch (\Throwable $e) {
                 ray($e);
             }

app/Actions/Database/StartDatabaseProxy.php

@@ -25,7 +25,8 @@ class StartDatabaseProxy
         $proxyContainerName = "{$database->uuid}-proxy";
         if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
             $databaseType = $database->databaseType();
-            $network = data_get($database, 'service.destination.network');
+            // $connectPredefined = data_get($database, 'service.connect_to_docker_network');
+            $network = $database->service->uuid;
             $server = data_get($database, 'service.destination.server');
             $proxyContainerName = "{$database->service->uuid}-proxy";
             switch ($databaseType) {
@@ -124,6 +125,7 @@ class StartDatabaseProxy
         $dockercompose_base64 = base64_encode(Yaml::dump($docker_compose, 4, 2));
         $nginxconf_base64 = base64_encode($nginxconf);
         $dockerfile_base64 = base64_encode($dockerfile);
+        instant_remote_process(["docker rm -f $proxyContainerName"], $server, false);
         instant_remote_process([
             "mkdir -p $configuration_dir",
             "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",

app/Actions/Database/StopDatabaseProxy.php

@@ -17,10 +17,12 @@ class StopDatabaseProxy
     public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
         $server = data_get($database, 'destination.server');
+        $uuid = $database->uuid;
         if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $uuid = $database->service->uuid;
             $server = data_get($database, 'service.server');
         }
-        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $server);
+        instant_remote_process(["docker rm -f {$uuid}-proxy"], $server);
         $database->is_public = false;
         $database->save();
     }

app/Actions/Proxy/CheckConfiguration.php

@@ -11,7 +11,12 @@ class CheckConfiguration
     use AsAction;
     public function handle(Server $server, bool $reset = false)
     {
-        $proxy_path = get_proxy_path();
+        $proxyType = $server->proxyType();
+        if ($proxyType === 'NONE') {
+            return 'OK';
+        }
+        $proxy_path = $server->proxyPath();
+
         $proxy_configuration = instant_remote_process([
             "mkdir -p $proxy_path",
             "cat $proxy_path/docker-compose.yml",

app/Actions/Proxy/CheckProxy.php

@@ -10,6 +10,9 @@ class CheckProxy
     use AsAction;
     public function handle(Server $server, $fromUI = false)
     {
+        if ($server->proxyType() === 'NONE') {
+            return false;
+        }
         if (!$server->isProxyShouldRun()) {
             if ($fromUI) {
                 throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
@@ -32,6 +35,9 @@ class CheckProxy
                 $server->save();
                 return false;
             }
+            if ($server->settings->is_cloudflare_tunnel) {
+                return false;
+            }
             $ip = $server->ip;
             if ($server->id === 0) {
                 $ip = 'host.docker.internal';
@@ -43,14 +49,14 @@ class CheckProxy
             $port443 = is_resource($connection443) && fclose($connection443);
             if ($port80) {
                 if ($fromUI) {
-                    throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                    throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a><br>Discord: <a target='_blank' href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
                 } else {
                     return false;
                 }
             }
             if ($port443) {
                 if ($fromUI) {
-                    throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                    throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a><br>Discord: <a target='_blank' href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
                 } else {
                     return false;
                 }

app/Actions/Proxy/SaveConfiguration.php

@@ -15,7 +15,7 @@ class SaveConfiguration
         if (is_null($proxy_settings)) {
             $proxy_settings = CheckConfiguration::run($server, true);
         }
-        $proxy_path = get_proxy_path();
+        $proxy_path = $server->proxyPath();
         $docker_compose_yml_base64 = base64_encode($proxy_settings);
 
         $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

app/Actions/Proxy/StartProxy.php

@@ -2,7 +2,7 @@
 
 namespace App\Actions\Proxy;
 
-use App\Events\ProxyStatusChanged;
+use App\Events\ProxyStarted;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -15,8 +15,11 @@ class StartProxy
     {
         try {
             $proxyType = $server->proxyType();
+            if (is_null($proxyType) || $proxyType === 'NONE') {
+                return 'OK';
+            }
             $commands = collect([]);
-            $proxy_path = get_proxy_path();
+            $proxy_path = $server->proxyPath();
             $configuration = CheckConfiguration::run($server);
             if (!$configuration) {
                 throw new \Exception("Configuration is not synced");
@@ -34,8 +37,10 @@ class StartProxy
                     "echo 'Proxy started successfully.'"
                 ]);
             } else {
+                $caddfile = "import /dynamic/*.caddy";
                 $commands = $commands->merge([
                     "mkdir -p $proxy_path/dynamic && cd $proxy_path",
+                    "echo '$caddfile' > $proxy_path/dynamic/Caddyfile",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Pulling docker image.'",
                     'docker compose pull',
@@ -49,13 +54,14 @@ class StartProxy
             }
 
             if ($async) {
-                $activity = remote_process($commands, $server);
+                $activity = remote_process($commands, $server, callEventOnFinish: 'ProxyStarted', callEventData: $server);
                 return $activity;
             } else {
                 instant_remote_process($commands, $server);
                 $server->proxy->set('status', 'running');
                 $server->proxy->set('type', $proxyType);
                 $server->save();
+                ProxyStarted::dispatch($server);
                 return 'OK';
             }
         } catch (\Throwable $e) {

app/Actions/Server/ConfigureCloudflared.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
+
+class ConfigureCloudflared
+{
+    use AsAction;
+    public function handle(Server $server, string $cloudflare_token)
+    {
+        try {
+            $config = [
+                "services" => [
+                    "coolify-cloudflared" => [
+                        "container_name" => "coolify-cloudflared",
+                        "image" => "cloudflare/cloudflared:latest",
+                        "restart" => RESTART_MODE,
+                        "network_mode" => "host",
+                        "command" => "tunnel run",
+                        "environment" => [
+                            "TUNNEL_TOKEN={$cloudflare_token}",
+                        ],
+                    ],
+                ],
+            ];
+            $config = Yaml::dump($config, 12, 2);
+            $docker_compose_yml_base64 = base64_encode($config);
+            $commands = collect([
+                "mkdir -p /tmp/cloudflared && cd /tmp/cloudflared",
+                "echo '$docker_compose_yml_base64' | base64 -d > docker-compose.yml",
+                "docker compose pull",
+                "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                "docker compose up -d --remove-orphans",
+            ]);
+            instant_remote_process($commands, $server);
+        } catch (\Throwable $e) {
+            ray($e);
+            throw $e;
+        }
+    }
+}

app/Actions/Server/InstallDocker.php

@@ -13,7 +13,7 @@ class InstallDocker
     {
         $supported_os_type = $server->validateOS();
         if (!$supported_os_type) {
-            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
         }
         ray('Installing Docker on server: ' . $server->name . ' (' . $server->ip . ')' . ' with OS type: ' . $supported_os_type);
         $dockerVersion = '24.0';

app/Actions/Server/UpdateCoolify.php

@@ -12,10 +12,12 @@ class UpdateCoolify
     public ?Server $server = null;
     public ?string $latestVersion = null;
     public ?string $currentVersion = null;
+    public bool $async = false;
 
-    public function handle(bool $force)
+    public function handle(bool $force = false, bool $async = false)
     {
         try {
+            $this->async = $async;
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
             $this->server = Server::find(0);
@@ -56,17 +58,31 @@ class UpdateCoolify
     {
         if (isDev()) {
             ray("Running update on local docker container. Updating to $this->latestVersion");
-            remote_process([
-                "sleep 10"
-            ], $this->server);
+            if ($this->async) {
+                ray('Running async update');
+                remote_process([
+                    "sleep 10"
+                ], $this->server);
+            } else {
+                instant_remote_process([
+                    "sleep 10"
+                ], $this->server);
+            }
             ray('Update done');
             return;
         } else {
             ray('Running update on production server');
-            remote_process([
-                "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
-                "bash /data/coolify/source/upgrade.sh $this->latestVersion"
-            ], $this->server);
+            if ($this->async) {
+                remote_process([
+                    "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
+                    "bash /data/coolify/source/upgrade.sh $this->latestVersion"
+                ], $this->server);
+            } else {
+                instant_remote_process([
+                    "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
+                    "bash /data/coolify/source/upgrade.sh $this->latestVersion"
+                ], $this->server);
+            }
             return;
         }
     }

app/Console/Commands/CleanupDatabase.php

@@ -12,11 +12,15 @@ class CleanupDatabase extends Command
 
     public function handle()
     {
-        echo "Running database cleanup...\n";
+        if ($this->option('yes')) {
+            echo "Running database cleanup...\n";
+        } else {
+            echo "Running database cleanup in dry-run mode...\n";
+        }
         $keep_days = 60;
-
+        echo "Keep days: $keep_days\n";
         // Cleanup failed jobs table
-        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7));
+        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(1));
         $count = $failed_jobs->count();
         echo "Delete $count entries from failed_jobs.\n";
         if ($this->option('yes')) {
@@ -32,7 +36,7 @@ class CleanupDatabase extends Command
         }
 
         // Cleanup activity_log table
-        $activity_log = DB::table('activity_log')->where('created_at', '<', now()->subDays($keep_days));
+        $activity_log = DB::table('activity_log')->where('created_at', '<', now()->subDays($keep_days))->orderBy('created_at', 'desc')->skip(10);
         $count = $activity_log->count();
         echo "Delete $count entries from activity_log.\n";
         if ($this->option('yes')) {
@@ -40,7 +44,7 @@ class CleanupDatabase extends Command
         }
 
         // Cleanup application_deployment_queues table
-        $application_deployment_queues = DB::table('application_deployment_queues')->where('created_at', '<', now()->subDays($keep_days));
+        $application_deployment_queues = DB::table('application_deployment_queues')->where('created_at', '<', now()->subDays($keep_days))->orderBy('created_at', 'desc')->skip(10);
         $count = $application_deployment_queues->count();
         echo "Delete $count entries from application_deployment_queues.\n";
         if ($this->option('yes')) {

app/Console/Commands/Horizon.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class Horizon extends Command
+{
+    protected $signature = 'start:horizon';
+    protected $description = 'Start Horizon';
+    public function handle()
+    {
+        if (config('coolify.is_horizon_enabled')) {
+            $this->info('Horizon is enabled. Starting.');
+            $this->call('horizon');
+            exit(0);
+        } else {
+            exit(0);
+        }
+    }
+}

app/Console/Commands/Init.php

@@ -34,10 +34,13 @@ class Init extends Command
             $this->cleanup_stucked_helper_containers();
             $this->call('cleanup:queue');
             $this->call('cleanup:stucked-resources');
-            try {
-                setup_dynamic_configuration();
-            } catch (\Throwable $e) {
-                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+            if (!isCloud()) {
+                try {
+                    $server = Server::find(0)->first();
+                    $server->setupDynamicProxyConfiguration();
+                } catch (\Throwable $e) {
+                    echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                }
             }
 
             $settings = InstanceSettings::get();

app/Console/Commands/Scheduler.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class Scheduler extends Command
+{
+    protected $signature = 'start:scheduler';
+    protected $description = 'Start Scheduler';
+    public function handle()
+    {
+        if (config('coolify.is_scheduler_enabled')) {
+            $this->info('Scheduler is enabled. Starting.');
+            $this->call('schedule:work');
+            exit(0);
+        } else {
+            exit(0);
+        }
+    }
+}

app/Console/Commands/ServicesGenerate.php

@@ -100,6 +100,12 @@ class ServicesGenerate extends Command
         } else {
             $tags = null;
         }
+        $port = collect(preg_grep('/^# port:/', explode("\n", $content)))->values();
+        if ($port->count() > 0) {
+            $port = str($port[0])->after('# port:')->trim()->value();
+        } else {
+            $port = null;
+        }
         $json = Yaml::parse($content);
         $yaml = base64_encode(Yaml::dump($json, 10, 2));
         $payload = [
@@ -111,6 +117,9 @@ class ServicesGenerate extends Command
             'logo' => $logo,
             'minversion' => $minversion,
         ];
+        if ($port) {
+            $payload['port'] = $port;
+        }
         if ($env_file) {
             $env_file_content = file_get_contents(base_path("templates/compose/$env_file"));
             $env_file_base64 = base64_encode($env_file_content);

app/Console/Kernel.php

@@ -47,6 +47,8 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
+
+            $schedule->command('cleanup:database --yes')->daily();
         }
     }
     private function pull_helper_image($schedule)
@@ -68,35 +70,13 @@ class Kernel extends ConsoleKernel
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
-            // $schedule
-            //     ->call(function () use ($server) {
-            //         $randomSeconds = rand(1, 40);
-            //         $job = new ContainerStatusJob($server);
-            //         $job->delay($randomSeconds);
-            //         ray('dispatching container status job in ' . $randomSeconds . ' seconds');
-            //         dispatch($job);
-            //     })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
+            $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer();
             if ($server->isLogDrainEnabled()) {
-                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
-                // $schedule
-                //     ->call(function () use ($server) {
-                //         $randomSeconds = rand(1, 40);
-                //         $job = new CheckLogDrainContainerJob($server);
-                //         $job->delay($randomSeconds);
-                //         dispatch($job);
-                //     })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer();
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
-            // $schedule
-            //     ->call(function () use ($server) {
-            //         $randomSeconds = rand(1, 40);
-            //         $job = new ServerStatusJob($server);
-            //         $job->delay($randomSeconds);
-            //         dispatch($job);
-            //     })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)

app/Data/CoolifyTaskArgs.php

@@ -21,6 +21,7 @@ class CoolifyTaskArgs extends Data
         public ?string  $status = null ,
         public bool    $ignore_errors = false,
         public $call_event_on_finish = null,
+        public $call_event_data = null
     ) {
         if(is_null($status)){
             $this->status = ProcessStatus::QUEUED->value;

app/Events/ProxyStarted.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ProxyStarted
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public function __construct(public $data)
+    {
+
+    }
+}

app/Exceptions/Handler.php

@@ -77,6 +77,9 @@ class Handler extends ExceptionHandler
                     );
                 }
             );
+            if (str($e->getMessage())->contains('No space left on device')) {
+                return;
+            }
             ray('reporting to sentry');
             Integration::captureUnhandledException($e);
         });

app/Http/Controllers/Api/Deploy.php

@@ -9,13 +9,33 @@ use App\Actions\Database\StartPostgresql;
 use App\Actions\Database\StartRedis;
 use App\Actions\Service\StartService;
 use App\Http\Controllers\Controller;
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Server;
 use App\Models\Tag;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Visus\Cuid2\Cuid2;
 
 class Deploy extends Controller
 {
+    public function deployments(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $servers = Server::whereTeamId($teamId)->get();
+        $deployments_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn("server_id", $servers->pluck("id"))->get([
+            "id",
+            "application_id",
+            "application_name",
+            "deployment_url",
+            "pull_request_id",
+            "server_name",
+            "server_id",
+            "status"
+        ])->sortBy('id')->toArray();
+        return response()->json($deployments_per_server, 200);
+    }
     public function deploy(Request $request)
     {
         $teamId = get_team_id_from_token();
@@ -24,17 +44,17 @@ class Deploy extends Controller
         $force = $request->query->get('force') ?? false;
 
         if ($uuids && $tags) {
-            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         if ($tags) {
             return $this->by_tags($tags, $teamId, $force);
         } else if ($uuids) {
             return $this->by_uuids($uuids, $teamId, $force);
         }
-        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
     }
     private function by_uuids(string $uuid, int $teamId, bool $force = false)
     {
@@ -42,20 +62,26 @@ class Deploy extends Controller
         $uuids = collect(array_filter($uuids));
 
         if (count($uuids) === 0) {
-            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
-        $message = collect([]);
+        $deployments = collect();
+        $payload = collect();
         foreach ($uuids as $uuid) {
             $resource = getResourceByUuid($uuid, $teamId);
             if ($resource) {
-                $return_message = $this->deploy_resource($resource, $force);
-                $message = $message->merge($return_message);
+                ['message' => $return_message, 'deployment_uuid' => $deployment_uuid] = $this->deploy_resource($resource, $force);
+                if ($deployment_uuid) {
+                    $deployments->push(['message' => $return_message, 'resource_uuid' => $uuid, 'deployment_uuid' => $deployment_uuid->toString()]);
+                } else {
+                    $deployments->push(['message' => $return_message, 'resource_uuid' => $uuid]);
+                }
             }
         }
-        if ($message->count() > 0) {
-            return response()->json(['message' => $message->toArray()], 200);
+        if ($deployments->count() > 0) {
+            $payload->put('deployments', $deployments->toArray());
+            return response()->json($payload->toArray(), 200);
         }
-        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 404);
     }
     public function by_tags(string $tags, int $team_id, bool $force = false)
     {
@@ -63,13 +89,15 @@ class Deploy extends Controller
         $tags = collect(array_filter($tags));
 
         if (count($tags) === 0) {
-            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
         $message = collect([]);
+        $deployments = collect();
+        $payload = collect();
         foreach ($tags as $tag) {
             $found_tag = Tag::where(['name' => $tag, 'team_id' => $team_id])->first();
             if (!$found_tag) {
-                $message->push("Tag {$tag} not found.");
+                // $message->push("Tag {$tag} not found.");
                 continue;
             }
             $applications = $found_tag->applications()->get();
@@ -79,83 +107,78 @@ class Deploy extends Controller
                 continue;
             }
             foreach ($applications as $resource) {
-                $return_message = $this->deploy_resource($resource, $force);
+                ['message' => $return_message, 'deployment_uuid' => $deployment_uuid] = $this->deploy_resource($resource, $force);
+                if ($deployment_uuid) {
+                    $deployments->push(['resource_uuid' => $resource->uuid, 'deployment_uuid' => $deployment_uuid->toString()]);
+                }
                 $message = $message->merge($return_message);
             }
             foreach ($services as $resource) {
-                $return_message = $this->deploy_resource($resource, $force);
+                ['message' => $return_message] = $this->deploy_resource($resource, $force);
                 $message = $message->merge($return_message);
             }
         }
+        ray($message);
         if ($message->count() > 0) {
-            return response()->json(['message' => $message->toArray()], 200);
+            $payload->put('message', $message->toArray());
+            if ($deployments->count() > 0) {
+                $payload->put('details', $deployments->toArray());
+            }
+            return response()->json($payload->toArray(), 200);
         }
 
-        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+        return response()->json(['error' => "No resources found with this tag.", 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 404);
     }
-    public function deploy_resource($resource, bool $force = false): Collection
+    public function deploy_resource($resource, bool $force = false): array
     {
-        $message = collect([]);
+        $message = null;
+        $deployment_uuid = null;
         if (gettype($resource) !== 'object') {
-            return $message->push("Resource ($resource) not found.");
+            return ['message' => "Resource ($resource) not found.", 'deployment_uuid' => $deployment_uuid];
         }
         $type = $resource?->getMorphClass();
         if ($type === 'App\Models\Application') {
+            $deployment_uuid = new Cuid2(7);
             queue_application_deployment(
                 application: $resource,
-                deployment_uuid: new Cuid2(7),
+                deployment_uuid: $deployment_uuid,
                 force_rebuild: $force,
             );
-            $message->push("Application {$resource->name} deployment queued.");
+            $message = "Application {$resource->name} deployment queued.";
         } else if ($type === 'App\Models\StandalonePostgresql') {
-            if (str($resource->status)->startsWith('running')) {
-                $message->push("Database {$resource->name} already running.");
-            }
             StartPostgresql::run($resource);
             $resource->update([
                 'started_at' => now(),
             ]);
-            $message->push("Database {$resource->name} started.");
+            $message = "Database {$resource->name} started.";
         } else if ($type === 'App\Models\StandaloneRedis') {
-            if (str($resource->status)->startsWith('running')) {
-                $message->push("Database {$resource->name} already running.");
-            }
             StartRedis::run($resource);
             $resource->update([
                 'started_at' => now(),
             ]);
-            $message->push("Database {$resource->name} started.");
+            $message = "Database {$resource->name} started.";
         } else if ($type === 'App\Models\StandaloneMongodb') {
-            if (str($resource->status)->startsWith('running')) {
-                $message->push("Database {$resource->name} already running.");
-            }
             StartMongodb::run($resource);
             $resource->update([
                 'started_at' => now(),
             ]);
-            $message->push("Database {$resource->name} started.");
+            $message = "Database {$resource->name} started.";
         } else if ($type === 'App\Models\StandaloneMysql') {
-            if (str($resource->status)->startsWith('running')) {
-                $message->push("Database {$resource->name} already running.");
-            }
             StartMysql::run($resource);
             $resource->update([
                 'started_at' => now(),
             ]);
-            $message->push("Database {$resource->name} started.");
+            $message = "Database {$resource->name} started.";
         } else if ($type === 'App\Models\StandaloneMariadb') {
-            if (str($resource->status)->startsWith('running')) {
-                $message->push("Database {$resource->name} already running.");
-            }
             StartMariadb::run($resource);
             $resource->update([
                 'started_at' => now(),
             ]);
-            $message->push("Database {$resource->name} started.");
+            $message = "Database {$resource->name} started.";
         } else if ($type === 'App\Models\Service') {
             StartService::run($resource);
-            $message->push("Service {$resource->name} started. It could take a while, be patient.");
+            $message = "Service {$resource->name} started. It could take a while, be patient.";
         }
-        return $message;
+        return ['message' => $message, 'deployment_uuid' => $deployment_uuid];
     }
 }

app/Http/Controllers/Api/Domains.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\InstanceSettings;
+use App\Models\Project as ModelsProject;
+use Illuminate\Http\Request;
+
+class Domains extends Controller
+{
+    public function domains(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $projects = ModelsProject::where('team_id', $teamId)->get();
+        $domains = collect();
+        $applications = $projects->pluck('applications')->flatten();
+        $settings = InstanceSettings::get();
+        if ($applications->count() > 0) {
+            foreach ($applications as $application) {
+                $ip = $application->destination->server->ip;
+                $fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) {
+                    return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
+                });
+                if ($ip === 'host.docker.internal') {
+                    if ($settings->public_ipv4) {
+                        $domains->push([
+                            'domain' => $fqdn,
+                            'ip' => $settings->public_ipv4,
+                        ]);
+                    }
+                    if ($settings->public_ipv6) {
+                        $domains->push([
+                            'domain' => $fqdn,
+                            'ip' => $settings->public_ipv6,
+                        ]);
+                    }
+                    if (!$settings->public_ipv4 && !$settings->public_ipv6) {
+                        $domains->push([
+                            'domain' => $fqdn,
+                            'ip' => $ip,
+                        ]);
+                    }
+                } else {
+                    $domains->push([
+                        'domain' => $fqdn,
+                        'ip' => $ip,
+                    ]);
+                }
+            }
+        }
+        $services = $projects->pluck('services')->flatten();
+        if ($services->count() > 0) {
+            foreach ($services as $service) {
+                $service_applications = $service->applications;
+                if ($service_applications->count() > 0) {
+                    foreach ($service_applications as $application) {
+                        $fqdn = str($application->fqdn)->explode(',')->map(function ($fqdn) {
+                            return str($fqdn)->replace('http://', '')->replace('https://', '')->replace('/', '');
+                        });
+                        if ($ip === 'host.docker.internal') {
+                            if ($settings->public_ipv4) {
+                                $domains->push([
+                                    'domain' => $fqdn,
+                                    'ip' => $settings->public_ipv4,
+                                ]);
+                            }
+                            if ($settings->public_ipv6) {
+                                $domains->push([
+                                    'domain' => $fqdn,
+                                    'ip' => $settings->public_ipv6,
+                                ]);
+                            }
+                            if (!$settings->public_ipv4 && !$settings->public_ipv6) {
+                                $domains->push([
+                                    'domain' => $fqdn,
+                                    'ip' => $ip,
+                                ]);
+                            }
+                        } else {
+                            $domains->push([
+                                'domain' => $fqdn,
+                                'ip' => $ip,
+                            ]);
+                        }
+                    }
+                }
+            }
+        }
+        $domains = $domains->groupBy('ip')->map(function ($domain) {
+            return $domain->pluck('domain')->flatten();
+        })->map(function ($domain, $ip) {
+            return [
+                'ip' => $ip,
+                'domains' => $domain,
+            ];
+        })->values();
+
+        return response()->json($domains);
+    }
+}

app/Http/Controllers/Api/Project.php

@@ -12,7 +12,7 @@ class Project extends Controller
     {
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         $projects = ModelsProject::whereTeamId($teamId)->select('id', 'name', 'uuid')->get();
         return response()->json($projects);
@@ -21,7 +21,7 @@ class Project extends Controller
     {
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first()->load(['environments']);
         return response()->json($project);
@@ -30,7 +30,7 @@ class Project extends Controller
     {
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
         $environment = $project->environments()->whereName(request()->environment_name)->first()->load(['applications', 'postgresqls', 'redis', 'mongodbs', 'mysqls', 'mariadbs', 'services']);

app/Http/Controllers/Api/Resources.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Project;
+use Illuminate\Http\Request;
+
+class Resources extends Controller
+{
+    public function resources(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $projects = Project::where('team_id', $teamId)->get();
+        $resources = collect();
+        $resources->push($projects->pluck('applications')->flatten());
+        $resources->push($projects->pluck('services')->flatten());
+        foreach (collect(DATABASE_TYPES) as $db) {
+            $resources->push($projects->pluck(str($db)->plural(2))->flatten());
+        }
+        $resources = $resources->flatten();
+        $resources = $resources->map(function ($resource) {
+            $payload = $resource->toArray();
+            if ($resource->getMorphClass() === 'App\Models\Service') {
+                $payload['status'] = $resource->status();
+            } else {
+                $payload['status'] = $resource->status;
+            }
+            $payload['type'] = $resource->type();
+            return $payload;
+        });
+        return response()->json($resources);
+    }
+
+}

app/Http/Controllers/Api/Server.php

@@ -12,43 +12,46 @@ class Server extends Controller
     {
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         $servers = ModelsServer::whereTeamId($teamId)->select('id', 'name', 'uuid', 'ip', 'user', 'port')->get()->load(['settings'])->map(function ($server) {
             $server['is_reachable'] = $server->settings->is_reachable;
             $server['is_usable'] = $server->settings->is_usable;
             return $server;
         });
-        ray($servers);
         return response()->json($servers);
     }
     public function server_by_uuid(Request $request)
     {
+        $with_resources = $request->query('resources');
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+            return invalid_token();
         }
         $server = ModelsServer::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
         if (is_null($server)) {
             return response()->json(['error' => 'Server not found.'], 404);
         }
-        $server->load(['settings']);
-        $server['resources'] = $server->definedResources()->map(function ($resource) {
-            $payload = [
-                'id' => $resource->id,
-                'uuid' => $resource->uuid,
-                'name' => $resource->name,
-                'type' => $resource->type(),
-                'created_at' => $resource->created_at,
-                'updated_at' => $resource->updated_at,
-            ];
-            if ($resource->type() === 'service') {
-                $payload['status'] = $resource->status();
-            } else {
-                $payload['status'] = $resource->status;
-            }
-            return $payload;
-        });
+        if ($with_resources) {
+            $server['resources'] = $server->definedResources()->map(function ($resource) {
+                $payload = [
+                    'id' => $resource->id,
+                    'uuid' => $resource->uuid,
+                    'name' => $resource->name,
+                    'type' => $resource->type(),
+                    'created_at' => $resource->created_at,
+                    'updated_at' => $resource->updated_at,
+                ];
+                if ($resource->type() === 'service') {
+                    $payload['status'] = $resource->status();
+                } else {
+                    $payload['status'] = $resource->status;
+                }
+                return $payload;
+            });
+        } else {
+            $server->load(['settings']);
+        }
         return response()->json($server);
     }
 }

app/Http/Controllers/Api/Team.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class Team extends Controller
+{
+    public function teams(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $teams = auth()->user()->teams;
+        return response()->json($teams);
+    }
+    public function team_by_id(Request $request)
+    {
+        $id = $request->id;
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $teams = auth()->user()->teams;
+        $team = $teams->where('id', $id)->first();
+        if (is_null($team)) {
+            return response()->json(['error' => 'Team not found.',  "docs" => "https://coolify.io/docs/api-reference/get-team-by-teamid"], 404);
+        }
+        return response()->json($team);
+    }
+    public function members_by_id(Request $request)
+    {
+        $id = $request->id;
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $teams = auth()->user()->teams;
+        $team = $teams->where('id', $id)->first();
+        if (is_null($team)) {
+            return response()->json(['error' => 'Team not found.', "docs" => "https://coolify.io/docs/api-reference/get-team-by-teamid-members"], 404);
+        }
+        return response()->json($team->members);
+    }
+    public function current_team(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $team = auth()->user()->currentTeam();
+        return response()->json($team);
+    }
+    public function current_team_members(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return invalid_token();
+        }
+        $team = auth()->user()->currentTeam();
+        return response()->json($team->members);
+    }
+}

app/Http/Controllers/OauthController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+
+use Illuminate\Support\Facades\Auth;
+
+class OauthController extends Controller {
+    public function redirect(string $provider)
+    {
+        $socialite_provider = get_socialite_provider($provider);
+        return $socialite_provider->redirect();
+    }
+
+    public function callback(string $provider)
+    {
+        try {
+            $oauthUser = get_socialite_provider($provider)->user();
+            $user = User::whereEmail($oauthUser->email)->first();
+            if (!$user) {
+                $user = User::create([
+                    'name' => $oauthUser->name,
+                    'email' => $oauthUser->email,
+                ]);
+            }
+            Auth::login($user);
+            return redirect('/');
+        } catch (\Exception $e) {
+            ray($e->getMessage());
+            return redirect()->route('login')->withErrors([__('auth.failed.callback')]);
+        }
+    }
+}

app/Http/Controllers/Webhook/Github.php

@@ -22,7 +22,6 @@ class Github extends Controller
     public function manual(Request $request)
     {
         try {
-            ray($request);
             $return_payloads = collect([]);
             $x_github_delivery = request()->header('X-GitHub-Delivery');
             if (app()->isDownForMaintenance()) {
@@ -68,6 +67,10 @@ class Github extends Controller
                 if (Str::isMatch('/refs\/heads\/*/', $branch)) {
                     $branch = Str::after($branch, 'refs/heads/');
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Manual Webhook GitHub Push Event with branch: ' . $branch);
             }
             if ($x_github_event === 'pull_request') {
@@ -118,24 +121,41 @@ class Github extends Controller
                 }
                 if ($x_github_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                        $deployment_uuid = new Cuid2(7);
-                        queue_application_deployment(
-                            application: $application,
-                            deployment_uuid: $deployment_uuid,
-                            force_rebuild: false,
-                            is_webhook: true,
-                        );
-                        $return_payloads->push([
-                            'application' => $application->name,
-                            'status' => 'success',
-                            'message' => 'Deployment queued.',
-                        ]);
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                            $deployment_uuid = new Cuid2(7);
+                            queue_application_deployment(
+                                application: $application,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                            );
+                            $return_payloads->push([
+                                'status' => 'success',
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                     }
                 }
@@ -266,6 +286,10 @@ class Github extends Controller
                 if (Str::isMatch('/refs\/heads\/*/', $branch)) {
                     $branch = Str::after($branch, 'refs/heads/');
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Webhook GitHub Push Event: ' . $id . ' with branch: ' . $branch);
             }
             if ($x_github_event === 'pull_request') {
@@ -298,32 +322,50 @@ class Github extends Controller
                 $isFunctional = $application->destination->server->isFunctional();
                 if (!$isFunctional) {
                     $return_payloads->push([
-                        'application' => $application->name,
                         'status' => 'failed',
                         'message' => 'Server is not functional.',
+                        'application_uuid' => $application->uuid,
+                        'application_name' => $application->name,
                     ]);
                     continue;
                 }
                 if ($x_github_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                        $deployment_uuid = new Cuid2(7);
-                        queue_application_deployment(
-                            application: $application,
-                            deployment_uuid: $deployment_uuid,
-                            force_rebuild: false,
-                            is_webhook: true
-                        );
-                        $return_payloads->push([
-                            'application' => $application->name,
-                            'status' => 'success',
-                            'message' => 'Deployment queued.',
-                        ]);
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                            $deployment_uuid = new Cuid2(7);
+                            queue_application_deployment(
+                                application: $application,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                            );
+                            $return_payloads->push([
+                                'status' => 'success',
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                     }
                 }

app/Http/Controllers/Webhook/Gitlab.php

@@ -51,6 +51,10 @@ class Gitlab extends Controller
                     ]);
                     return response($return_payloads);
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Manual Webhook GitLab Push Event with branch: ' . $branch);
             }
             if ($x_gitlab_event === 'merge_request') {
@@ -113,19 +117,41 @@ class Gitlab extends Controller
                 }
                 if ($x_gitlab_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                        $deployment_uuid = new Cuid2(7);
-                        queue_application_deployment(
-                            application: $application,
-                            deployment_uuid: $deployment_uuid,
-                            force_rebuild: false,
-                            is_webhook: true
-                        );
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                            $deployment_uuid = new Cuid2(7);
+                            queue_application_deployment(
+                                application: $application,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                            );
+                            $return_payloads->push([
+                                'status' => 'success',
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                         ray('Deployments disabled for ' . $application->name);
                     }

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -12,12 +12,16 @@ class DecideWhatToDoWithUser
 {
     public function handle(Request $request, Closure $next): Response
     {
+        if (auth()?->user()?->teams?->count() === 0) {
+            $currentTeam = auth()->user()?->recreate_personal_team();
+            refreshSession($currentTeam);
+        }
         if(auth()?->user()?->currentTeam()){
             refreshSession(auth()->user()->currentTeam());
         }
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
             if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
-                return redirect()->route('boarding');
+                return redirect()->route('onboarding');
             }
             return $next($request);
         }
@@ -39,7 +43,7 @@ class DecideWhatToDoWithUser
             if (Str::startsWith($request->path(), 'invitations')) {
                 return $next($request);
             }
-            return redirect()->route('boarding');
+            return redirect()->route('onboarding');
         }
         if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
             return redirect(RouteServiceProvider::HOME);

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -13,5 +13,6 @@ class PreventRequestsDuringMaintenance extends Middleware
      */
     protected $except = [
         'webhooks/*',
+        '/api/health'
     ];
 }

app/Jobs/ApplicationDeploymentJob.php

@@ -24,6 +24,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 use RuntimeException;
 use Spatie\Url\Url;
@@ -92,6 +93,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $buildTarget = null;
     private Collection $saved_outputs;
     private ?string $full_healthcheck_url = null;
+    private bool $custom_healthcheck_found = false;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
@@ -232,13 +234,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->build_server = $this->server;
                 $this->original_server = $this->server;
             }
-            if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
+            if ($this->restart_only && $this->application->build_pack !== 'dockerimage' && $this->application->build_pack !== 'dockerfile') {
                 $this->just_restart();
                 if ($this->server->isProxyShouldRun()) {
                     dispatch(new ContainerStatusJob($this->server));
                 }
                 $this->next(ApplicationDeploymentStatus::FINISHED->value);
                 $this->application->isConfigurationChanged(false);
+                $this->run_post_deployment_command();
                 return;
             } else if ($this->pull_request_id !== 0) {
                 $this->deploy_pull_request();
@@ -273,6 +276,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::FINISHED);
                 }
             }
+            $this->run_post_deployment_command();
             $this->application->isConfigurationChanged(true);
         } catch (Exception $e) {
             if ($this->pull_request_id !== 0 && $this->application->is_github_based()) {
@@ -294,13 +298,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     "ignore_errors" => true,
                 ]
             );
-            $this->execute_remote_command(
-                [
-                    "docker image prune -f >/dev/null 2>&1",
-                    "hidden" => true,
-                    "ignore_errors" => true,
-                ]
-            );
+
+
+            // $this->execute_remote_command(
+            //     [
+            //         "docker image prune -f >/dev/null 2>&1",
+            //         "hidden" => true,
+            //         "ignore_errors" => true,
+            //     ]
+            // );
+
+
             ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
@@ -318,17 +326,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ],
         );
         $this->generate_image_names();
-        if (!$this->force_rebuild) {
-            $this->check_image_locally_or_remotely();
-            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
-                $this->create_workdir();
-                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
-                $this->generate_compose_file();
-                $this->push_to_docker_registry();
-                $this->rolling_update();
-                return;
-            }
-        }
+
+        // Always rebuild dockerfile based container.
+        // if (!$this->force_rebuild) {
+        //     $this->check_image_locally_or_remotely();
+        //     if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+        //         $this->create_workdir();
+        //         $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+        //         $this->generate_compose_file();
+        //         $this->push_to_docker_registry();
+        //         $this->rolling_update();
+        //         return;
+        //     }
+        // }
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
@@ -374,6 +384,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->cleanup_git();
         $this->application->loadComposeFile(isInit: false);
         if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $this->application->parseRawCompose();
             $yaml = $composeFile = $this->application->docker_compose_raw;
         } else {
             $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
@@ -412,17 +423,36 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
             ]);
         }
-        $this->write_deployment_configurations();
+
         // Start compose file
-        if ($this->docker_compose_custom_start_command) {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
-            );
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            if ($this->docker_compose_custom_start_command) {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "cd {$this->workdir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
+                );
+                $this->write_deployment_configurations();
+            } else {
+                $this->write_deployment_configurations();
+                $server_workdir = $this->application->workdir();
+                ray("SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d");
+                $this->execute_remote_command(
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d", "hidden" => true],
+                );
+            }
         } else {
-            $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
-            );
+            if ($this->docker_compose_custom_start_command) {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
+                );
+                $this->write_deployment_configurations();
+            } else {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                );
+                $this->write_deployment_configurations();
+            }
         }
+
         $this->application_deployment_queue->addLogEntry("New container started.");
     }
     private function deploy_dockerfile_buildpack()
@@ -438,6 +468,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->check_git_if_build_needed();
         $this->set_base_dir();
         $this->generate_image_names();
+        $this->clone_repository();
         if (!$this->force_rebuild) {
             $this->check_image_locally_or_remotely();
             if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
@@ -449,7 +480,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 return;
             }
         }
-        $this->clone_repository();
         $this->cleanup_git();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
@@ -709,7 +739,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $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) {
-            $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/frameworks/laravel#requirements", 'stderr');
+            $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');
         }
     }
     private function rolling_update()
@@ -727,7 +757,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->write_deployment_configurations();
                 $this->server = $this->original_server;
             }
-            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->application->pull_request_id !== 0) {
+            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
                 $this->application_deployment_queue->addLogEntry("----------------------------------------");
                 if (count($this->application->ports_mappings_array) > 0) {
                     $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
@@ -735,10 +765,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
                     $this->application_deployment_queue->addLogEntry("Consistent container name feature enabled, rolling update is not supported.");
                 }
-                if ($this->application->pull_request_id !== 0) {
+                if ($this->pull_request_id !== 0) {
                     $this->application->settings->is_consistent_container_name_enabled = true;
                     $this->application_deployment_queue->addLogEntry("Pull request deployment, rolling update is not supported.");
                 }
+                if (str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
+                    $this->application_deployment_queue->addLogEntry("Custom IP address is set, rolling update is not supported.");
+                }
                 $this->stop_running_container(force: true);
                 $this->start_by_compose_file();
             } else {
@@ -757,7 +790,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->server->isSwarm()) {
             // Implement healthcheck for swarm
         } else {
-            if ($this->application->isHealthcheckDisabled()) {
+            if ($this->application->isHealthcheckDisabled() && $this->custom_healthcheck_found === false) {
                 $this->newVersionIsHealthy = true;
                 return;
             }
@@ -790,13 +823,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         break;
                     }
                     $counter++;
-                    sleep($this->application->health_check_interval);
+                    Sleep::for($this->application->health_check_interval)->seconds();
                 }
             }
         }
     }
     private function deploy_pull_request()
     {
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->deploy_docker_compose_buildpack();
+            return;
+        }
         if ($this->use_build_server) {
             $this->server = $this->build_server;
         }
@@ -855,14 +892,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [
                 "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
             ],
-
         );
+        $this->run_pre_deployment_command();
     }
     private function deploy_to_additional_destinations()
     {
         if ($this->application->additional_networks->count() === 0) {
             return;
         }
+        if ($this->pull_request_id !== 0) {
+            return;
+        }
         $destination_ids = $this->application->additional_networks->pluck('id');
         if ($this->server->isSwarm()) {
             $this->application_deployment_queue->addLogEntry("Additional destinations are not supported in swarm mode.");
@@ -1059,7 +1099,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_compose_file()
     {
         $ports = $this->application->settings->is_static ? [80] : $this->application->ports_exposes_array;
-
+        $onlyPort = null;
+        if (count($ports) > 0) {
+            $onlyPort = $ports[0];
+        }
         $persistent_storages = $this->generate_local_persistent_volumes();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables($ports);
@@ -1070,6 +1113,25 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $labels = $labels->filter(function ($value, $key) {
                 return !Str::startsWith($value, 'coolify.');
             });
+            $found_caddy_labels = $labels->filter(function ($value, $key) {
+                return Str::startsWith($value, 'caddy_');
+            });
+            if ($found_caddy_labels->count() === 0) {
+                if ($this->pull_request_id !== 0) {
+                    $domains = str(data_get($this->preview, 'fqdn'))->explode(',');
+                } else {
+                    $domains = str(data_get($this->application, 'fqdn'))->explode(',');
+                }
+                $labels = $labels->merge(fqdnLabelsForCaddy(
+                    network: $this->application->destination->network,
+                    uuid: $this->application->uuid,
+                    domains: $domains,
+                    onlyPort: $onlyPort,
+                    is_force_https_enabled: $this->application->isForceHttpsEnabled(),
+                    is_gzip_enabled: $this->application->isGzipEnabled(),
+                    is_stripprefix_enabled: $this->application->isStripprefixEnabled()
+                ));
+            }
             $this->application->custom_labels = base64_encode($labels->implode("\n"));
             $this->application->save();
         } else {
@@ -1079,6 +1141,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $labels = collect(generateLabelsApplication($this->application, $this->preview));
         }
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
+
+        // Check for custom HEALTHCHECK
+        $this->custom_healthcheck_found = false;
+        if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {
+            $this->execute_remote_command([
+                executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile_from_repo', "ignore_errors" => true
+            ]);
+            $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile_from_repo'))->trim()->explode("\n"));
+            if (str($dockerfile)->contains('HEALTHCHECK')) {
+                $this->custom_healthcheck_found = true;
+            }
+        }
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -1091,16 +1165,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'networks' => [
                         $this->destination->network,
                     ],
-                    'healthcheck' => [
-                        'test' => [
-                            'CMD-SHELL',
-                            $this->generate_healthcheck_commands()
-                        ],
-                        'interval' => $this->application->health_check_interval . 's',
-                        'timeout' => $this->application->health_check_timeout . 's',
-                        'retries' => $this->application->health_check_retries,
-                        'start_period' => $this->application->health_check_start_period . 's'
-                    ],
                     'mem_limit' => $this->application->limits_memory,
                     'memswap_limit' => $this->application->limits_memory_swap,
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
@@ -1117,6 +1181,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if (!$this->custom_healthcheck_found) {
+            $docker_compose['services'][$this->container_name]['healthcheck'] = [
+                'test' => [
+                    'CMD-SHELL',
+                    $this->generate_healthcheck_commands()
+                ],
+                'interval' => $this->application->health_check_interval . 's',
+                'timeout' => $this->application->health_check_timeout . 's',
+                'retries' => $this->application->health_check_retries,
+                'start_period' => $this->application->health_check_start_period . 's'
+            ];
+        }
         if (!is_null($this->application->limits_cpuset)) {
             data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
         }
@@ -1215,29 +1291,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         //     ];
         // }
 
-        if ($this->application->pull_request_id === 0) {
+        if ($this->pull_request_id === 0) {
+            $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
             if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
-                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
-                if (count($custom_compose) > 0) {
-                    $ipv4 = data_get($custom_compose, 'ip.0');
-                    $ipv6 = data_get($custom_compose, 'ip6.0');
-                    data_forget($custom_compose, 'ip');
-                    data_forget($custom_compose, 'ip6');
-                    if ($ipv4 || $ipv6) {
-                        data_forget($docker_compose['services'][$this->container_name], 'networks');
-                    }
-                    if ($ipv4) {
-                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
-                    }
-                    if ($ipv6) {
-                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
-                    }
-                    $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
-                }
-            } else {
                 $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
-                data_forget($docker_compose, 'services.' . $this->container_name);
-                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
                 if (count($custom_compose) > 0) {
                     $ipv4 = data_get($custom_compose, 'ip.0');
                     $ipv6 = data_get($custom_compose, 'ip6.0');
@@ -1254,6 +1311,23 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     }
                     $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
                 }
+            } else {
+                if (count($custom_compose) > 0) {
+                    $ipv4 = data_get($custom_compose, 'ip.0');
+                    $ipv6 = data_get($custom_compose, 'ip6.0');
+                    data_forget($custom_compose, 'ip');
+                    data_forget($custom_compose, 'ip6');
+                    if ($ipv4 || $ipv6) {
+                        data_forget($docker_compose['services'][$this->container_name], 'networks');
+                    }
+                    if ($ipv4) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                    }
+                    if ($ipv6) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                    }
+                    $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
+                }
             }
         }
 
@@ -1301,23 +1375,53 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $environment_variables = collect();
         if ($this->pull_request_id === 0) {
             foreach ($this->application->runtime_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->real_value");
+                // This is necessary because we have to escape the value of the environment variable
+                // but only if the environment variable is created after 4.0.0-beta.240
+                // when I implemented the escaping feature.
+
+                // Old environment variables are not escaped, because it could break the application
+                // as the application could expect the unescaped value.
+                if ($env->version === '4.0.0-beta.239') {
+                    $real_value = $env->real_value;
+                } else {
+                    $real_value = escapeEnvVariables($env->real_value);
+                }
+                $environment_variables->push("$env->key=$real_value");
             }
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->real_value");
+                if ($env->version === '4.0.0-beta.239') {
+                    $real_value = $env->real_value;
+                } else {
+                    $real_value = escapeEnvVariables($env->real_value);
+                }
+                $environment_variables->push("$env->key=$real_value");
             }
         } else {
             foreach ($this->application->runtime_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->real_value");
+                if ($env->version === '4.0.0-beta.239') {
+                    $real_value = $env->real_value;
+                } else {
+                    $real_value = escapeEnvVariables($env->real_value);
+                }
+                $environment_variables->push("$env->key=$real_value");
             }
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->real_value");
+                if ($env->version === '4.0.0-beta.239') {
+                    $real_value = $env->real_value;
+                } else {
+                    $real_value = escapeEnvVariables($env->real_value);
+                }
+                $environment_variables->push("$env->key=$real_value");
             }
         }
         // Add PORT if not exists, use the first port as default
         if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
         }
+        // Add HOST if not exists
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('HOST'))->isEmpty()) {
+            $environment_variables->push("HOST=0.0.0.0");
+        }
         if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
             if (!is_null($this->commit)) {
                 $environment_variables->push("SOURCE_COMMIT={$this->commit}");
@@ -1634,16 +1738,69 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         ]);
     }
 
+    private function run_pre_deployment_command()
+    {
+        if (empty($this->application->pre_deployment_command)) {
+            return;
+        }
+        $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
+        if ($containers->count() == 0) {
+            return;
+        }
+        $this->application_deployment_queue->addLogEntry("Executing pre-deployment command (see debug log for output): {$this->application->pre_deployment_command}");
+
+        foreach ($containers as $container) {
+            $containerName = data_get($container, 'Names');
+            if ($containers->count() == 1 || str_starts_with($containerName, $this->application->pre_deployment_command_container . '-' . $this->application->uuid)) {
+                $cmd = 'sh -c "' . str_replace('"', '\"', $this->application->pre_deployment_command)  . '"';
+                $exec = "docker exec {$containerName} {$cmd}";
+                $this->execute_remote_command(
+                    [
+                        executeInDocker($this->deployment_uuid, $exec), 'hidden' => true
+                    ],
+                );
+                return;
+            }
+        }
+        throw new RuntimeException('Pre-deployment command: Could not find a valid container. Is the container name correct?');
+    }
+
+    private function run_post_deployment_command()
+    {
+        if (empty($this->application->post_deployment_command)) {
+            return;
+        }
+        $this->application_deployment_queue->addLogEntry("Executing post-deployment command (see debug log for output): {$this->application->post_deployment_command}");
+
+        $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
+        foreach ($containers as $container) {
+            $containerName = data_get($container, 'Names');
+            if ($containers->count() == 1 || str_starts_with($containerName, $this->application->post_deployment_command_container . '-' . $this->application->uuid)) {
+                $cmd = 'sh -c "' . str_replace('"', '\"', $this->application->post_deployment_command)  . '"';
+                $exec = "docker exec {$containerName} {$cmd}";
+                $this->execute_remote_command(
+                    [
+                        executeInDocker($this->deployment_uuid, $exec), 'hidden' => true
+                    ],
+                );
+                return;
+            }
+        }
+        throw new RuntimeException('Post-deployment command: Could not find a valid container. Is the container name correct?');
+    }
+
     private function next(string $status)
     {
         queue_next_deployment($this->application);
         // If the deployment is cancelled by the user, don't update the status
-        if ($this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value && $this->application_deployment_queue->status !== ApplicationDeploymentStatus::FAILED->value) {
+        if (
+            $this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value && $this->application_deployment_queue->status !== ApplicationDeploymentStatus::FAILED->value
+        ) {
             $this->application_deployment_queue->update([
                 'status' => $status,
             ]);
         }
-        if ($status === ApplicationDeploymentStatus::FAILED->value) {
+        if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value) {
             $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
             return;
         }

app/Jobs/ContainerStatusJob.php

@@ -8,6 +8,7 @@ use App\Actions\Proxy\StartProxy;
 use App\Actions\Shared\ComplexStatusCheck;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
+use App\Models\ServiceDatabase;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
 use Illuminate\Bus\Queueable;
@@ -149,31 +150,58 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     }
                 } else {
                     $uuid = data_get($labels, 'com.docker.compose.service');
+                    $type = data_get($labels, 'coolify.type');
+
                     if ($uuid) {
-                        $database = $databases->where('uuid', $uuid)->first();
-                        if ($database) {
-                            $isPublic = data_get($database, 'is_public');
-                            $foundDatabases[] = $database->id;
-                            $statusFromDb = $database->status;
-                            if ($statusFromDb !== $containerStatus) {
-                                $database->update(['status' => $containerStatus]);
-                            }
-                            if ($isPublic) {
-                                $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
-                                    if ($this->server->isSwarm()) {
-                                        return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-                                    } else {
-                                        return data_get($value, 'Name') === "/$uuid-proxy";
+                        if ($type === 'service') {
+                            $database_id = data_get($labels, 'coolify.service.subId');
+                            if ($database_id) {
+                                $service_db = ServiceDatabase::where('id', $database_id)->first();
+                                if ($service_db) {
+                                    $uuid = $service_db->service->uuid;
+                                    $isPublic = data_get($service_db, 'is_public');
+                                    if ($isPublic) {
+                                        $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+                                            if ($this->server->isSwarm()) {
+                                                return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+                                            } else {
+                                                return data_get($value, 'Name') === "/$uuid-proxy";
+                                            }
+                                        })->first();
+                                        if (!$foundTcpProxy) {
+                                            StartDatabaseProxy::run($service_db);
+                                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
+                                        }
                                     }
-                                })->first();
-                                if (!$foundTcpProxy) {
-                                    StartDatabaseProxy::run($database);
-                                    $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
                                 }
                             }
                         } else {
-                            // Notify user that this container should not be there.
+                            $database = $databases->where('uuid', $uuid)->first();
+                            if ($database) {
+                                $isPublic = data_get($database, 'is_public');
+                                $foundDatabases[] = $database->id;
+                                $statusFromDb = $database->status;
+                                if ($statusFromDb !== $containerStatus) {
+                                    $database->update(['status' => $containerStatus]);
+                                }
+                                if ($isPublic) {
+                                    $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+                                        if ($this->server->isSwarm()) {
+                                            return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+                                        } else {
+                                            return data_get($value, 'Name') === "/$uuid-proxy";
+                                        }
+                                    })->first();
+                                    if (!$foundTcpProxy) {
+                                        StartDatabaseProxy::run($database);
+                                        $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
+                                    }
+                                }
+                            } else {
+                                // Notify user that this container should not be there.
+                            }
                         }
+
                     }
                     if (data_get($container, 'Name') === '/coolify-db') {
                         $foundDatabases[] = 0;

app/Jobs/CoolifyTask.php

@@ -21,7 +21,8 @@ class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
     public function __construct(
         public Activity $activity,
         public bool     $ignore_errors = false,
-        public $call_event_on_finish = null
+        public $call_event_on_finish = null,
+        public $call_event_data = null
     ) {
     }
 
@@ -33,7 +34,8 @@ class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
         $remote_process = resolve(RunRemoteProcess::class, [
             'activity' => $this->activity,
             'ignore_errors' => $this->ignore_errors,
-            'call_event_on_finish' => $this->call_event_on_finish
+            'call_event_on_finish' => $this->call_event_on_finish,
+            'call_event_data' => $this->call_event_data
         ]);
 
         $remote_process();

app/Jobs/DatabaseBackupJob.php

@@ -51,6 +51,9 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
+        if (is_null($this->team)) {
+            return;
+        }
         if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
             $this->database = data_get($this->backup, 'database');
             $this->server = $this->database->service->server;
@@ -92,7 +95,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $databaseType = $this->database->databaseType();
                 $serviceUuid = $this->database->service->uuid;
                 $serviceName = str($this->database->service->name)->slug();
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
@@ -117,7 +120,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     } else {
                         $databasesToBackup = $this->database->postgres_user;
                     }
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep MYSQL_";
@@ -140,7 +143,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     } else {
                         throw new \Exception('MYSQL_DATABASE not found');
                     }
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env";
@@ -187,32 +190,32 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             }
 
             if (is_null($databasesToBackup)) {
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     $databasesToBackup = [$this->database->postgres_db];
-                } else if ($databaseType === 'standalone-mongodb') {
+                } else if (str($databaseType)->contains('mongodb')) {
                     $databasesToBackup = ['*'];
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     $databasesToBackup = [$this->database->mysql_database];
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     $databasesToBackup = [$this->database->mariadb_database];
                 } else {
                     return;
                 }
             } else {
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
-                } else if ($databaseType === 'standalone-mongodb') {
+                } else if (str($databaseType)->contains('mongodb')) {
                     // Format: db1:collection1,collection2|db2:collection3,collection4
                     $databasesToBackup = explode('|', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
                     ray($databasesToBackup);
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
@@ -232,7 +235,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $size = 0;
                 ray('Backing up ' . $database);
                 try {
-                    if ($databaseType === 'standalone-postgresql') {
+                    if (str($databaseType)->contains('postgres')) {
                         $this->backup_file = "/pg-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -241,7 +244,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_postgresql($database);
-                    } else if ($databaseType === 'standalone-mongodb') {
+                    } else if (str($databaseType)->contains('mongodb')) {
                         if ($database === '*') {
                             $database = 'all';
                             $databaseName = 'all';
@@ -260,7 +263,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_mongodb($database);
-                    } else if ($databaseType === 'standalone-mysql') {
+                    } else if (str($databaseType)->contains('mysql')) {
                         $this->backup_file = "/mysql-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -269,7 +272,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_mysql($database);
-                    } else if ($databaseType === 'standalone-mariadb') {
+                    } else if (str($databaseType)->contains('mariadb')) {
                         $this->backup_file = "/mariadb-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -316,7 +319,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
-            $url = $this->database->getDbUrl(useInternal: true);
+            $url = $this->database->get_db_url(useInternal: true);
             if ($databaseWithCollections === 'all') {
                 $commands[] = "mkdir -p " . $this->backup_dir;
                 $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";

app/Jobs/DockerCleanupJob.php

@@ -4,6 +4,7 @@ namespace App\Jobs;
 
 use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
+use App\Notifications\Server\DockerCleanup;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -47,8 +48,9 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
                 CleanupDocker::run($this->server);
                 $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
-                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    $this->server->team?->notify(new DockerCleanup($this->server, 'Saved ' . ($this->usageBefore - $usageAfter) . '% disk space.'));
+                    // ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    // send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
                     Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);

app/Jobs/InstanceAutoUpdateJob.php

@@ -23,6 +23,6 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 
     public function handle(): void
     {
-        UpdateCoolify::run($this->force);
+        UpdateCoolify::run(force: $this->force, async: false);
     }
 }

app/Jobs/ServerFilesFromServerJob.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class ServerFilesFromServerJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public function __construct(public ServiceApplication|ServiceDatabase $service)
+    {
+    }
+    public function handle()
+    {
+        $this->service->getFilesFromServer(isInit: true);
+    }
+}

app/Jobs/ServerStorageSaveJob.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\LocalFileVolume;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class ServerStorageSaveJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public function __construct(public LocalFileVolume $localFileVolume)
+    {
+    }
+    public function handle()
+    {
+        $this->localFileVolume->saveStorageOnServer();
+    }
+
+}

app/Listeners/ProxyStartedNotification.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\ProxyStarted;
+use App\Models\Server;
+
+class ProxyStartedNotification
+{
+    public Server $server;
+    public function __construct()
+    {
+    }
+
+    public function handle(ProxyStarted $event): void
+    {
+        $this->server = data_get($event, 'data');
+        $this->server->setupDefault404Redirect();
+        $this->server->setupDynamicProxyConfiguration();
+    }
+}

app/Livewire/ActivityMonitor.php

@@ -13,6 +13,7 @@ class ActivityMonitor extends Component
     public $activityId;
     public $eventToDispatch = 'activityFinished';
     public $isPollingActive = false;
+    public bool $showWaiting = false;
 
     protected $activity;
     protected $listeners = ['activityMonitor' => 'newMonitorActivity'];

app/Livewire/Admin/Index.php

@@ -4,12 +4,35 @@ namespace App\Livewire\Admin;
 
 use App\Models\User;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Crypt;
 use Livewire\Component;
 
 class Index extends Component
 {
-    public $users = [];
+    public $active_subscribers = [];
+    public $inactive_subscribers = [];
+    public $search = '';
+    public function submitSearch() {
+        if ($this->search !== "") {
+            $this->inactive_subscribers = User::whereDoesntHave('teams', function ($query) {
+                $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+            })->where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== 0;
+            });
+            $this->active_subscribers = User::whereHas('teams', function ($query) {
+                $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+            })->where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== 0;
+            });
+        } else {
+            $this->getSubscribers();
+        }
+    }
     public function mount()
     {
         if (!isCloud()) {
@@ -18,7 +41,15 @@ class Index extends Component
         if (auth()->user()->id !== 0) {
             return redirect()->route('dashboard');
         }
-        $this->users = User::whereHas('teams', function ($query) {
+        $this->getSubscribers();
+    }
+    public function getSubscribers() {
+        $this->inactive_subscribers = User::whereDoesntHave('teams', function ($query) {
+            $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+        })->get()->filter(function ($user) {
+            return $user->id !== 0;
+        });
+        $this->active_subscribers = User::whereHas('teams', function ($query) {
             $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
         })->get()->filter(function ($user) {
             return $user->id !== 0;

app/Livewire/Boarding/Index.php

@@ -2,22 +2,24 @@
 
 namespace App\Livewire\Boarding;
 
-use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyTypes;
 use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Url;
 use Livewire\Component;
 
 class Index extends Component
 {
     protected $listeners = ['serverInstalled' => 'validateServer'];
+
     public string $currentState = 'welcome';
 
     public ?string $selectedServerType = null;
     public ?Collection $privateKeys = null;
+
     public ?int $selectedExistingPrivateKey = null;
     public ?string $privateKeyType = null;
     public ?string $privateKey = null;
@@ -27,6 +29,7 @@ class Index extends Component
     public ?PrivateKey $createdPrivateKey = null;
 
     public ?Collection $servers = null;
+
     public ?int $selectedExistingServer = null;
     public ?string $remoteServerName = null;
     public ?string $remoteServerDescription = null;
@@ -38,7 +41,8 @@ class Index extends Component
     public ?Server $createdServer = null;
 
     public Collection $projects;
-    public ?int $selectedExistingProject = null;
+
+    public ?int $selectedProject = null;
     public ?Project $createdProject = null;
 
     public bool $dockerInstallationStarted = false;
@@ -62,6 +66,26 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->remoteServerDescription = 'Created by Coolify';
             $this->remoteServerHost = 'coolify-testing-host';
         }
+        // if ($this->currentState === 'create-project') {
+        //     $this->getProjects();
+        // }
+        // if ($this->currentState === 'create-resource') {
+        //     $this->selectExistingServer();
+        //     $this->selectExistingProject();
+        // }
+        // if ($this->currentState === 'private-key') {
+        //     $this->setServerType('remote');
+        // }
+        // if ($this->currentState === 'create-server') {
+        //     $this->selectExistingPrivateKey();
+        // }
+        // if ($this->currentState === 'validate-server') {
+        //     $this->selectExistingServer();
+        // }
+        // if ($this->currentState === 'select-existing-server') {
+        //     $this->selectExistingServer();
+        // }
+
     }
     public function explanation()
     {
@@ -73,7 +97,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function restartBoarding()
     {
-        return redirect()->route('boarding');
+        return redirect()->route('onboarding');
     }
     public function skipBoarding()
     {
@@ -89,6 +113,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->selectedServerType = $type;
         if ($this->selectedServerType === 'localhost') {
             $this->createdServer = Server::find(0);
+            $this->selectedExistingServer = 0;
             if (!$this->createdServer) {
                 return $this->dispatch('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
@@ -122,10 +147,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
         $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->installServer();
+        $this->currentState = 'validate-server';
     }
     public function getProxyType()
     {
+        // Set Default Proxy Type
         $this->selectProxy(ProxyTypes::TRAEFIK_V2->value);
         // $proxyTypeSet = $this->createdServer->proxy->type;
         // if (!$proxyTypeSet) {
@@ -136,6 +162,10 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function selectExistingPrivateKey()
     {
+        if (is_null($this->selectedExistingPrivateKey)) {
+            $this->restartBoarding();
+            return;
+        }
         $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
         $this->privateKey = $this->createdPrivateKey->private_key;
         $this->currentState = 'create-server';
@@ -195,11 +225,12 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->createdServer->settings->is_cloudflare_tunnel = $this->isCloudflareTunnel;
         $this->createdServer->settings->save();
         $this->createdServer->addInitialNetwork();
+        $this->selectedExistingServer = $this->createdServer->id;
         $this->currentState = 'validate-server';
     }
     public function installServer()
     {
-        $this->dispatch('validateServer', true);
+        $this->dispatch('init', true);
     }
     public function validateServer()
     {
@@ -248,13 +279,13 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->projects = Project::ownedByCurrentTeam(['name'])->get();
         if ($this->projects->count() > 0) {
-            $this->selectedExistingProject = $this->projects->first()->id;
+            $this->selectedProject = $this->projects->first()->id;
         }
         $this->currentState = 'create-project';
     }
     public function selectExistingProject()
     {
-        $this->createdProject = Project::find($this->selectedExistingProject);
+        $this->createdProject = Project::find($this->selectedProject);
         $this->currentState = 'create-resource';
     }
     public function createNewProject()

app/Livewire/Dashboard.php

@@ -3,6 +3,7 @@
 namespace App\Livewire;
 
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
 use Illuminate\Support\Collection;
@@ -13,9 +14,11 @@ class Dashboard extends Component
 {
     public $projects = [];
     public Collection $servers;
+    public Collection $private_keys;
     public $deployments_per_server;
     public function mount()
     {
+        $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
         $this->servers = Server::ownedByCurrentTeam()->get();
         $this->projects = Project::ownedByCurrentTeam()->get();
         $this->get_deployments();

app/Livewire/Destination/New/Docker.php

@@ -5,7 +5,7 @@ namespace App\Livewire\Destination\New;
 use App\Models\Server;
 use App\Models\StandaloneDocker as ModelsStandaloneDocker;
 use App\Models\SwarmDocker;
-use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -14,7 +14,7 @@ class Docker extends Component
     public string $name;
     public string $network;
 
-    public Collection $servers;
+    public ?Collection $servers = null;
     public Server $server;
     public ?int $server_id = null;
     public bool $is_swarm = false;
@@ -34,6 +34,9 @@ class Docker extends Component
 
     public function mount()
     {
+        if (is_null($this->servers)) {
+            $this->servers = Server::isReachable()->get();
+        }
         if (request()->query('server_id')) {
             $this->server_id = request()->query('server_id');
         } else {
@@ -46,7 +49,9 @@ class Docker extends Component
         } else {
             $this->network = new Cuid2(7);
         }
-        $this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab();
+        if ($this->servers->count() > 0) {
+            $this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab();
+        }
     }
 
     public function generate_name()

app/Livewire/Destination/Show.php

@@ -3,6 +3,8 @@
 namespace App\Livewire\Destination;
 
 use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 
@@ -11,6 +13,40 @@ class Show extends Component
     public Server $server;
     public Collection|array $networks = [];
 
+    private function createNetworkAndAttachToProxy()
+    {
+        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+    }
+    public function add($name)
+    {
+        if ($this->server->isSwarm()) {
+            $found = $this->server->swarmDockers()->where('network', $name)->first();
+            if ($found) {
+                $this->dispatch('error', 'Network already added to this server.');
+                return;
+            } else {
+                SwarmDocker::create([
+                    'name' => $this->server->name . "-" . $name,
+                    'network' => $this->name,
+                    'server_id' => $this->server->id,
+                ]);
+            }
+        } else {
+            $found = $this->server->standaloneDockers()->where('network', $name)->first();
+            if ($found) {
+                $this->dispatch('error', 'Network already added to this server.');
+                return;
+            } else {
+                StandaloneDocker::create([
+                    'name' => $this->server->name . "-" . $name,
+                    'network' => $name,
+                    'server_id' => $this->server->id,
+                ]);
+            }
+            $this->createNetworkAndAttachToProxy();
+        }
+    }
     public function scan()
     {
         if ($this->server->isSwarm()) {
@@ -26,6 +62,8 @@ class Show extends Component
         });
         if ($this->networks->count() === 0) {
             $this->dispatch('success', 'No new networks found.');
+            return;
         }
+        $this->dispatch('success', 'Scan done.');
     }
 }

app/Livewire/LayoutPopups.php

@@ -17,10 +17,6 @@ class LayoutPopups extends Component
     {
         $this->dispatch('success', 'Realtime events configured!');
     }
-    public function disable()
-    {
-        auth()->user()->update(['is_notification_sponsorship_enabled' => false]);
-    }
     public function render()
     {
         return view('livewire.layout-popups');

app/Livewire/Notifications/Discord.php

@@ -6,7 +6,7 @@ use App\Models\Team;
 use App\Notifications\Test;
 use Livewire\Component;
 
-class DiscordSettings extends Component
+class Discord extends Component
 {
     public Team $team;
     protected $rules = [
@@ -55,4 +55,8 @@ class DiscordSettings extends Component
         $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.discord');
+    }
 }

app/Livewire/Notifications/Email.php

@@ -2,13 +2,12 @@
 
 namespace App\Livewire\Notifications;
 
+use Livewire\Component;
 use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Notifications\Test;
-use Livewire\Component;
-use Log;
 
-class EmailSettings extends Component
+class Email extends Component
 {
     public Team $team;
     public string $emails;
@@ -119,16 +118,18 @@ class EmailSettings extends Component
     {
         try {
             $this->resetErrorBag();
-            $this->validate([
-                'team.smtp_from_address' => 'required|email',
-                'team.smtp_from_name' => 'required',
-                'team.smtp_host' => 'required',
-                'team.smtp_port' => 'required|numeric',
-                'team.smtp_encryption' => 'nullable',
-                'team.smtp_username' => 'nullable',
-                'team.smtp_password' => 'nullable',
-                'team.smtp_timeout' => 'nullable',
-            ]);
+            if (!$this->team->use_instance_email_settings) {
+                $this->validate([
+                    'team.smtp_from_address' => 'required|email',
+                    'team.smtp_from_name' => 'required',
+                    'team.smtp_host' => 'required',
+                    'team.smtp_port' => 'required|numeric',
+                    'team.smtp_encryption' => 'nullable',
+                    'team.smtp_username' => 'nullable',
+                    'team.smtp_password' => 'nullable',
+                    'team.smtp_timeout' => 'nullable',
+                ]);
+            }
             $this->team->save();
             refreshSession();
             $this->dispatch('success', 'Settings saved.');
@@ -189,4 +190,8 @@ class EmailSettings extends Component
         }
         $this->dispatch('error', 'Instance SMTP/Resend settings are not enabled.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.email');
+    }
 }

app/Livewire/Notifications/Telegram.php

@@ -6,8 +6,9 @@ use App\Models\Team;
 use App\Notifications\Test;
 use Livewire\Component;
 
-class TelegramSettings extends Component
+class Telegram extends Component
 {
+
     public Team $team;
     protected $rules = [
         'team.telegram_enabled' => 'nullable|boolean',
@@ -61,4 +62,8 @@ class TelegramSettings extends Component
         $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.telegram');
+    }
 }

app/Livewire/Profile/Index.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Profile;
 
+use Illuminate\Support\Facades\Hash;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
@@ -10,6 +11,10 @@ class Index extends Component
     public int $userId;
     public string $email;
 
+    public string $current_password;
+    public string $new_password;
+    public string $new_password_confirmation;
+
     #[Validate('required')]
     public string $name;
     public function mount()
@@ -19,15 +24,43 @@ class Index extends Component
         $this->email = auth()->user()->email;
     }
     public function submit()
-
     {
         try {
-            $this->validate();
+            $this->validate([
+                'name' => 'required',
+            ]);
             auth()->user()->update([
                 'name' => $this->name,
             ]);
 
-            $this->dispatch('success', 'Profile updated');
+            $this->dispatch('success', 'Profile updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function resetPassword()
+    {
+        try {
+            $this->validate([
+                'current_password' => 'required',
+                'new_password' => 'required|min:8',
+                'new_password_confirmation' => 'required|min:8|same:new_password',
+            ]);
+            if (!Hash::check($this->current_password, auth()->user()->password)) {
+                $this->dispatch('error', 'Current password is incorrect.');
+                return;
+            }
+            if ($this->new_password !== $this->new_password_confirmation) {
+                $this->dispatch('error', 'The two new passwords does not match.');
+                return;
+            }
+            auth()->user()->update([
+                'password' => Hash::make($this->new_password),
+            ]);
+            $this->dispatch('success', 'Password updated.');
+            $this->current_password = '';
+            $this->new_password = '';
+            $this->new_password_confirmation = '';
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Application/Advanced.php

@@ -9,6 +9,8 @@ class Advanced extends Component
 {
     public Application $application;
     public bool $is_force_https_enabled;
+    public bool $is_gzip_enabled;
+    public bool $is_stripprefix_enabled;
     protected $rules = [
         'application.settings.is_git_submodules_enabled' => 'boolean|required',
         'application.settings.is_git_lfs_enabled' => 'boolean|required',
@@ -19,13 +21,17 @@ class Advanced extends Component
         'application.settings.is_gpu_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
         'application.settings.is_consistent_container_name_enabled' => 'boolean|required',
+        'application.settings.is_gzip_enabled' => 'boolean|required',
+        'application.settings.is_stripprefix_enabled' => 'boolean|required',
         'application.settings.gpu_driver' => 'string|required',
         'application.settings.gpu_count' => 'string|required',
         'application.settings.gpu_device_ids' => 'string|required',
         'application.settings.gpu_options' => 'string|required',
     ];
     public function mount() {
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        $this->is_force_https_enabled = $this->application->isForceHttpsEnabled();
+        $this->is_gzip_enabled = $this->application->isGzipEnabled();
+        $this->is_stripprefix_enabled = $this->application->isStripprefixEnabled();
     }
     public function instantSave()
     {
@@ -40,6 +46,14 @@ class Advanced extends Component
             $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
             $this->dispatch('resetDefaultLabels', false);
         }
+        if ($this->application->settings->is_gzip_enabled !== $this->is_gzip_enabled) {
+            $this->application->settings->is_gzip_enabled = $this->is_gzip_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
+        if ($this->application->settings->is_stripprefix_enabled !== $this->is_stripprefix_enabled) {
+            $this->application->settings->is_stripprefix_enabled = $this->is_stripprefix_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
     }

app/Livewire/Project/Application/Deployment/Index.php

@@ -9,7 +9,7 @@ use Livewire\Component;
 class Index extends Component
 {
     public Application $application;
-    public array|Collection $deployments = [];
+    public ?Collection $deployments;
     public int $deployments_count = 0;
     public string $current_url;
     public int $skip = 0;
@@ -48,9 +48,9 @@ class Index extends Component
     }
     private function show_more()
     {
-        if (count($this->deployments) !== 0) {
+        if ($this->deployments->count() !== 0) {
             $this->show_next = true;
-            if (count($this->deployments) < $this->default_take) {
+            if ($this->deployments->count() < $this->default_take) {
                 $this->show_next = false;
             }
             return;
@@ -63,7 +63,6 @@ class Index extends Component
     }
     public function previous_page(?int $take = null)
     {
-
         if ($take) {
             $this->skip = $this->skip - $take;
         }

app/Livewire/Project/Application/General.php

@@ -66,9 +66,14 @@ class General extends Component
         'application.docker_compose_custom_build_command' => 'nullable',
         'application.custom_labels' => 'nullable',
         'application.custom_docker_run_options' => 'nullable',
+        'application.pre_deployment_command' => 'nullable',
+        'application.pre_deployment_command_container' => 'nullable',
+        'application.post_deployment_command' => 'nullable',
+        'application.post_deployment_command_container' => 'nullable',
         'application.settings.is_static' => 'boolean|required',
         'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
+        'application.watch_paths' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -104,6 +109,7 @@ class General extends Component
         'application.settings.is_static' => 'Is static',
         'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
         'application.settings.is_build_server_enabled' => 'Is build server enabled',
+        'application.watch_paths' => 'Watch paths',
     ];
     public function mount()
     {
@@ -112,6 +118,10 @@ class General extends Component
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
         }
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->application->fqdn = null;
+            $this->application->settings->save();
+        }
         $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
 
         $this->ports_exposes = $this->application->ports_exposes;
@@ -120,7 +130,7 @@ class General extends Component
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
-        if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+        if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
             $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
@@ -163,7 +173,12 @@ class General extends Component
         }
         return $domain;
     }
-
+    public function updatedApplicationBaseDirectory() {
+        raY('asdf');
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->loadComposeFile();
+        }
+    }
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
@@ -211,12 +226,11 @@ class General extends Component
         $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
         $this->application->save();
         $this->resetDefaultLabels(false);
-        // $this->dispatch('success', 'Labels reset to default!');
     }
     public function submit($showToaster = true)
     {
         try {
-            if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+            if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
                 $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
                 $this->application->save();
@@ -239,7 +253,7 @@ class General extends Component
                 if ($this->application->additional_servers->count() === 0) {
                     foreach ($domains as $domain) {
                         if (!validate_dns_entry($domain, $this->application->destination->server)) {
-                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
                         }
                     }
                 }
@@ -263,7 +277,11 @@ class General extends Component
             }
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-                $this->parsedServices = $this->application->parseCompose();
+                if ($this->application->settings->is_raw_compose_deployment_enabled) {
+                    $this->application->parseRawCompose();
+                } else {
+                    $this->parsedServices = $this->application->parseCompose();
+                }
             }
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();

app/Livewire/Project/Application/Heading.php

@@ -56,11 +56,11 @@ class Heading extends Component
             return;
         }
         if (data_get($this->application, 'settings.is_build_server_enabled') && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/build-server">documentation</a>');
             return;
         }
         if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();
@@ -99,7 +99,7 @@ class Heading extends Component
     public function restart()
     {
         if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();

app/Livewire/Project/Database/Backup/Execution.php

@@ -10,7 +10,8 @@ class Execution extends Component
     public $backup;
     public $executions;
     public $s3s;
-    public function mount() {
+    public function mount()
+    {
         $backup_uuid = request()->route('backup_uuid');
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
@@ -34,6 +35,11 @@ class Execution extends Component
         $this->executions = $executions;
         $this->s3s = currentTeam()->s3s;
     }
+    public function cleanupFailed()
+    {
+        $this->backup->executions()->where('status', 'failed')->delete();
+        $this->dispatch('refreshBackupExecutions');
+    }
     public function render()
     {
         return view('livewire.project.database.backup.execution');

app/Livewire/Project/Database/BackupEdit.php

@@ -42,19 +42,21 @@ class BackupEdit extends Component
 
     public function delete()
     {
-        // TODO: Delete backup from server and add a confirmation modal
-        $this->backup->delete();
-        if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
-            $previousUrl = url()->previous();
-            $url = Url::fromString($previousUrl);
-            $url = $url->withoutQueryParameter('selectedBackupId');
-            $url = $url->withFragment('backups');
-            $url = $url->getPath() .  "#{$url->getFragment()}";
-            return redirect($url);
-        } else {
-            return redirect()->route('project.database.backup.index', $this->parameters);
+        try {
+            $this->backup->delete();
+            if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $previousUrl = url()->previous();
+                $url = Url::fromString($previousUrl);
+                $url = $url->withoutQueryParameter('selectedBackupId');
+                $url = $url->withFragment('backups');
+                $url = $url->getPath() .  "#{$url->getFragment()}";
+                return redirect($url);
+            } else {
+                return redirect()->route('project.database.backup.index', $this->parameters);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-
     }
 
     public function instantSave()
@@ -63,7 +65,7 @@ class BackupEdit extends Component
             $this->custom_validate();
             $this->backup->save();
             $this->backup->refresh();
-            $this->dispatch('success', 'Backup updated successfully');
+            $this->dispatch('success', 'Backup updated successfully.');
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
         }

app/Livewire/Project/Database/BackupExecutions.php

@@ -34,7 +34,7 @@ class BackupExecutions extends Component
         }
         $execution->delete();
         $this->dispatch('success', 'Backup deleted.');
-        $this->dispatch('refreshBackupExecutions');
+        $this->refreshBackupExecutions();
     }
     public function download($exeuctionId)
     {
@@ -65,6 +65,6 @@ class BackupExecutions extends Component
     }
     public function refreshBackupExecutions(): void
     {
-        $this->executions = data_get($this->backup, 'executions', []);
+        $this->executions = $this->backup->executions()->get()->sortByDesc('created_at');
     }
 }

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

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -93,7 +93,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

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

@@ -44,9 +44,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -95,7 +95,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

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

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -94,7 +94,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

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

@@ -53,9 +53,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -87,7 +87,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

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

@@ -39,9 +39,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -86,7 +86,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Edit.php

@@ -17,9 +17,14 @@ class Edit extends Component
     public function saveKey($data)
     {
         try {
+            $found = $this->project->environment_variables()->where('key', $data['key'])->first();
+            if ($found) {
+                throw new \Exception('Variable already exists.');
+            }
             $this->project->environment_variables()->create([
                 'key' => $data['key'],
                 'value' => $data['value'],
+                'is_multiline' => $data['is_multiline'],
                 'type' => 'project',
                 'team_id' => currentTeam()->id,
             ]);
@@ -41,10 +46,11 @@ class Edit extends Component
 
     public function submit()
     {
-        $this->validate();
         try {
+            $this->validate();
             $this->project->save();
             $this->dispatch('saved');
+            $this->dispatch('success', 'Project updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/EnvironmentEdit.php

@@ -21,9 +21,14 @@ class EnvironmentEdit extends Component
     public function saveKey($data)
     {
         try {
+            $found = $this->environment->environment_variables()->where('key', $data['key'])->first();
+            if ($found) {
+                throw new \Exception('Variable already exists.');
+            }
             $this->environment->environment_variables()->create([
                 'key' => $data['key'],
                 'value' => $data['value'],
+                'is_multiline' => $data['is_multiline'],
                 'type' => 'environment',
                 'team_id' => currentTeam()->id,
             ]);

app/Livewire/Project/Index.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Project;
 
+use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
 use Livewire\Component;
@@ -10,7 +11,9 @@ class Index extends Component
 {
     public $projects;
     public $servers;
+    public $private_keys;
     public function mount() {
+        $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
         $this->projects = Project::ownedByCurrentTeam()->get();
         $this->servers = Server::ownedByCurrentTeam()->count();
     }

app/Livewire/Project/New/DockerCompose.php

@@ -17,7 +17,6 @@ class DockerCompose extends Component
     public array $query;
     public function mount()
     {
-
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         if (isDev()) {
@@ -40,12 +39,17 @@ class DockerCompose extends Component
     }
     public function submit()
     {
+        $server_id = $this->query['server_id'];
         try {
             $this->validate([
                 'dockerComposeRaw' => 'required'
             ]);
             $this->dockerComposeRaw = Yaml::dump(Yaml::parse($this->dockerComposeRaw), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
-            $server_id = $this->query['server_id'];
+
+            $isValid = validateComposeFile($this->dockerComposeRaw, $server_id);
+            if ($isValid !== 'OK') {
+                return $this->dispatch('error', "Invalid docker-compose file.\n$isValid");
+            }
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
             $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
@@ -74,7 +78,6 @@ class DockerCompose extends Component
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -7,14 +7,12 @@ use App\Models\GithubApp;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
-use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 
 class GithubPrivateRepository extends Component
 {
-    use SaveFromRedirect;
     public $current_step = 'github_apps';
     public $github_apps;
     public GithubApp $github_app;
@@ -79,7 +77,10 @@ class GithubPrivateRepository extends Component
                 $this->loadRepositoryByPage();
             }
         }
-        $this->selected_repository_id = $this->repositories[0]['id'];
+        $this->repositories = $this->repositories->sortBy('name');
+        if ($this->repositories->count() > 0) {
+            $this->selected_repository_id = data_get($this->repositories->first(), 'id');
+        }
         $this->current_step = 'repository';
     }
 

app/Livewire/Project/New/Select.php

@@ -49,7 +49,6 @@ class Select extends Component
     }
     public function render()
     {
-        $this->loadServices();
         return view('livewire.project.new.select');
     }
 
@@ -71,9 +70,14 @@ class Select extends Component
     //     }
     // }
 
+    public function updatedSearch()
+    {
+        $this->loadServices();
+    }
     public function loadServices(bool $force = false)
     {
         try {
+            $this->loadingServices = true;
             if (count($this->allServices) > 0 && !$force) {
                 if (!$this->search) {
                     $this->services = $this->allServices;
@@ -90,8 +94,7 @@ class Select extends Component
                 $this->allServices = getServiceTemplates();
                 $this->services = $this->allServices->filter(function ($service, $key) {
                     return str_contains(strtolower($key), strtolower($this->search));
-                });;
-                $this->dispatch('success', 'Successfully loaded services.');
+                });
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Project/Service/Configuration.php

@@ -18,6 +18,7 @@ class Configuration extends Component
         $userId = auth()->user()->id;
         return [
             "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status',
+            "check_status"
         ];
     }
     public function render()
@@ -35,10 +36,38 @@ class Configuration extends Component
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
+    public function restartApplication($id)
+    {
+        try {
+            $application = $this->service->applications->find($id);
+            if ($application) {
+                $application->restart();
+                $this->dispatch('success', 'Application restarted successfully.');
+            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function restartDatabase($id)
+    {
+        try {
+            $database = $this->service->databases->find($id);
+            if ($database) {
+                $database->restart();
+                $this->dispatch('success', 'Database restarted successfully.');
+            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->dispatch('refresh')->self();
-        $this->dispatch('serviceStatusChanged');
+        try {
+            dispatch_sync(new ContainerStatusJob($this->service->server));
+            $this->dispatch('refresh')->self();
+            $this->dispatch('serviceStatusChanged');
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
     }
 }

app/Livewire/Project/Service/Database.php

@@ -34,7 +34,11 @@ class Database extends Component
         }
         $this->refreshFileStorages();
     }
-    public function instantSaveAdvanced()
+    public function instantSaveExclude()
+    {
+        $this->submit();
+    }
+    public function instantSaveLogDrain()
     {
         if (!$this->database->service->destination->server->isLogDrainEnabled()) {
             $this->database->is_log_drain_enabled = false;

app/Livewire/Project/Service/EditCompose.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Livewire\Modal;
+namespace App\Livewire\Project\Service;
 
 use App\Models\Service;
-use LivewireUI\Modal\ModalComponent;
+use Livewire\Component;
 
-class EditCompose extends ModalComponent
+class EditCompose extends Component
 {
     public Service $service;
     public $serviceId;
@@ -16,13 +16,13 @@ class EditCompose extends ModalComponent
     public function mount() {
         $this->service = Service::find($this->serviceId);
     }
-    public function render()
-    {
-        return view('livewire.modal.edit-compose');
-    }
-    public function submit() {
+
+    public function saveEditedCompose() {
         $this->dispatch('warning', "Saving new docker compose...");
         $this->dispatch('saveCompose', $this->service->docker_compose_raw);
-        $this->closeModal();
+    }
+    public function render()
+    {
+        return view('livewire.project.service.edit-compose');
     }
 }

app/Livewire/Project/Service/Modal.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Service;
-
-use Livewire\Component;
-
-class Modal extends Component
-{
-    public function render()
-    {
-        return view('livewire.project.service.modal');
-    }
-}

app/Livewire/Project/Service/Navbar.php

@@ -6,7 +6,6 @@ use App\Actions\Shared\PullImage;
 use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
 use App\Events\ServiceStatusChanged;
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
@@ -17,16 +16,27 @@ class Navbar extends Component
     public array $parameters;
     public array $query;
     public $isDeploymentProgress = false;
+
     public function getListeners()
     {
+        $userId = auth()->user()->id;
         return [
+            "echo-private:user.{$userId},ServiceStatusChanged" => 'serviceStarted',
             "serviceStatusChanged"
         ];
     }
+    public function serviceStarted() {
+        $this->dispatch('success', 'Service status changed.');
+    }
     public function serviceStatusChanged()
     {
         $this->dispatch('refresh')->self();
     }
+    public function check_status()
+    {
+        $this->dispatch('check_status');
+        $this->dispatch('success', 'Service status updated.');
+    }
     public function render()
     {
         return view('livewire.project.service.navbar');
@@ -41,7 +51,7 @@ class Navbar extends Component
             $this->isDeploymentProgress = false;
         }
     }
-    public function deploy()
+    public function start()
     {
         $this->checkDeployments();
         if ($this->isDeploymentProgress) {
@@ -70,9 +80,9 @@ class Navbar extends Component
             return;
         }
         PullImage::run($this->service);
-        $this->dispatch('image-pulled');
         StopService::run($this->service);
         $this->service->parse();
+        $this->dispatch('imagePulled');
         $activity = StartService::run($this->service);
         $this->dispatch('activityMonitor', $activity->id);
     }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -18,11 +18,22 @@ class ServiceApplicationView extends Component
         'application.required_fqdn' => 'required|boolean',
         'application.is_log_drain_enabled' => 'nullable|boolean',
         'application.is_gzip_enabled' => 'nullable|boolean',
+        'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
     public function render()
     {
         return view('livewire.project.service.service-application-view');
     }
+    public function updatedApplicationFqdn()
+    {
+        $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) {
+            return str($domain)->trim()->lower();
+        });
+        $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+        $this->application->save();
+    }
     public function instantSave()
     {
         $this->submit();
@@ -58,7 +69,11 @@ class ServiceApplicationView extends Component
             $this->validate();
             $this->application->save();
             updateCompose($this->application);
-            $this->dispatch('success', 'Application saved.');
+            if (str($this->application->fqdn)->contains(',')) {
+                $this->dispatch('warning', 'Some services do not support multiple domains, which can lead to problems and is NOT RECOMMENDED.');
+            } else {
+                $this->dispatch('success', 'Service saved.');
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Livewire/Project/Service/StackForm.php

@@ -2,11 +2,12 @@
 
 namespace App\Livewire\Project\Service;
 
+use App\Models\Service;
 use Livewire\Component;
 
 class StackForm extends Component
 {
-    public $service;
+    public Service $service;
     public $fields = [];
     protected $listeners = ["saveCompose"];
     public $rules = [
@@ -41,7 +42,6 @@ class StackForm extends Component
     }
     public function saveCompose($raw)
     {
-
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
@@ -55,6 +55,10 @@ class StackForm extends Component
     {
         try {
             $this->validate();
+            $isValid = validateComposeFile($this->service->docker_compose_raw, $this->service->server->id);
+            if ($isValid !== 'OK') {
+                throw new \Exception("Invalid docker-compose file.\n$isValid");
+            }
             $this->service->save();
             $this->service->saveExtraFields($this->fields);
             $this->service->parse();

app/Livewire/Project/Shared/Destination.php

@@ -56,7 +56,7 @@ class Destination extends Component
     public function redeploy(int $network_id, int $server_id)
     {
         if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $deployment_uuid = new Cuid2(7);

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

@@ -11,17 +11,20 @@ class Add extends Component
     public string $key;
     public ?string $value = null;
     public bool $is_build_time = false;
+    public bool $is_multiline = false;
 
     protected $listeners = ['clearAddEnv' => 'clear'];
     protected $rules = [
         'key' => 'required|string',
         'value' => 'nullable',
         'is_build_time' => 'required|boolean',
+        'is_multiline' => 'required|boolean',
     ];
     protected $validationAttributes = [
         'key' => 'key',
         'value' => 'value',
         'is_build_time' => 'build',
+        'is_multiline' => 'multiline',
     ];
 
     public function mount()
@@ -43,6 +46,7 @@ class Add extends Component
             'key' => $this->key,
             'value' => $this->value,
             'is_build_time' => $this->is_build_time,
+            'is_multiline' => $this->is_multiline,
             'is_preview' => $this->is_preview,
         ]);
         $this->clear();
@@ -53,5 +57,6 @@ class Add extends Component
         $this->key = '';
         $this->value = '';
         $this->is_build_time = false;
+        $this->is_multiline = false;
     }
 }

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

@@ -11,7 +11,7 @@ class All extends Component
 {
     public $resource;
     public bool $showPreview = false;
-    public string|null $modalId = null;
+    public ?string $modalId = null;
     public ?string $variables = null;
     public ?string $variablesPreview = null;
     public string $view = 'normal';
@@ -34,6 +34,9 @@ class All extends Component
             if ($item->is_shown_once) {
                 return "$item->key=(locked secret)";
             }
+            if ($item->is_multiline) {
+                return "$item->key=(multiline, edit in normal view)";
+            }
             return "$item->key=$item->value";
         })->sort()->join('
 ');
@@ -42,6 +45,9 @@ class All extends Component
                 if ($item->is_shown_once) {
                     return "$item->key=(locked secret)";
                 }
+                if ($item->is_multiline) {
+                    return "$item->key=(multiline, edit in normal view)";
+                }
                 return "$item->key=$item->value";
             })->sort()->join('
 ');
@@ -67,7 +73,7 @@ class All extends Component
                 $found = $this->resource->environment_variables()->where('key', $key)->first();
             }
             if ($found) {
-                if ($found->is_shown_once) {
+                if ($found->is_shown_once || $found->is_multiline) {
                     continue;
                 }
                 $found->value = $variable;
@@ -92,6 +98,7 @@ class All extends Component
                     }
                 }
                 $environment->is_build_time = false;
+                $environment->is_multiline = false;
                 $environment->is_preview = $isPreview ? true : false;
                 switch ($this->resource->type()) {
                     case 'application':
@@ -144,6 +151,7 @@ class All extends Component
             $environment->key = $data['key'];
             $environment->value = $data['value'];
             $environment->is_build_time = $data['is_build_time'];
+            $environment->is_multiline = $data['is_multiline'];
             $environment->is_preview = $data['is_preview'];
 
             switch ($this->resource->type()) {

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

@@ -21,6 +21,7 @@ class Show extends Component
         'env.key' => 'required|string',
         'env.value' => 'nullable',
         'env.is_build_time' => 'required|boolean',
+        'env.is_multiline' => 'required|boolean',
         'env.is_shown_once' => 'required|boolean',
         'env.real_value' => 'nullable',
     ];
@@ -28,6 +29,7 @@ class Show extends Component
         'env.key' => 'Key',
         'env.value' => 'Value',
         'env.is_build_time' => 'Build Time',
+        'env.is_multiline' => 'Multiline',
         'env.is_shown_once' => 'Shown Once',
     ];
 

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -10,29 +10,21 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
 {
     public string $command;
     public string $container;
-    public $containers;
+    public Collection $containers;
     public $parameters;
     public $resource;
     public string $type;
     public string $workDir = '';
     public Server $server;
-    public $servers = [];
-    public function getListeners()
-    {
-        return [
-            "serviceStatusChanged",
-        ];
-    }
-    public function serviceStatusChanged()
-    {
-        $this->getContainers();
-    }
+    public Collection $servers;
+
     protected $rules = [
         'server' => 'required',
         'container' => 'required',
@@ -43,20 +35,18 @@ class ExecuteContainerCommand extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->getContainers();
-    }
-    public function getContainers()
-    {
         $this->containers = collect();
+        $this->servers = collect();
         if (data_get($this->parameters, 'application_uuid')) {
             $this->type = 'application';
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
-            if ($containers->count() > 0) {
-                $containers->each(function ($container) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
-                });
+            if ($this->resource->destination->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->destination->server);
+            }
+            foreach ($this->resource->additional_servers as $server) {
+                if ($server->isFunctional()) {
+                    $this->servers = $this->servers->push($server);
+                }
             }
         } else if (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
@@ -77,47 +67,85 @@ class ExecuteContainerCommand extends Component
                 }
             }
             $this->resource = $resource;
-            $this->server = $this->resource->destination->server;
+            if ($this->resource->destination->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->destination->server);
+            }
             $this->container = $this->resource->uuid;
-            // if (!str(data_get($this,'resource.status'))->startsWith('exited')) {
-                $this->containers->push($this->container);
-            // }
+            $this->containers->push($this->container);
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                // if (str(data_get($application, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
             $this->resource->databases()->get()->each(function ($database) {
-                // if (str(data_get($database, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
-
-            $this->server = $this->resource->server;
+            if ($this->resource->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->server);
+            }
         }
         if ($this->containers->count() > 0) {
             $this->container = $this->containers->first();
         }
     }
+    public function loadContainers()
+    {
+        foreach ($this->servers as $server) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                if ($server->isSwarm()) {
+                    $containers = collect([
+                        [
+                            'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
+                        ]
+                    ]);
+                } else {
+                    $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
+                }
+                foreach ($containers as $container) {
+                    $payload = [
+                        'server' => $server,
+                        'container' => $container,
+                    ];
+                    $this->containers = $this->containers->push($payload);
+                }
+            } 
+        }
+        if ($this->containers->count() > 0) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->container = data_get($this->containers->first(), 'container.Names');
+            } elseif (data_get($this->parameters, 'database_uuid')) {
+                $this->container = $this->containers->first();
+            } elseif (data_get($this->parameters, 'service_uuid')) {
+                $this->container = $this->containers->first();
+            }
+        }
+    }
 
     public function runCommand()
     {
-        $this->validate();
         try {
-            if ($this->server->isForceDisabled()) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                $container = $this->containers->where('container.Names', $this->container)->first();
+                $container_name = data_get($container, 'container.Names');
+                if (is_null($container)) {
+                    throw new \RuntimeException('Container not found.');
+                }
+                $server = data_get($container, 'server');
+            } else {
+                $container_name = $this->container;
+                $server = $this->servers->first();
+            }
+            if ($server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }
-            // Wrap command to prevent escaped execution in the host.
             $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
-                $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
+                $exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}";
             } else {
-                $exec = "docker exec {$this->container} {$cmd}";
+                $exec = "docker exec {$container_name} {$cmd}";
             }
-            $activity = remote_process([$exec], $this->server, ignore_errors: true);
+            $activity = remote_process([$exec], $server, ignore_errors: true);
             $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Project/Shared/GetLogs.php

@@ -71,6 +71,9 @@ class GetLogs extends Component
     }
     public function getLogs($refresh = false)
     {
+        if (!$this->server->isFunctional()) {
+            return;
+        }
         if ($this->resource?->getMorphClass() === 'App\Models\Application') {
             if (str($this->container)->contains('-pr-')) {
                 $this->pull_request = "Pull Request: " . str($this->container)->afterLast('-pr-')->beforeLast('_')->value();
@@ -79,6 +82,9 @@ class GetLogs extends Component
             }
         }
         if (!$refresh && ($this->resource?->getMorphClass() === 'App\Models\Service' || str($this->container)->contains('-pr-'))) return;
+        if (!$this->numberOfLines) {
+            $this->numberOfLines = 1000;
+        }
         if ($this->container) {
             if ($this->showTimeStamps) {
                 if ($this->server->isSwarm()) {

app/Livewire/Project/Shared/Logs.php

@@ -10,84 +10,101 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Logs extends Component
 {
     public ?string $type = null;
     public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
-    public Server $server;
+    public Collection $servers;
+    public Collection $containers;
     public $container = [];
-    public $containers;
     public $parameters;
     public $query;
     public $status;
     public $serviceSubType;
 
-    public function mount()
+    public function loadContainers($server_id)
     {
-        $this->containers = collect();
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        if (data_get($this->parameters, 'application_uuid')) {
-            $this->type = 'application';
-            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            if ($this->server->isSwarm()) {
+        try {
+            $server = $this->servers->firstWhere('id', $server_id);
+            if (!$server->isFunctional()) {
+                return;
+            }
+            if ($server->isSwarm()) {
                 $containers = collect([
                     [
                         'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
                     ]
                 ]);
             } else {
-                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, includePullrequests: true);
+                $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
             }
-            if ($containers->count() > 0) {
-                $containers->each(function ($container) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
-                });
-            }
-            $this->containers = $this->containers->sortByDesc(function ($container) {
-                if (str_contains($container, '-pr-')) {
-                    return explode('-pr-', $container)[1];
+            $server->containers = $containers;
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        try {
+            $this->containers = collect();
+            $this->servers = collect();
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->type = 'application';
+                $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
                 }
-                return $container;
-            });
-        } else if (data_get($this->parameters, 'database_uuid')) {
-            $this->type = 'database';
-            $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
-            if (is_null($resource)) {
-                $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+                foreach ($this->resource->additional_servers as $server) {
+                    if ($server->isFunctional()) {
+                        $this->servers = $this->servers->push($server);
+                    }
+                }
+            } else if (data_get($this->parameters, 'database_uuid')) {
+                $this->type = 'database';
+                $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
                 if (is_null($resource)) {
-                    $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                    $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
                     if (is_null($resource)) {
-                        $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                        $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
                         if (is_null($resource)) {
-                            $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                            $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
                             if (is_null($resource)) {
-                                abort(404);
+                                $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                                if (is_null($resource)) {
+                                    abort(404);
+                                }
                             }
                         }
                     }
                 }
+                $this->resource = $resource;
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
+                }
+                $this->container = $this->resource->uuid;
+                $this->containers->push($this->container);
+            } else if (data_get($this->parameters, 'service_uuid')) {
+                $this->type = 'service';
+                $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+                $this->resource->applications()->get()->each(function ($application) {
+                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
+                });
+                $this->resource->databases()->get()->each(function ($database) {
+                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
+                });
+                if ($this->resource->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->server);
+                }
             }
-            $this->resource = $resource;
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            $this->container = $this->resource->uuid;
-            $this->containers->push($this->container);
-        } else if (data_get($this->parameters, 'service_uuid')) {
-            $this->type = 'service';
-            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-            $this->resource->applications()->get()->each(function ($application) {
-                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-            });
-            $this->resource->databases()->get()->each(function ($database) {
-                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-            });
-
-            $this->server = $this->resource->server;
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
     }
 

app/Livewire/Project/Shared/ResourceLimits.php

@@ -35,7 +35,7 @@ class ResourceLimits extends Component
             if (!$this->resource->limits_memory_swap) {
                 $this->resource->limits_memory_swap = "0";
             }
-            if (!$this->resource->limits_memory_swappiness) {
+            if (is_null($this->resource->limits_memory_swappiness)) {
                 $this->resource->limits_memory_swappiness = "60";
             }
             if (!$this->resource->limits_memory_reservation) {
@@ -47,7 +47,7 @@ class ResourceLimits extends Component
             if ($this->resource->limits_cpuset === "") {
                 $this->resource->limits_cpuset = null;
             }
-            if (!$this->resource->limits_cpu_shares) {
+            if (is_null($this->resource->limits_cpu_shares)) {
                 $this->resource->limits_cpu_shares = 1024;
             }
             $this->validate();

app/Livewire/Project/Shared/ResourceOperations.php

@@ -45,7 +45,7 @@ class ResourceOperations extends Component
                 'destination_id' => $new_destination->id,
             ]);
             $new_resource->save();
-            if ($new_resource->destination->server->proxyType() === 'TRAEFIK_V2') {
+            if ($new_resource->destination->server->proxyType() !== 'NONE') {
                 $customLabels = str(implode("|", generateLabelsApplication($new_resource)))->replace("|", "\n");
                 $new_resource->custom_labels = base64_encode($customLabels);
                 $new_resource->save();

app/Livewire/Project/Shared/ScheduledTask/Add.php

@@ -33,19 +33,23 @@ class Add extends Component
 
     public function submit()
     {
-        $this->validate();
-        $isValid = validate_cron_expression($this->frequency);
-        if (!$isValid) {
-            $this->dispatch('error', 'Invalid Cron / Human expression.');
-            return;
+        try {
+            $this->validate();
+            $isValid = validate_cron_expression($this->frequency);
+            if (!$isValid) {
+                $this->dispatch('error', 'Invalid Cron / Human expression.');
+                return;
+            }
+            $this->dispatch('saveScheduledTask', [
+                'name' => $this->name,
+                'command' => $this->command,
+                'frequency' => $this->frequency,
+                'container' => $this->container,
+            ]);
+            $this->clear();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
-        $this->dispatch('saveScheduledTask', [
-            'name' => $this->name,
-            'command' => $this->command,
-            'frequency' => $this->frequency,
-            'container' => $this->container,
-        ]);
-        $this->clear();
     }
 
     public function clear()

app/Livewire/Project/Shared/Tags.php

@@ -28,7 +28,7 @@ class Tags extends Component
     {
         try {
             if ($this->resource->tags()->where('id', $id)->exists()) {
-                $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$name</span> already added.");
+                $this->dispatch('error', 'Duplicate tags.', "Tag <span class='dark:text-warning'>$name</span> already added.");
                 return;
             }
             $this->resource->tags()->syncWithoutDetaching($id);
@@ -66,7 +66,7 @@ class Tags extends Component
             $tags = str($this->new_tag)->trim()->explode(' ');
             foreach ($tags as $tag) {
                 if ($this->resource->tags()->where('name', $tag)->exists()) {
-                    $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$tag</span> already added.");
+                    $this->dispatch('error', 'Duplicate tags.', "Tag <span class='dark:text-warning'>$tag</span> already added.");
                     continue;
                 }
                 $found = Tag::where(['name' => $tag, 'team_id' => currentTeam()->id])->first();

app/Livewire/RealtimeConnection.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use Livewire\Component;
-
-class RealtimeConnection extends Component
-{
-    public $checkConnection = false;
-    public $showNotification = false;
-    public $isNotificationEnabled = true;
-    public function render()
-    {
-        return view('livewire.realtime-connection');
-    }
-    public function disable()
-    {
-        auth()->user()->update(['is_notification_realtime_enabled' => false]);
-        $this->showNotification = false;
-    }
-    public function mount() {
-        $this->isNotificationEnabled = auth()->user()->is_notification_realtime_enabled;
-        $this->checkConnection = auth()->user()->id === 0;
-    }
-}

app/Livewire/Security/PrivateKey/Create.php

@@ -26,7 +26,7 @@ class Create extends Component
         'value' => 'private Key',
     ];
 
-    public function generateNewKey()
+    public function generateNewRSAKey()
     {
         try {
             $this->rateLimit(10);
@@ -37,6 +37,17 @@ class Create extends Component
             return handleError($e, $this);
         }
     }
+    public function generateNewEDKey()
+    {
+        try {
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey('ed25519');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function updated($updateProperty)
     {
         if ($updateProperty === 'value') {
@@ -67,7 +78,7 @@ class Create extends Component
                 'team_id' => currentTeam()->id
             ]);
             if ($this->from === 'server') {
-                return redirect()->route('server.create');
+                return redirect()->route('dashboard');
             }
             return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
         } catch (\Throwable $e) {

app/Livewire/Security/PrivateKey/Show.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class Show extends Component
 {
     public PrivateKey $private_key;
-    public $public_key;
+    public $public_key = "Loading...";
     protected $rules = [
         'private_key.name' => 'required|string',
         'private_key.description' => 'nullable|string',
@@ -25,11 +25,13 @@ class Show extends Component
     {
         try {
             $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
-            $this->public_key = $this->private_key->publicKey();
         }catch(\Throwable $e) {
             return handleError($e, $this);
         }
     }
+    public function loadPublicKey() {
+        $this->public_key = $this->private_key->publicKey();
+    }
     public function delete()
     {
         try {
@@ -50,6 +52,7 @@ class Show extends Component
             $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
             $this->private_key->save();
             refresh_server_connection($this->private_key);
+            $this->dispatch('success', 'Private key updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/ConfigureCloudflareTunnels.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Actions\Server\ConfigureCloudflared;
+use App\Models\Server;
+use Livewire\Component;
+
+class ConfigureCloudflareTunnels extends Component
+{
+    public $server_id;
+    public string $cloudflare_token;
+    public string $ssh_domain;
+    public function alreadyConfigured()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function submit()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            ConfigureCloudflared::run($server, $this->cloudflare_token);
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->ip = $this->ssh_domain;
+            $server->save();
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.configure-cloudflare-tunnels');
+    }
+}