Merge pull request #2129 from coollabsio/next

v4.0.0-beta.273

.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/pull_request_template.md

@@ -0,0 +1 @@
+> Always use `next` branch as destination branch for PRs, not `main`

.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:

.github/workflows/production-build.yml

@@ -3,6 +3,8 @@ name: Production Build (v4)
 on:
   push:
     branches: ["main"]
+    paths-ignore:
+      - templates/service-templates.json
 
 env:
   REGISTRY: ghcr.io

.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/knowledge-base/add-a-service).
 

README.md

@@ -28,14 +28,18 @@ 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 ($15+)
+## Github Sponsors ($40+)
 <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://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Corentin Clichy" /></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://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://www.uxwizz.com/?utm_source=coolify.io"><img width="60px" alt="UXWizz" src="https://github.com/UXWizz.png"/></a>
+<a href="https://github.com/Flowko"><img src="https://barrad.me/_ipx/f_webp&s_300x300/younes.jpg" width="60px" alt="Younes Barrad" /></a>
+<a href="https://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Automaze" /></a>
 <a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/Niki2k1"><img src="https://github.com/Niki2k1.png" width="60px" alt="Niklas Lausch" /></a>
 <a href="https://github.com/pixelinfinito"><img src="https://github.com/pixelinfinito.png" width="60px" alt="Pixel Infinito" /></a>

SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| > 4   | :white_check_mark: |
+| 3   | :x:                |
+
+
+## Reporting a Vulnerability
+
+If you have any vulnerability please report at hi@coollabs.io

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/StartClickhouse.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneClickhouse;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartClickhouse
+{
+    use AsAction;
+
+    public StandaloneClickhouse $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneClickhouse $database)
+    {
+        $this->database = $database;
+
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'ulimits' => [
+                        'nofile' => [
+                            'soft' => 262144,
+                            'hard' => 262144,
+                        ],
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => "clickhouse-client --password {$this->database->clickhouse_admin_password} --query 'SELECT 1'",
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (float) $this->database->limits_cpus,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->real_value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('CLICKHOUSE_ADMIN_USER'))->isEmpty()) {
+            $environment_variables->push("CLICKHOUSE_ADMIN_USER={$this->database->clickhouse_admin_user}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('CLICKHOUSE_ADMIN_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("CLICKHOUSE_ADMIN_PASSWORD={$this->database->clickhouse_admin_password}");
+        }
+
+        return $environment_variables->all();
+    }
+}

app/Actions/Database/StartDatabaseProxy.php

@@ -3,6 +3,9 @@
 namespace App\Actions\Database;
 
 use App\Models\ServiceDatabase;
+use App\Models\StandaloneClickhouse;
+use App\Models\StandaloneDragonfly;
+use App\Models\StandaloneKeydb;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -15,7 +18,7 @@ class StartDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse|ServiceDatabase $database)
     {
         $internalPort = null;
         $type = $database->getMorphClass();
@@ -25,7 +28,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) {
@@ -49,6 +53,18 @@ class StartDatabaseProxy
                     $type = 'App\Models\StandaloneRedis';
                     $containerName = "redis-{$database->service->uuid}";
                     break;
+                case 'standalone-keydb':
+                    $type = 'App\Models\StandaloneKeydb';
+                    $containerName = "keydb-{$database->service->uuid}";
+                    break;
+                case 'standalone-dragonfly':
+                    $type = 'App\Models\StandaloneDragonfly';
+                    $containerName = "dragonfly-{$database->service->uuid}";
+                    break;
+                case 'standalone-clickhouse':
+                    $type = 'App\Models\StandaloneClickhouse';
+                    $containerName = "clickhouse-{$database->service->uuid}";
+                    break;
             }
         }
         if ($type === 'App\Models\StandaloneRedis') {
@@ -61,6 +77,12 @@ class StartDatabaseProxy
             $internalPort = 3306;
         } else if ($type === 'App\Models\StandaloneMariadb') {
             $internalPort = 3306;
+        } else if ($type === 'App\Models\StandaloneKeydb') {
+            $internalPort = 6379;
+        } else if ($type === 'App\Models\StandaloneDragonfly') {
+            $internalPort = 6379;
+        } else if ($type === 'App\Models\StandaloneClickhouse') {
+            $internalPort = 9000;
         }
         $configuration_dir = database_proxy_dir($database->uuid);
         $nginxconf = <<<EOF
@@ -124,11 +146,12 @@ 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",
-            "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
-            "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
+            "echo '{$dockerfile_base64}' | base64 -d | tee $configuration_dir/Dockerfile > /dev/null",
+            "echo '{$nginxconf_base64}' | base64 -d | tee $configuration_dir/nginx.conf > /dev/null",
+            "echo '{$dockercompose_base64}' | base64 -d | tee $configuration_dir/docker-compose.yaml > /dev/null",
             "docker compose --project-directory {$configuration_dir} pull",
             "docker compose --project-directory {$configuration_dir} up --build -d",
         ], $server);

app/Actions/Database/StartDragonfly.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneDragonfly;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartDragonfly
+{
+    use AsAction;
+
+    public StandaloneDragonfly $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+
+    public function handle(StandaloneDragonfly $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "dragonfly --requirepass {$this->database->dragonfly_password}";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'ulimits' => [
+                        'memlock'=> '-1'
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => "redis-cli -a {$this->database->dragonfly_password} ping",
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (float) $this->database->limits_cpus,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->real_value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("REDIS_PASSWORD={$this->database->dragonfly_password}");
+        }
+
+        return $environment_variables->all();
+    }
+}

app/Actions/Database/StartKeydb.php

@@ -0,0 +1,174 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneKeydb;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartKeydb
+{
+    use AsAction;
+
+    public StandaloneKeydb $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+
+    public function handle(StandaloneKeydb $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "keydb-server --requirepass {$this->database->keydb_password} --appendonly yes";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_keydb();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => "keydb-cli --pass {$this->database->keydb_password} ping",
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (float) $this->database->limits_cpus,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->keydb_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/keydb.conf',
+                'target' => '/etc/keydb/keydb.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] = "keydb-server /etc/keydb/keydb.conf --requirepass {$this->database->keydb_password} --appendonly yes";
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->real_value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("REDIS_PASSWORD={$this->database->keydb_password}");
+        }
+
+        return $environment_variables->all();
+    }
+    private function add_custom_keydb()
+    {
+        if (is_null($this->database->keydb_conf)) {
+            return;
+        }
+        $filename = 'keydb.conf';
+        Storage::disk('local')->put("tmp/keydb.conf_{$this->database->uuid}", $this->database->keydb_conf);
+        $path = Storage::path("tmp/keydb.conf_{$this->database->uuid}");
+        instant_scp($path, "{$this->configuration_dir}/{$filename}", $this->database->destination->server);
+        Storage::disk('local')->delete("tmp/keydb.conf_{$this->database->uuid}");
+    }
+}

app/Actions/Database/StartMariadb.php

@@ -100,7 +100,7 @@ class StartMariadb
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
-        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -114,8 +114,12 @@ class StartMariadb
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }
@@ -167,6 +171,6 @@ class StartMariadb
         $filename = 'custom-config.cnf';
         $content = $this->database->mariadb_conf;
         $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
     }
 }

app/Actions/Database/StartMongodb.php

@@ -116,7 +116,7 @@ class StartMongodb
 
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
-        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -130,8 +130,12 @@ class StartMongodb
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }
@@ -180,13 +184,13 @@ class StartMongodb
         $filename = 'mongod.conf';
         $content = $this->database->mongo_conf;
         $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
     }
     private function add_default_database()
     {
         $content = "db = db.getSiblingDB(\"{$this->database->mongo_initdb_database}\");db.createCollection('init_collection');db.createUser({user: \"{$this->database->mongo_initdb_root_username}\", pwd: \"{$this->database->mongo_initdb_root_password}\",roles: [{role:\"readWrite\",db:\"{$this->database->mongo_initdb_database}\"}]});";
         $content_base64 = base64_encode($content);
         $this->commands[] = "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d";
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js > /dev/null";
     }
 }

app/Actions/Database/StartMysql.php

@@ -100,7 +100,7 @@ class StartMysql
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
-        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -114,8 +114,12 @@ class StartMysql
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }
@@ -167,6 +171,6 @@ class StartMysql
         $filename = 'custom-config.cnf';
         $content = $this->database->mysql_conf;
         $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
     }
 }

app/Actions/Database/StartPostgresql.php

@@ -122,7 +122,7 @@ class StartPostgresql
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
-        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -136,8 +136,12 @@ class StartPostgresql
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }
@@ -193,7 +197,7 @@ class StartPostgresql
             $filename = data_get($init_script, 'filename');
             $content = data_get($init_script, 'content');
             $content_base64 = base64_encode($content);
-            $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
+            $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/docker-entrypoint-initdb.d/{$filename} > /dev/null";
             $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
         }
     }
@@ -205,6 +209,6 @@ class StartPostgresql
         $filename = 'custom-postgres.conf';
         $content = $this->database->postgres_conf;
         $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
     }
 }

app/Actions/Database/StartRedis.php

@@ -111,7 +111,7 @@ class StartRedis
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
-        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -125,8 +125,12 @@ class StartRedis
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

app/Actions/Database/StopDatabase.php

@@ -2,7 +2,9 @@
 
 namespace App\Actions\Database;
 
-use App\Events\DatabaseStatusChanged;
+use App\Models\StandaloneClickhouse;
+use App\Models\StandaloneDragonfly;
+use App\Models\StandaloneKeydb;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -14,7 +16,7 @@ class StopDatabase
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $database)
     {
         $server = $database->destination->server;
         if (!$server->isFunctional()) {

app/Actions/Database/StopDatabaseProxy.php

@@ -3,6 +3,9 @@
 namespace App\Actions\Database;
 
 use App\Models\ServiceDatabase;
+use App\Models\StandaloneClickhouse;
+use App\Models\StandaloneDragonfly;
+use App\Models\StandaloneKeydb;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -14,13 +17,15 @@ class StopDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|ServiceDatabase|StandaloneDragonfly|StandaloneClickhouse $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,11 +11,16 @@ class CheckConfiguration
     use AsAction;
     public function handle(Server $server, bool $reset = false)
     {
-        $proxy_path = get_proxy_path();
-        $proxy_configuration = instant_remote_process([
+        $proxyType = $server->proxyType();
+        if ($proxyType === 'NONE') {
+            return 'OK';
+        }
+        $proxy_path = $server->proxyPath();
+        $payload = [
             "mkdir -p $proxy_path",
             "cat $proxy_path/docker-compose.yml",
-        ], $server, false);
+        ];
+        $proxy_configuration = instant_remote_process($payload, $server, false);
 
         if ($reset || !$proxy_configuration || is_null($proxy_configuration)) {
             $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;

app/Actions/Proxy/CheckProxy.php

@@ -10,6 +10,13 @@ class CheckProxy
     use AsAction;
     public function handle(Server $server, $fromUI = false)
     {
+        if ($server->proxyType() === 'NONE') {
+            return false;
+        }
+        ['uptime' => $uptime, 'error' => $error] = $server->validateConnection();
+        if (!$uptime) {
+            throw new \Exception($error);
+        }
         if (!$server->isProxyShouldRun()) {
             if ($fromUI) {
                 throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
@@ -32,6 +39,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 +53,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;
@@ -23,7 +23,7 @@ class SaveConfiguration
 
         return instant_remote_process([
             "mkdir -p $proxy_path",
-            "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
+            "echo '$docker_compose_yml_base64' | base64 -d | tee $proxy_path/docker-compose.yml > /dev/null",
         ], $server);
     }
 }

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");
@@ -27,15 +30,19 @@ class StartProxy
             $server->save();
             if ($server->isSwarm()) {
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
+                    "mkdir -p $proxy_path/dynamic",
+                    "cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Starting coolify-proxy.'",
-                    "cd $proxy_path && docker stack deploy -c docker-compose.yml coolify-proxy",
+                    "docker stack deploy -c docker-compose.yml coolify-proxy",
                     "echo 'Proxy started successfully.'"
                 ]);
             } else {
+                $caddfile = "import /dynamic/*.caddy";
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
+                    "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 +56,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,50 @@
+<?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 | tee docker-compose.yml > /dev/null",
+                "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;
+        } finally {
+            $commands = collect([
+                "rm -fr /tmp/cloudflared",
+            ]);
+            instant_remote_process($commands, $server);
+        }
+    }
+}

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';
@@ -48,20 +48,28 @@ class InstallDocker
             if ($supported_os_type->contains('debian')) {
                 $command = $command->merge([
                     "echo 'Installing Prerequisites...'",
-                    "command -v jq >/dev/null || apt-get update -y",
-                    "command -v jq >/dev/null || apt install -y curl wget git jq",
-
+                    "apt-get update -y",
+                    "command -v curl >/dev/null || apt install -y curl",
+                    "command -v wget >/dev/null || apt install -y wget",
+                    "command -v git >/dev/null || apt install -y git",
+                    "command -v jq >/dev/null || apt install -y jq",
                 ]);
             } else if ($supported_os_type->contains('rhel')) {
                 $command = $command->merge([
                     "echo 'Installing Prerequisites...'",
-                    "command -v jq >/dev/null || dnf install -y curl wget git jq",
+                    "command -v curl >/dev/null || dnf install -y curl",
+                    "command -v wget >/dev/null || dnf install -y wget",
+                    "command -v git >/dev/null || dnf install -y git",
+                    "command -v jq >/dev/null || dnf install -y jq",
                 ]);
             } else if ($supported_os_type->contains('sles')) {
                 $command = $command->merge([
                     "echo 'Installing Prerequisites...'",
-                    "command -v jq >/dev/null || zypper update -y",
-                    "command -v jq >/dev/null || zypper install -y curl wget git jq",
+                    "zypper update -y",
+                    "command -v curl >/dev/null || zypper install -y curl",
+                    "command -v wget >/dev/null || zypper install -y wget",
+                    "command -v git >/dev/null || zypper install -y git",
+                    "command -v jq >/dev/null || zypper install -y jq",
                 ]);
             } else {
                 throw new \Exception('Unsupported OS');
@@ -70,10 +78,13 @@ class InstallDocker
                 "echo 'Installing Docker Engine...'",
                 "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$dockerVersion}",
                 "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
-                "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
-                "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
-                "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
-                "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
+                "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-$(date +\"%Y%m%d-%H%M%S\")\"",
+                "test ! -s /etc/docker/daemon.json && echo '{$config}' | base64 -d | tee /etc/docker/daemon.json > /dev/null",
+                "echo '{$config}' | base64 -d | tee /etc/docker/daemon.json.coolify > /dev/null",
+                "jq . /etc/docker/daemon.json.coolify | tee /etc/docker/daemon.json.coolify.pretty > /dev/null",
+                "mv /etc/docker/daemon.json.coolify.pretty /etc/docker/daemon.json.coolify",
+                "jq -s '.[0] * .[1]' /etc/docker/daemon.json.coolify /etc/docker/daemon.json | tee /etc/docker/daemon.json.appended > /dev/null",
+                "mv /etc/docker/daemon.json.appended /etc/docker/daemon.json",
                 "echo 'Restarting Docker Engine...'",
                 "systemctl enable docker >/dev/null 2>&1 || true",
                 "systemctl restart docker",

app/Actions/Server/InstallLogDrain.php

@@ -168,10 +168,10 @@ Files:
             $command = [
                 "echo 'Saving configuration'",
                 "mkdir -p $config_path",
-                "echo '{$parsers}' | base64 -d > $parsers_config",
-                "echo '{$config}' | base64 -d > $fluent_bit_config",
-                "echo '{$compose}' | base64 -d > $compose_path",
-                "echo '{$readme}' | base64 -d > $readme_path",
+                "echo '{$parsers}' | base64 -d | tee $parsers_config > /dev/null",
+                "echo '{$config}' | base64 -d | tee $fluent_bit_config > /dev/null",
+                "echo '{$compose}' | base64 -d | tee $compose_path > /dev/null",
+                "echo '{$readme}' | base64 -d | tee $readme_path > /dev/null",
                 "test -f $config_path/.env && rm $config_path/.env",
 
             ];

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);
@@ -43,7 +45,6 @@ class UpdateCoolify
                 }
                 $this->update();
             }
-            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
         } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());
@@ -56,17 +57,32 @@ 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);
+            }
+            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
             return;
         }
     }

app/Actions/Service/StartService.php

@@ -16,7 +16,7 @@ class StartService
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
         $commands[] = "echo 'Creating Docker network.'";
-        $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid >/dev/null 2>&1 || true";
+        $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         $commands[] = "echo Starting service.";
         $commands[] = "echo 'Pulling images.'";
         $commands[] = "docker compose pull";

app/Console/Commands/CleanupApplicationDeploymentQueue.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\ApplicationDeploymentQueue;
+use Illuminate\Console\Command;
+
+class CleanupApplicationDeploymentQueue extends Command
+{
+    protected $signature = 'cleanup:application-deployment-queue {--team-id=}';
+    protected $description = 'CleanupApplicationDeploymentQueue';
+
+    public function handle()
+    {
+        $team_id = $this->option('team-id');
+        $servers = \App\Models\Server::where('team_id', $team_id)->get();
+        foreach ($servers as $server) {
+            $deployments = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->where("server_id", $server->id)->get();
+            foreach ($deployments as $deployment) {
+                $deployment->update(['status' => 'failed']);
+                instant_remote_process(['docker rm -f ' . $deployment->deployment_uuid], $server, false);
+            }
+        }
+    }
+}

app/Console/Commands/CleanupDatabase.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class CleanupDatabase extends Command
+{
+    protected $signature = 'cleanup:database {--yes}';
+    protected $description = 'Cleanup database';
+
+    public function handle()
+    {
+        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(1));
+        $count = $failed_jobs->count();
+        echo "Delete $count entries from failed_jobs.\n";
+        if ($this->option('yes')) {
+            $failed_jobs->delete();
+        }
+
+        // Cleanup sessions table
+        $sessions = DB::table('sessions')->where('last_activity', '<', now()->subDays($keep_days)->timestamp);
+        $count = $sessions->count();
+        echo "Delete $count entries from sessions.\n";
+        if ($this->option('yes')) {
+            $sessions->delete();
+        }
+
+        // Cleanup activity_log table
+        $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')) {
+            $activity_log->delete();
+        }
+
+        // Cleanup application_deployment_queues table
+        $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')) {
+            $application_deployment_queues->delete();
+        }
+
+        // Cleanup webhooks table
+        $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $webhooks->count();
+        echo "Delete $count entries from webhooks.\n";
+        if ($this->option('yes')) {
+            $webhooks->delete();
+        }
+
+    }
+}

app/Console/Commands/CleanupStuckedResources.php

@@ -7,6 +7,9 @@ use App\Models\ScheduledTask;
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
+use App\Models\StandaloneClickhouse;
+use App\Models\StandaloneDragonfly;
+use App\Models\StandaloneKeydb;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -55,6 +58,33 @@ class CleanupStuckedResources extends Command
         } catch (\Throwable $e) {
             echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
         }
+        try {
+            $keydbs = StandaloneKeydb::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($keydbs as $keydb) {
+                echo "Deleting stuck keydb: {$keydb->name}\n";
+                $keydb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck keydb: {$e->getMessage()}\n";
+        }
+        try {
+            $dragonflies = StandaloneDragonfly::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($dragonflies as $dragonfly) {
+                echo "Deleting stuck dragonfly: {$dragonfly->name}\n";
+                $dragonfly->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck dragonfly: {$e->getMessage()}\n";
+        }
+        try {
+            $clickhouses = StandaloneClickhouse::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($clickhouses as $clickhouse) {
+                echo "Deleting stuck clickhouse: {$clickhouse->name}\n";
+                $clickhouse->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck clickhouse: {$e->getMessage()}\n";
+        }
         try {
             $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($mongodbs as $mongodb) {

app/Console/Commands/CleanupUnreachableServers.php

@@ -8,15 +8,16 @@ use Illuminate\Console\Command;
 class CleanupUnreachableServers extends Command
 {
     protected $signature = 'cleanup:unreachable-servers';
-    protected $description = 'Cleanup Unreachable Servers (3 days)';
+    protected $description = 'Cleanup Unreachable Servers (7 days)';
 
     public function handle()
     {
         echo "Running unreachable server cleanup...\n";
-        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(3))->get();
+        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
         if ($servers->count() > 0) {
             foreach ($servers as $server) {
                 echo "Cleanup unreachable server ($server->id) with name $server->name";
+                send_internal_notification("Server $server->name is unreachable for 7 days. Cleaning up...");
                 $server->update([
                     'ip' => '1.2.3.4'
                 ]);

app/Console/Commands/Emails.php

@@ -2,10 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\DatabaseBackupStatusJob;
 use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
@@ -15,6 +17,7 @@ use App\Notifications\Application\DeploymentSuccess;
 use App\Notifications\Application\StatusChanged;
 use App\Notifications\Database\BackupFailed;
 use App\Notifications\Database\BackupSuccess;
+use App\Notifications\Database\DailyBackup;
 use App\Notifications\Test;
 use Exception;
 use Illuminate\Console\Command;
@@ -54,6 +57,8 @@ class Emails extends Command
             options: [
                 'updates' => 'Send Update Email to all users',
                 'emails-test' => 'Test',
+                'database-backup-statuses-daily' => 'Database - Backup Statuses (Daily)',
+                'application-deployment-success-daily' => 'Application - Deployment Success (Daily)',
                 'application-deployment-success' => 'Application - Deployment Success',
                 'application-deployment-failed' => 'Application - Deployment Failed',
                 'application-status-changed' => 'Application - Status Changed',
@@ -67,8 +72,12 @@ class Emails extends Command
             ],
         );
         $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
-        if (!in_array($type, $emailsGathered)) {
-            $this->email = text('Email Address to send to');
+        if (isDev()) {
+            $this->email = "test@example.com";
+        } else {
+            if (!in_array($type, $emailsGathered)) {
+                $this->email = text('Email Address to send to:');
+            }
         }
         set_transanctional_email_settings();
 
@@ -102,7 +111,7 @@ class Emails extends Command
                         $unsubscribeUrl = route('unsubscribe.marketing.emails', [
                             'token' => encrypt($email),
                         ]);
-                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->mail->view('emails.updates', ["unsubscribeUrl" => $unsubscribeUrl]);
                         $this->sendEmail($email);
                     }
                 }
@@ -111,6 +120,35 @@ class Emails extends Command
                 $this->mail = (new Test())->toMail();
                 $this->sendEmail();
                 break;
+            case 'database-backup-statuses-daily':
+                $scheduled_backups = ScheduledDatabaseBackup::all();
+                $databases = collect();
+                foreach ($scheduled_backups as $scheduled_backup) {
+                    $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+                    if ($last_days_backups->isEmpty()) {
+                        continue;
+                    }
+                    $failed = $last_days_backups->where('status', 'failed');
+                    $database = $scheduled_backup->database;
+                    $databases->put($database->name, [
+                        'failed_count' => $failed->count(),
+                    ]);
+                }
+                $this->mail = (new DailyBackup($databases))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-success-daily':
+                $applications = Application::all();
+                foreach ($applications as $application) {
+                    $deployments = $application->get_last_days_deployments();
+                    ray($deployments);
+                    if ($deployments->isEmpty()) {
+                        continue;
+                    }
+                    $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();
+                    $this->sendEmail();
+                }
+                break;
             case 'application-deployment-success':
                 $application = Application::all()->first();
                 $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();

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

@@ -20,6 +20,7 @@ class Init extends Command
     public function handle()
     {
         $this->alive();
+        get_public_ips();
         $full_cleanup = $this->option('full-cleanup');
         $cleanup_deployments = $this->option('cleanup-deployments');
         if ($cleanup_deployments) {
@@ -34,10 +35,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();
@@ -53,6 +57,7 @@ class Init extends Command
         $this->cleanup_stucked_helper_containers();
         $this->call('cleanup:stucked-resources');
     }
+
     private function restore_coolify_db_backup()
     {
         try {

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

@@ -73,6 +73,18 @@ class ServicesGenerate extends Command
         } else {
             $slogan = str($file)->headline()->value();
         }
+        $logo = collect(preg_grep('/^# logo:/', explode("\n", $content)))->values();
+        if ($logo->count() > 0) {
+            $logo = str($logo[0])->after('# logo:')->trim()->value();
+        } else {
+            $logo = 'svgs/unknown.svg';
+        }
+        $minversion = collect(preg_grep('/^# minversion:/', explode("\n", $content)))->values();
+        if ($minversion->count() > 0) {
+            $minversion = str($minversion[0])->after('# minversion:')->trim()->value();
+        } else {
+            $minversion = '0.0.0';
+        }
         $env_file = collect(preg_grep('/^# env_file:/', explode("\n", $content)))->values();
         if ($env_file->count() > 0) {
             $env_file = str($env_file[0])->after('# env_file:')->trim()->value();
@@ -88,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 = [
@@ -96,7 +114,12 @@ class ServicesGenerate extends Command
             'slogan' => $slogan,
             'compose' => $yaml,
             'tags' => $tags,
+            '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

@@ -4,7 +4,6 @@ namespace App\Console;
 
 use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
-use App\Jobs\ComplexContainerStatusJob;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\InstanceAutoUpdateJob;
@@ -32,8 +31,9 @@ class Kernel extends ConsoleKernel
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
             $this->check_scheduled_backups($schedule);
-            $this->pull_helper_image($schedule);
+            // $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
+            $schedule->command('uploads:clear')->everyTwoMinutes();
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
@@ -48,6 +48,9 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
+
+            $schedule->command('cleanup:database --yes')->daily();
+            $schedule->command('uploads:clear')->everyTwoMinutes();
         }
     }
     private function pull_helper_image($schedule)
@@ -80,7 +83,7 @@ class Kernel extends ConsoleKernel
     }
     private function instance_auto_update($schedule)
     {
-        if (isDev()) {
+        if (isDev() || isCloud()) {
             return;
         }
         $settings = InstanceSettings::get();
@@ -120,6 +123,9 @@ class Kernel extends ConsoleKernel
             return;
         }
         foreach ($scheduled_tasks as $scheduled_task) {
+            if ($scheduled_task->enabled === false) {
+                continue;
+            }
             $service = $scheduled_task->service;
             $application = $scheduled_task->application;
 

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

@@ -56,7 +56,7 @@ class Handler extends ExceptionHandler
     {
         $this->reportable(function (Throwable $e) {
             if (isDev()) {
-                // return;
+                return;
             }
             if ($e instanceof RuntimeException) {
                 return;
@@ -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

@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Actions\Database\StartClickhouse;
+use App\Actions\Database\StartDragonfly;
+use App\Actions\Database\StartKeydb;
 use App\Actions\Database\StartMariadb;
 use App\Actions\Database\StartMongodb;
 use App\Actions\Database\StartMysql;
@@ -9,13 +12,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 +47,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 +65,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 +92,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 +110,96 @@ 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\StandaloneKeydb') {
+            StartKeydb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message = "Database {$resource->name} started.";
+        } else if ($type === 'App\Models\StandaloneDragonfly') {
+            StartDragonfly::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message = "Database {$resource->name} started.";
+        } else if ($type === 'App\Models\StandaloneClickhouse') {
+            StartClickhouse::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $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/UploadController.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Http\JsonResponse;
+use Pion\Laravel\ChunkUpload\Exceptions\UploadFailedException;
+use Illuminate\Http\Request;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Pion\Laravel\ChunkUpload\Exceptions\UploadMissingFileException;
+use Pion\Laravel\ChunkUpload\Handler\AbstractHandler;
+use Pion\Laravel\ChunkUpload\Handler\HandlerFactory;
+use Pion\Laravel\ChunkUpload\Receiver\FileReceiver;
+
+class UploadController extends BaseController
+{
+    public function upload(Request $request)
+    {
+        $resource = getResourceByUuid(request()->route('databaseUuid'), data_get(auth()->user()->currentTeam(), 'id'));
+        if (is_null($resource)) {
+            return response()->json(['error' => 'You do not have permission for this database'], 500);
+        }
+        $receiver = new FileReceiver("file", $request, HandlerFactory::classFromRequest($request));
+
+        if ($receiver->isUploaded() === false) {
+            throw new UploadMissingFileException();
+        }
+
+        $save = $receiver->receive();
+
+        if ($save->isFinished()) {
+            return $this->saveFile($save->getFile(), $resource);
+        }
+
+        $handler = $save->handler();
+        return response()->json([
+            "done" => $handler->getPercentageDone(),
+            'status' => true
+        ]);
+    }
+    // protected function saveFileToS3($file)
+    // {
+    //     $fileName = $this->createFilename($file);
+
+    //     $disk = Storage::disk('s3');
+    //     // It's better to use streaming Streaming (laravel 5.4+)
+    //     $disk->putFileAs('photos', $file, $fileName);
+
+    //     // for older laravel
+    //     // $disk->put($fileName, file_get_contents($file), 'public');
+    //     $mime = str_replace('/', '-', $file->getMimeType());
+
+    //     // We need to delete the file when uploaded to s3
+    //     unlink($file->getPathname());
+
+    //     return response()->json([
+    //         'path' => $disk->url($fileName),
+    //         'name' => $fileName,
+    //         'mime_type' => $mime
+    //     ]);
+    // }
+    protected function saveFile(UploadedFile $file, $resource)
+    {
+        $mime = str_replace('/', '-', $file->getMimeType());
+        $filePath = "upload/{$resource->uuid}";
+        $finalPath = storage_path("app/" . $filePath);
+        $file->move($finalPath, 'restore');
+
+        return response()->json([
+            'mime_type' => $mime
+        ]);
+    }
+    protected function createFilename(UploadedFile $file)
+    {
+        $extension = $file->getClientOriginalExtension();
+        $filename = str_replace("." . $extension, "", $file->getClientOriginalName()); // Filename without extension
+
+        $filename .= "_" . md5(time()) . "." . $extension;
+
+        return $filename;
+    }
+}

app/Http/Controllers/Webhook/Bitbucket.php

@@ -0,0 +1,186 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Livewire\Project\Service\Storage;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Visus\Cuid2\Cuid2;
+
+class Bitbucket extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Bitbicket::manual_bitbucket", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_bitbucket_token = data_get($headers, 'x-hub-signature.0', "");
+            $x_bitbucket_event = data_get($headers, 'x-event-key.0', "");
+            $handled_events = collect(['repo:push', 'pullrequest:created', 'pullrequest:rejected', 'pullrequest:fulfilled']);
+            if (!$handled_events->contains($x_bitbucket_event)) {
+                return response([
+                    'status' => 'failed',
+                    'message' => 'Nothing to do. Event not handled.',
+                ]);
+            }
+            if ($x_bitbucket_event === 'repo:push') {
+                $branch = data_get($payload, 'push.changes.0.new.name');
+                $full_name = data_get($payload, 'repository.full_name');
+
+                if (!$branch) {
+                    return response([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                }
+                ray('Manual webhook bitbucket push event with branch: ' . $branch);
+            }
+            if ($x_bitbucket_event === 'pullrequest:created' || $x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                $branch = data_get($payload, 'pullrequest.destination.branch.name');
+                $base_branch = data_get($payload, 'pullrequest.source.branch.name');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'pullrequest.id');
+                $pull_request_html_url = data_get($payload, 'pullrequest.links.html.href');
+                $commit = data_get($payload, 'pullrequest.source.commit.hash');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            $applications = $applications->where('git_branch', $branch)->get();
+            if ($applications->isEmpty()) {
+                return response([
+                    'status' => 'failed',
+                    'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                ]);
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_bitbucket');
+                $payload = $request->getContent();
+
+                list($algo, $hash) = explode('=', $x_bitbucket_token, 2);
+                $payloadHash = hash_hmac($algo, $payload, $webhook_secret);
+                if (!hash_equals($hash, $payloadHash) && !isDev()) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_bitbucket_event === 'repo: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' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Auto deployment disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:created') {
+                    if ($application->isPRDeployable()) {
+                        ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                        $deployment_uuid = new Cuid2(7);
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if (!$found) {
+                            ApplicationPreview::create([
+                                'git_type' => 'bitbucket',
+                                'application_id' => $application->id,
+                                'pull_request_id' => $pull_request_id,
+                                'pull_request_html_url' => $pull_request_html_url,
+                            ]);
+                        }
+                        queue_application_deployment(
+                            application: $application,
+                            pull_request_id: $pull_request_id,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            commit: $commit,
+                            is_webhook: true,
+                            git_type: 'bitbucket'
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Preview deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                    ray('Pull request rejected');
+                    $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                    if ($found) {
+                        $found->delete();
+                        $container_name = generateApplicationContainerName($application, $pull_request_id);
+                        instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment closed.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No preview deployment found.',
+                        ]);
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e);
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Github.php

@@ -0,0 +1,501 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Enums\ProcessStatus;
+use App\Http\Controllers\Controller;
+use App\Jobs\ApplicationPullRequestUpdateJob;
+use App\Jobs\GithubAppPermissionJob;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\GithubApp;
+use App\Models\PrivateKey;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Github extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            $return_payloads = collect([]);
+            $x_github_delivery = request()->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::manual_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $content_type = $request->header('Content-Type');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+
+            if ($content_type !== 'application/json') {
+                $payload = json_decode(data_get($payload, 'payload'), true);
+            }
+            if ($x_github_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'repository.full_name');
+                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') {
+                $action = data_get($payload, 'action');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$branch) {
+                return response('Nothing to do. No branch found in the request.');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_github');
+                $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+                if (!hash_equals($x_hub_signature_256, $hmac) && !isDev()) {
+                    ray('Invalid signature');
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        $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([
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function normal(Request $request)
+    {
+        try {
+            $return_payloads = collect([]);
+            $id = null;
+            $x_github_delivery = $request->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::normal_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_github_hook_installation_target_id = $request->header('X-GitHub-Hook-Installation-Target-Id');
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+            $github_app = GithubApp::where('app_id', $x_github_hook_installation_target_id)->first();
+            if (is_null($github_app)) {
+                return response('Nothing to do. No GitHub App found.');
+            }
+            $webhook_secret = data_get($github_app, 'webhook_secret');
+            $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+            if (config('app.env') !== 'local') {
+                if (!hash_equals($x_hub_signature_256, $hmac)) {
+                    return response('Invalid signature.');
+                }
+            }
+            if ($x_github_event === 'installation' || $x_github_event === 'installation_repositories') {
+                // Installation handled by setup redirect url. Repositories queried on-demand.
+                $action = data_get($payload, 'action');
+                if ($action === 'new_permissions_accepted') {
+                    GithubAppPermissionJob::dispatch($github_app);
+                }
+                return response('cool');
+            }
+            if ($x_github_event === 'push') {
+                $id = data_get($payload, 'repository.id');
+                $branch = data_get($payload, 'ref');
+                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') {
+                $action = data_get($payload, 'action');
+                $id = data_get($payload, 'repository.id');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event: ' . $id . ' with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$id || !$branch) {
+                return response('Nothing to do. No id or branch found.');
+            }
+            $applications = Application::where('repository_project_id', $id)->whereRelation('source', 'is_public', false);
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$branch'.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+
+            foreach ($applications as $application) {
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                        'application_uuid' => $application->uuid,
+                        'application_name' => $application->name,
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        $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([
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            ApplicationPullRequestUpdateJob::dispatchSync(application: $application, preview: $found, status: ProcessStatus::CLOSED);
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function redirect(Request $request)
+    {
+        try {
+            $code = $request->get('code');
+            $state = $request->get('state');
+            $github_app = GithubApp::where('uuid', $state)->firstOrFail();
+            $api_url = data_get($github_app, 'api_url');
+            $data = Http::withBody(null)->accept('application/vnd.github+json')->post("$api_url/app-manifests/$code/conversions")->throw()->json();
+            $id = data_get($data, 'id');
+            $slug = data_get($data, 'slug');
+            $client_id = data_get($data, 'client_id');
+            $client_secret = data_get($data, 'client_secret');
+            $private_key = data_get($data, 'pem');
+            $webhook_secret = data_get($data, 'webhook_secret');
+            $private_key = PrivateKey::create([
+                'name' => $slug,
+                'private_key' => $private_key,
+                'team_id' => $github_app->team_id,
+                'is_git_related' => true,
+            ]);
+            $github_app->name = $slug;
+            $github_app->app_id = $id;
+            $github_app->client_id = $client_id;
+            $github_app->client_secret = $client_secret;
+            $github_app->webhook_secret = $webhook_secret;
+            $github_app->private_key_id = $private_key->id;
+            $github_app->save();
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+    public function install(Request $request)
+    {
+        try {
+            $installation_id = $request->get('installation_id');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::install_{$installation_id}", $json);
+                return;
+            }
+            $source = $request->get('source');
+            $setup_action = $request->get('setup_action');
+            $github_app = GithubApp::where('uuid', $source)->firstOrFail();
+            if ($setup_action === 'install') {
+                $github_app->installation_id = $installation_id;
+                $github_app->save();
+            }
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Gitlab.php

@@ -0,0 +1,228 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Gitlab extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitlab::manual_gitlab", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_gitlab_token = data_get($headers, 'x-gitlab-token.0');
+            $x_gitlab_event = data_get($payload, 'object_kind');
+            if ($x_gitlab_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    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') {
+                $action = data_get($payload, 'object_attributes.action');
+                $branch = data_get($payload, 'object_attributes.source_branch');
+                $base_branch = data_get($payload, 'object_attributes.target_branch');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                $pull_request_id = data_get($payload, 'object_attributes.iid');
+                $pull_request_html_url = data_get($payload, 'object_attributes.url');
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    return response($return_payloads);
+                }
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_gitlab_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            if ($x_gitlab_event === 'merge_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with branch '$base_branch'.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_gitlab');
+                if ($webhook_secret !== $x_gitlab_token) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_gitlab_event === 'push') {
+                    if ($application->isDeployable()) {
+                        $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([
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
+                        ]);
+                        ray('Deployments disabled for ' . $application->name);
+                    }
+                }
+                if ($x_gitlab_event === 'merge_request') {
+                    if ($action === 'open' || $action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'gitlab',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'gitlab'
+                            );
+                            ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment queued',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled',
+                            ]);
+                            ray('Preview deployments disabled for ' . $application->name);
+                        }
+                    } else if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment closed',
+                            ]);
+                            return response($return_payloads);
+                        }
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No Preview Deployment found',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No action found. Contact us for debugging.',
+                        ]);
+                    }
+                }
+            }
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Stripe.php

@@ -0,0 +1,262 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Jobs\ServerLimitCheckJob;
+use App\Jobs\SubscriptionInvoiceFailedJob;
+use App\Jobs\SubscriptionTrialEndedJob;
+use App\Jobs\SubscriptionTrialEndsSoonJob;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\Webhook;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Sleep;
+use Illuminate\Support\Str;
+
+class Stripe extends Controller
+{
+    public function events(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
+                return;
+            }
+            $webhookSecret = config('subscription.stripe_webhook_secret');
+            $signature = $request->header('Stripe-Signature');
+            $excludedPlans = config('subscription.stripe_excluded_plans');
+            $event = \Stripe\Webhook::constructEvent(
+                $request->getContent(),
+                $signature,
+                $webhookSecret
+            );
+            $webhook = Webhook::create([
+                'type' => 'stripe',
+                'payload' => $request->getContent()
+            ]);
+            $type = data_get($event, 'type');
+            $data = data_get($event, 'data.object');
+            switch ($type) {
+                case 'checkout.session.completed':
+                    $clientReferenceId = data_get($data, 'client_reference_id');
+                    if (is_null($clientReferenceId)) {
+                        send_internal_notification('Checkout session completed without client reference id.');
+                        break;
+                    }
+                    $userId = Str::before($clientReferenceId, ':');
+                    $teamId = Str::after($clientReferenceId, ':');
+                    $subscriptionId = data_get($data, 'subscription');
+                    $customerId = data_get($data, 'customer');
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (!$found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                        throw new Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        send_internal_notification('Old subscription activated for team: ' . $teamId);
+                        $subscription->update([
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        send_internal_notification('New subscription for team: ' . $teamId);
+                        Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    }
+                    break;
+                case 'invoice.paid':
+                    $customerId = data_get($data, 'customer');
+                    $planId = data_get($data, 'lines.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    }
+                    $subscription->update([
+                        'stripe_invoice_paid' => true,
+                    ]);
+                    break;
+                case 'invoice.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: ' . $customerId);
+                        return response('No team found in Coolify.');
+                    }
+                    if (!$subscription->stripe_invoice_paid) {
+                        SubscriptionInvoiceFailedJob::dispatch($team);
+                        send_internal_notification('Invoice payment failed: ' . $customerId);
+                    } else {
+                        send_internal_notification('Invoice payment failed but already paid: ' . $customerId);
+                    }
+                    break;
+                case 'payment_intent.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    if ($subscription->stripe_invoice_paid) {
+                        send_internal_notification('payment_intent.payment_failed but invoice is active for customer: ' . $customerId);
+                        return;
+                    }
+                    send_internal_notification('Subscription payment failed for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.updated':
+                    $customerId = data_get($data, 'customer');
+                    $status = data_get($data, 'status');
+                    $subscriptionId = data_get($data, 'items.data.0.subscription');
+                    $planId = data_get($data, 'items.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    }
+                    if (!$subscription) {
+                        send_internal_notification('No subscription found for: ' . $customerId);
+                        return response("No subscription found", 400);
+                    }
+                    $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
+                    $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
+                    $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
+                    $feedback = data_get($data, 'cancellation_details.feedback');
+                    $comment = data_get($data, 'cancellation_details.comment');
+                    $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                    if (str($lookup_key)->contains('ultimate') || str($lookup_key)->contains('dynamic')) {
+                        if (str($lookup_key)->contains('dynamic')) {
+                            $quantity = data_get($data, 'items.data.0.quantity', 2);
+                        } else {
+                            $quantity = data_get($data, 'items.data.0.quantity', 10);
+                        }
+                        $team = data_get($subscription, 'team');
+                        $team->update([
+                            'custom_server_limit' => $quantity,
+                        ]);
+                        ServerLimitCheckJob::dispatch($team);
+                    }
+                    $subscription->update([
+                        'stripe_feedback' => $feedback,
+                        'stripe_comment' => $comment,
+                        'stripe_plan_id' => $planId,
+                        'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
+                    ]);
+                    if ($status === 'paused' || $status === 'incomplete_expired') {
+                        $subscription->update([
+                            'stripe_invoice_paid' => false,
+                        ]);
+                        send_internal_notification('Subscription paused or incomplete for customer: ' . $customerId);
+                    }
+
+                    // Trial ended but subscribed, reactive servers
+                    if ($trialEndedAlready && $status === 'active') {
+                        $team = data_get($subscription, 'team');
+                        $team->trialEndedButSubscribed();
+                    }
+
+                    if ($feedback) {
+                        $reason = "Cancellation feedback for {$customerId}: '" . $feedback . "'";
+                        if ($comment) {
+                            $reason .= ' with comment: \'' . $comment . "'";
+                        }
+                        send_internal_notification($reason);
+                    }
+                    if ($alreadyCancelAtPeriodEnd !== $cancelAtPeriodEnd) {
+                        if ($cancelAtPeriodEnd) {
+                            // send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
+                        } else {
+                            send_internal_notification('customer.subscription.updated for customer: ' . $customerId);
+                        }
+                    }
+                    break;
+                case 'customer.subscription.deleted':
+                    // End subscription
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_subscription_id' => null,
+                        'stripe_plan_id' => null,
+                        'stripe_cancel_at_period_end' => false,
+                        'stripe_invoice_paid' => false,
+                        'stripe_trial_already_ended' => true,
+                    ]);
+                    send_internal_notification('customer.subscription.deleted for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.trial_will_end':
+                    // Not used for now
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    SubscriptionTrialEndsSoonJob::dispatch($team);
+                    break;
+                case 'customer.subscription.paused':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_trial_already_ended' => true,
+                        'stripe_invoice_paid' => false,
+                    ]);
+                    SubscriptionTrialEndedJob::dispatch($team);
+                    send_internal_notification('Subscription paused for customer: ' . $customerId);
+                    break;
+                default:
+                    // Unhandled event type
+            }
+        } catch (Exception $e) {
+            if ($type !== 'payment_intent.payment_failed') {
+                send_internal_notification("Subscription webhook ($type) failed: " . $e->getMessage());
+            }
+            $webhook->update([
+                'status' => 'failed',
+                'failure_reason' => $e->getMessage(),
+            ]);
+            return response($e->getMessage(), 400);
+        }
+    }
+}

app/Http/Controllers/Webhook/Waitlist.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Waitlist as ModelsWaitlist;
+use Exception;
+use Illuminate\Http\Request;
+
+class Waitlist extends Controller
+{
+    public function confirm(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        ray($email, $confirmation_code);
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found) {
+                if (!$found->verified) {
+                    if ($found->created_at > now()->subMinutes(config('constants.waitlist.expiration'))) {
+                        $found->verified = true;
+                        $found->save();
+                        send_internal_notification('Waitlist confirmed: ' . $email);
+                        return 'Thank you for confirming your email address. We will notify you when you are next in line.';
+                    } else {
+                        $found->delete();
+                        send_internal_notification('Waitlist expired: ' . $email);
+                        return 'Your confirmation code has expired. Please sign up again.';
+                    }
+                }
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist confirmation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+    public function cancel(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found && !$found->verified) {
+                $found->delete();
+                send_internal_notification('Waitlist cancelled: ' . $email);
+                return 'Your email address has been removed from the waitlist.';
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist cancellation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+}

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,12 +43,12 @@ 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);
         }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
+        if (isSubscriptionActive() && $request->routeIs('subscription.index')) {
             return redirect(RouteServiceProvider::HOME);
         }
         return $next($request);

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -12,6 +12,7 @@ class PreventRequestsDuringMaintenance extends Middleware
      * @var array<int, string>
      */
     protected $except = [
-        //
+        'webhooks/*',
+        '/api/health'
     ];
 }

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -30,6 +30,9 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
+            if ($this->application->is_public_repository()) {
+                return;
+            }
             if ($this->status === ProcessStatus::CLOSED) {
                 $this->delete_comment();
                 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;
@@ -43,22 +44,23 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle()
     {
-        $applications = $this->server->applications();
-        foreach ($applications as $application) {
-            if ($application->additional_servers->count() > 0) {
-                $is_main_server = $application->destination->server->id === $this->server->id;
-                if ($is_main_server) {
-                    ComplexStatusCheck::run($application);
-                    $applications = $applications->filter(function ($value, $key) use ($application) {
-                        return $value->id !== $application->id;
-                    });
-                }
-            }
-        }
-
         if (!$this->server->isFunctional()) {
             return 'Server is not ready.';
         };
+        $applications = $this->server->applications();
+        $skip_these_applications = collect([]);
+        foreach ($applications as $application) {
+            if ($application->additional_servers->count() > 0) {
+                $skip_these_applications->push($application);
+                ComplexStatusCheck::run($application);
+                $applications = $applications->filter(function ($value, $key) use ($application) {
+                    return $value->id !== $application->id;
+                });
+            }
+        }
+        $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
+            return !$skip_these_applications->pluck('id')->contains($value->id);
+        });
         try {
             if ($this->server->isSwarm()) {
                 $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
@@ -75,6 +77,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             if (is_null($containers)) {
                 return;
             }
+
             $containers = format_docker_command_output_to_json($containers);
             if ($containerReplicates) {
                 $containerReplicates = format_docker_command_output_to_json($containerReplicates);
@@ -147,30 +150,56 @@ 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') {

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([
@@ -286,7 +289,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($this->backup->save_s3) {
                         $this->upload_to_s3();
                     }
-                    $this->team?->notify(new BackupSuccess($this->backup, $this->database));
+                    $this->team?->notify(new BackupSuccess($this->backup, $this->database, $database));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,
@@ -302,8 +305,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                         ]);
                     }
                     send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
-                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
-                    throw $e;
+                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output, $database));
                 }
             }
         } catch (\Throwable $e) {
@@ -316,10 +318,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
-            $url = $this->database->getDbUrl(useInternal: true);
+            ray($this->database->toArray());
+            $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";
+                if (str($this->database->image)->startsWith('mongo:4.0')) {
+                    $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --archive > $this->backup_location";
+                } else {
+                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";
+                }
             } else {
                 if (str($databaseWithCollections)->contains(':')) {
                     $databaseName = str($databaseWithCollections)->before(':');
@@ -330,9 +337,17 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $commands[] = "mkdir -p " . $this->backup_dir;
                 if ($collectionsToExclude->count() === 0) {
-                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --archive > $this->backup_location";
+                    if (str($this->database->image)->startsWith('mongo:4.0')) {
+                        $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --archive > $this->backup_location";
+                    } else {
+                        $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --archive > $this->backup_location";
+                    }
                 } else {
-                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    if (str($this->database->image)->startsWith('mongo:4.0')) {
+                        $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    } else {
+                        $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    }
                 }
             }
             $this->backup_output = instant_remote_process($commands, $this->server);

app/Jobs/DatabaseBackupStatusJob.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\Team;
+use App\Notifications\Database\DailyBackup;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class DatabaseBackupStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public function __construct()
+    {
+    }
+
+    public function handle()
+    {
+        // $teams = Team::all();
+        // foreach ($teams as $team) {
+        //     $scheduled_backups = $team->scheduledDatabaseBackups()->get();
+        //     if ($scheduled_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     foreach ($scheduled_backups as $scheduled_backup) {
+        //         $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //         if ($last_days_backups->isEmpty()) {
+        //             continue;
+        //         }
+        //         $failed = $last_days_backups->where('status', 'failed');
+        //     }
+        // }
+
+
+
+
+
+
+
+
+        // $scheduled_backups = ScheduledDatabaseBackup::all();
+        // $databases = collect();
+        // $teams = collect();
+        // foreach ($scheduled_backups as $scheduled_backup) {
+        //     $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //     if ($last_days_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     $failed = $last_days_backups->where('status', 'failed');
+        //     $database = $scheduled_backup->database;
+        //     $team = $database->team();
+        //     $teams->put($team->id, $team);
+        //     $databases->put("{$team->id}:{$database->name}", [
+        //         'failed_count' => $failed->count(),
+        //     ]);
+        // }
+        // foreach ($databases as $name => $database) {
+        //     [$team_id, $name] = explode(':', $name);
+        //     $team = $teams->get($team_id);
+        //     $team?->notify(new DailyBackup($databases));
+        // }
+    }
+}

app/Jobs/DeleteResourceJob.php

@@ -8,6 +8,9 @@ use App\Actions\Service\DeleteService;
 use App\Actions\Service\StopService;
 use App\Models\Application;
 use App\Models\Service;
+use App\Models\StandaloneClickhouse;
+use App\Models\StandaloneDragonfly;
+use App\Models\StandaloneKeydb;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -25,7 +28,7 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public function __construct(public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource)
+    public function __construct(public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource, public bool $deleteConfigurations = false)
     {
     }
 
@@ -42,6 +45,9 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                 case 'standalone-mongodb':
                 case 'standalone-mysql':
                 case 'standalone-mariadb':
+                case 'standalone-keydb':
+                case 'standalone-dragonfly':
+                case 'standalone-clickhouse':
                     StopDatabase::run($this->resource);
                     break;
                 case 'service':
@@ -49,6 +55,9 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                     DeleteService::run($this->resource);
                     break;
             }
+            if ($this->deleteConfigurations) {
+                $this->resource?->delete_configurations();
+            }
         } catch (\Throwable $e) {
             ray($e->getMessage());
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());

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/GithubAppPermissionJob.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\GithubApp;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+
+class GithubAppPermissionJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public GithubApp $github_app)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->github_app->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->github_app->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $github_access_token = generate_github_jwt_token($this->github_app);
+            $response = Http::withHeaders([
+                'Authorization' => "Bearer $github_access_token",
+                'Accept' => 'application/vnd.github+json'
+            ])->get("{$this->github_app->api_url}/app");
+            $response = $response->json();
+            $permissions = data_get($response, 'permissions');
+            $this->github_app->contents = data_get($permissions, 'contents');
+            $this->github_app->metadata = data_get($permissions, 'metadata');
+            $this->github_app->pull_requests = data_get($permissions, 'pull_requests');
+            $this->github_app->administration = data_get($permissions, 'administration');
+            $this->github_app->save();
+            $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
+        } catch (\Throwable $e) {
+            send_internal_notification('GithubAppPermissionJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/InstanceAutoUpdateJob.php

@@ -15,7 +15,8 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 120;
+    public $timeout = 600;
+    public $tries = 1;
 
     public function __construct(private bool $force = false)
     {
@@ -23,6 +24,6 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 
     public function handle(): void
     {
-        UpdateCoolify::run($this->force);
+        UpdateCoolify::run(force: $this->force, async: false);
     }
 }

app/Jobs/SendMessageToDiscordJob.php

@@ -20,11 +20,12 @@ class SendMessageToDiscordJob implements ShouldQueue, ShouldBeEncrypted
      * @var int
      */
     public $tries = 5;
+    public $backoff = 10;
 
     /**
      * The maximum number of unhandled exceptions to allow before failing.
      */
-    public int $maxExceptions = 3;
+    public int $maxExceptions = 5;
 
     public function __construct(
         public string $text,

app/Jobs/SendMessageToTelegramJob.php

@@ -57,7 +57,7 @@ class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         $payload = [
-            'parse_mode' => 'markdown',
+            // 'parse_mode' => 'markdown',
             'reply_markup' => json_encode([
                 'inline_keyboard' => [
                     [...$inlineButtons],

app/Jobs/ServerFilesFromServerJob.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Application;
+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|Application $resource)
+    {
+    }
+    public function handle()
+    {
+        $this->resource->getFilesFromServer(isInit: true);
+    }
+}

app/Jobs/ServerLimitCheckJob.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use App\Notifications\Server\ForceDisabled;
+use App\Notifications\Server\ForceEnabled;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerLimitCheckJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public Team $team)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->team->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->team->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $servers = $this->team->servers;
+            $servers_count = $servers->count();
+            $limit = $this->team->limits['serverLimit'];
+            $number_of_servers_to_disable = $servers_count - $limit;
+            ray('ServerLimitCheckJob', $this->team->uuid, $servers_count, $limit, $number_of_servers_to_disable);
+            if ($number_of_servers_to_disable > 0) {
+                ray('Disabling servers');
+                $servers = $servers->sortbyDesc('created_at');
+                $servers_to_disable = $servers->take($number_of_servers_to_disable);
+                $servers_to_disable->each(function ($server) {
+                    $server->forceDisableServer();
+                    $this->team->notify(new ForceDisabled($server));
+                });
+            } else if ($number_of_servers_to_disable === 0) {
+                $servers->each(function ($server) {
+                    if ($server->isForceDisabled()) {
+                        $server->forceEnableServer();
+                        $this->team->notify(new ForceEnabled($server));
+                    }
+                });
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerLimitCheckJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Jobs/ServerStatusJob.php

@@ -38,20 +38,12 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         if (!$this->server->isServerReady($this->tries)) {
-            throw new \RuntimeException('Server is not ready.');
+           return "Server is not ready yet.";
         };
         try {
-            // $this->server->validateConnection();
-            // $this->server->validateOS();
-            // $docker_installed = $this->server->validateDockerEngine();
-            // if (!$docker_installed) {
-            //     $this->server->installDocker();
-            //     $this->server->validateDockerEngine();
-            // }
-
-            // $this->server->validateDockerEngineVersion();
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
+                $this->removeCoolifyYaml();
             }
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
@@ -59,6 +51,16 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
             return handleError($e);
         }
     }
+    private function removeCoolifyYaml()
+    {
+        // This will remote the coolify.yaml file from the server as it is not needed on cloud servers
+        if (isCloud() && $this->server->id !== 0) {
+            $file = $this->server->proxyPath() . "/dynamic/coolify.yaml";
+            return instant_remote_process([
+                "rm -f $file",
+            ], $this->server, false);
+        }
+    }
     public function cleanup(bool $notify = false): void
     {
         $this->disk_usage = $this->server->getDiskUsage();

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/MaintenanceModeDisabledNotification.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Foundation\Events\MaintenanceModeDisabled as EventsMaintenanceModeDisabled;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
+
+class MaintenanceModeDisabledNotification
+{
+    public function __construct()
+    {
+    }
+
+    public function handle(EventsMaintenanceModeDisabled $event): void
+    {
+        ray('Maintenance mode disabled!');
+        $files = Storage::disk('webhooks-during-maintenance')->files();
+        $files = collect($files);
+        $files = $files->sort();
+        foreach ($files as $file) {
+            $content = Storage::disk('webhooks-during-maintenance')->get($file);
+            $data = json_decode($content, true);
+            $symfonyRequest = new SymfonyRequest(
+                $data['query'],
+                $data['request'],
+                $data['attributes'],
+                $data['cookies'],
+                $data['files'],
+                $data['server'],
+                $data['content']
+            );
+
+            foreach ($data['headers'] as $key => $value) {
+                $symfonyRequest->headers->set($key, $value);
+            }
+            $request = Request::createFromBase($symfonyRequest);
+            $endpoint = str($file)->after('_')->beforeLast('_')->value();
+            $class =  "App\Http\Controllers\Webhook\\" . ucfirst(str($endpoint)->before('::')->value());
+            $method = str($endpoint)->after('::')->value();
+            try {
+                $instance = new $class();
+                $instance->$method($request);
+            } catch (\Throwable $th) {
+                ray($th);
+            } finally {
+                Storage::disk('webhooks-during-maintenance')->delete($file);
+            }
+        }
+    }
+}

app/Listeners/MaintenanceModeEnabledNotification.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\MaintenanceModeEnabled;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Events\MaintenanceModeEnabled as EventsMaintenanceModeEnabled;
+use Illuminate\Queue\InteractsWithQueue;
+
+class MaintenanceModeEnabledNotification
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(EventsMaintenanceModeEnabled $event): void
+    {
+        ray('Maintenance mode enabled!');
+    }
+}

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,8 @@ class ActivityMonitor extends Component
     public $activityId;
     public $eventToDispatch = 'activityFinished';
     public $isPollingActive = false;
+    public bool $fullHeight = false;
+    public bool $showWaiting = false;
 
     protected $activity;
     protected $listeners = ['activityMonitor' => 'newMonitorActivity'];

app/Livewire/Admin/Index.php

@@ -3,39 +3,69 @@
 namespace App\Livewire\Admin;
 
 use App\Models\User;
-use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Cache;
 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()) {
             return redirect()->route('dashboard');
         }
-        if (auth()->user()->id !== 0 && session('adminToken') === null) {
+        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();
+        })->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;
+        });
     }
     public function switchUser(int $user_id)
     {
-        $user = User::find($user_id);
-        auth()->login($user);
-
-        if ($user_id === 0) {
-            session()->forget('adminToken');
-        } else {
-            $token_payload = [
-                'valid' => true,
-            ];
-            $token = Crypt::encrypt($token_payload);
-            session(['adminToken' => $token]);
+        if (auth()->user()->id !== 0) {
+            return redirect()->route('dashboard');
         }
-        return refreshSession();
+        $user = User::find($user_id);
+        $team_to_switch_to = $user->teams->first();
+        Cache::forget("team:{$user->id}");
+        auth()->login($user);
+        refreshSession($team_to_switch_to);
+        return redirect(request()->header('Referer'));
     }
     public function render()
     {

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();
@@ -23,8 +26,8 @@ class Dashboard extends Component
     public function cleanup_queue()
     {
         $this->dispatch('success', 'Cleanup started.');
-        Artisan::queue('app:init', [
-            '--cleanup-deployments' => 'true'
+        Artisan::queue('cleanup:application-deployment-queue', [
+            '--team-id' => currentTeam()->id
         ]);
     }
     public function 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/ForcePasswordReset.php

@@ -24,7 +24,7 @@ class ForcePasswordReset extends Component
     }
     public function render()
     {
-        return view('livewire.force-password-reset')->layout('layouts.simple');
+        return view('livewire.force-password-reset');
     }
     public function submit()
     {

app/Livewire/LayoutPopups.php

@@ -4,7 +4,7 @@ namespace App\Livewire;
 
 use Livewire\Component;
 
-class Sponsorship extends Component
+class LayoutPopups extends Component
 {
     public function getListeners()
     {
@@ -17,12 +17,8 @@ class Sponsorship 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.sponsorship');
+        return view('livewire.layout-popups');
     }
 }

app/Livewire/NewActivityMonitor.php

@@ -11,15 +11,17 @@ class NewActivityMonitor extends Component
     public ?string $header = null;
     public $activityId;
     public $eventToDispatch = 'activityFinished';
+    public $eventData = null;
     public $isPollingActive = false;
 
     protected $activity;
     protected $listeners = ['newActivityMonitor' => 'newMonitorActivity'];
 
-    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null)
     {
         $this->activityId = $activityId;
         $this->eventToDispatch = $eventToDispatch;
+        $this->eventData = $eventData;
 
         $this->hydrateActivity();
 
@@ -55,8 +57,12 @@ class NewActivityMonitor extends Component
                     }
                     return;
                 }
-                $this->dispatch($this->eventToDispatch);
-                ray('Dispatched event: ' . $this->eventToDispatch);
+                if (!is_null($this->eventData)) {
+                    $this->dispatch($this->eventToDispatch, $this->eventData);
+                } else {
+                    $this->dispatch($this->eventToDispatch);
+                }
+                ray('Dispatched event: ' . $this->eventToDispatch . ' with data: ' . $this->eventData);
             }
         }
     }

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;
@@ -63,7 +62,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -71,7 +70,7 @@ class EmailSettings extends Component
     public function sendTestNotification()
     {
         $this->team?->notify(new Test($this->emails));
-        $this->dispatch('success', 'Test Email sent successfully.');
+        $this->dispatch('success', 'Test Email sent.');
     }
     public function instantSaveInstance()
     {
@@ -83,7 +82,7 @@ class EmailSettings extends Component
             $this->team->resend_enabled = false;
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -119,19 +118,21 @@ 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 successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return handleError($e, $this);
@@ -148,7 +149,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->dispatch('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             $this->team->resend_enabled = false;
             return handleError($e, $this);
@@ -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 successfully.');
+            $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,19 @@ 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',
+        'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
+        'application.settings.connect_to_docker_network' => 'boolean|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,8 +48,22 @@ 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);
+        }
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $this->application->parseRawCompose();
+        } else {
+            $this->application->parseCompose();
+        }
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
+        $this->dispatch('configurationChanged');
     }
     public function submit() {
         if ($this->application->settings->gpu_count && $this->application->settings->gpu_device_ids) {

app/Livewire/Project/Application/Configuration.php

@@ -10,7 +10,7 @@ class Configuration extends Component
 {
     public Application $application;
     public $servers;
-    protected $listeners = ['build_pack_updated' => '$refresh'];
+    protected $listeners = ['buildPackUpdated' => '$refresh'];
 
     public function mount()
     {

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

@@ -3,6 +3,7 @@
 namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
+use App\Models\LocalFileVolume;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Livewire\Component;
@@ -24,7 +25,7 @@ class General extends Component
 
     public $customLabels;
     public bool $labelsChanged = false;
-    public bool $isConfigurationChanged = false;
+    public bool $initLoadingCompose = false;
 
     public ?string $initialDockerComposeLocation = null;
     public ?string $initialDockerComposePrLocation = null;
@@ -33,7 +34,8 @@ class General extends Component
     public $parsedServiceDomains = [];
 
     protected $listeners = [
-        'resetDefaultLabels'
+        'resetDefaultLabels',
+        'configurationChanged' => '$refresh'
     ];
     protected $rules = [
         'application.name' => 'required',
@@ -66,9 +68,13 @@ 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',
@@ -102,8 +108,8 @@ class General extends Component
         'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
         '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,20 +118,27 @@ class General extends Component
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
         }
-        $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
-
-        $this->ports_exposes = $this->application->ports_exposes;
-        if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {
-            $this->application->isConfigurationChanged(true);
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->application->fqdn = null;
+            $this->application->settings->save();
         }
-        $this->isConfigurationChanged = $this->application->isConfigurationChanged();
+        $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
+        $this->ports_exposes = $this->application->ports_exposes;
         $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();
         }
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
+        if ($this->application->build_pack === 'dockercompose' && !$this->application->docker_compose_raw) {
+            $this->initLoadingCompose = true;
+            $this->dispatch('info', 'Loading docker compose file...');
+        }
+
+        if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {
+            $this->dispatch('configurationChanged');
+        }
     }
     public function instantSave()
     {
@@ -143,27 +156,72 @@ class General extends Component
                 return;
             }
             ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation, 'initialDockerComposePrLocation' => $this->initialDockerComposePrLocation] = $this->application->loadComposeFile($isInit);
+            $compose = $this->application->parseCompose();
+            $services = data_get($compose, 'services');
+            if ($services) {
+                $volumes = collect($services)->map(function ($service) {
+                    return data_get($service, 'volumes');
+                })->flatten()->filter(function ($volume) {
+                    return str($volume)->startsWith('/data/coolify');
+                })->unique()->values();
+                foreach ($volumes as $volume) {
+                    $source = Str::of($volume)->before(':');
+                    $target = Str::of($volume)->after(':')->beforeLast(':');
+
+                    LocalFileVolume::updateOrCreate(
+                        [
+                            'mount_path' => $target,
+                            'resource_id' => $this->application->id,
+                            'resource_type' => get_class($this->application)
+                        ],
+                        [
+                            'fs_path' => $source,
+                            'mount_path' => $target,
+                            'resource_id' => $this->application->id,
+                            'resource_type' => get_class($this->application)
+                        ]
+                    );
+                }
+            }
             $this->dispatch('success', 'Docker compose file loaded.');
+            $this->dispatch('compose_loaded');
+            $this->dispatch('refresh_storages');
+            $this->dispatch('refreshEnvs');
         } catch (\Throwable $e) {
             $this->application->docker_compose_location = $this->initialDockerComposeLocation;
             $this->application->docker_compose_pr_location = $this->initialDockerComposePrLocation;
             $this->application->save();
             return handleError($e, $this);
+        } finally {
+            $this->initLoadingCompose = false;
         }
     }
     public function generateDomain(string $serviceName)
     {
-        $domain = $this->parsedServiceDomains[$serviceName]['domain'] ?? null;
-        if (!$domain) {
-            $uuid = new Cuid2(7);
-            $domain = generateFqdn($this->application->destination->server, $uuid);
-            $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
-            $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-            $this->application->save();
-        }
+        $uuid = new Cuid2(7);
+        $domain = generateFqdn($this->application->destination->server, $uuid);
+        $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
+        $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
+        $this->application->save();
+        $this->dispatch('success', 'Domain generated.');
         return $domain;
     }
-
+    public function updatedApplicationBaseDirectory()
+    {
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->loadComposeFile();
+        }
+    }
+    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->resetDefaultLabels();
+    }
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
@@ -182,7 +240,7 @@ class General extends Component
             $this->resetDefaultLabels(false);
         }
         $this->submit();
-        $this->dispatch('build_pack_updated');
+        $this->dispatch('buildPackUpdated');
     }
     public function getWildcardDomain()
     {
@@ -191,32 +249,50 @@ class General extends Component
             $fqdn = generateFqdn($server, $this->application->uuid);
             $this->application->fqdn = $fqdn;
             $this->application->save();
-            $this->updatedApplicationFqdn();
+            $this->resetDefaultLabels();
+            $this->dispatch('success', 'Wildcard domain generated.');
         }
     }
-    public function resetDefaultLabels($showToaster = true)
+    public function resetDefaultLabels()
     {
+        ray('resetDefaultLabels');
         $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
-        $this->submit($showToaster);
+
+        $this->application->custom_labels = base64_encode($this->customLabels);
+        $this->application->save();
     }
 
-    public function updatedApplicationFqdn()
+    public function checkFqdns($showToaster = true)
     {
-        $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();
-        $this->resetDefaultLabels(false);
-        // $this->dispatch('success', 'Labels reset to default!');
+        if (data_get($this->application, 'fqdn')) {
+            $domains = str($this->application->fqdn)->trim()->explode(',');
+            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='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
+                    }
+                }
+            }
+            check_domain_usage(resource: $this->application);
+            $this->application->fqdn = $domains->implode(',');
+        }
     }
     public function submit($showToaster = true)
     {
         try {
-            if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+            $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->checkFqdns();
+
+            $this->application->save();
+
+            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();
@@ -227,26 +303,14 @@ class General extends Component
             }
             $this->validate();
             if ($this->ports_exposes !== $this->application->ports_exposes) {
-                $this->resetDefaultLabels(false);
+                $this->resetDefaultLabels();
             }
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
-                    'application.docker_registry_image_tag' => 'required',
                 ]);
             }
-            if (data_get($this->application, 'fqdn')) {
-                $domains = str($this->application->fqdn)->trim()->explode(',');
-                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.");
-                        }
-                    }
-                }
-                check_fqdn_usage($this->application);
-                $this->application->fqdn = $domains->implode(',');
-            }
+
             if (data_get($this->application, 'custom_docker_run_options')) {
                 $this->application->custom_docker_run_options = str($this->application->custom_docker_run_options)->trim();
             }
@@ -264,7 +328,15 @@ class General extends Component
             }
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-                $this->parsedServices = $this->application->parseCompose();
+                foreach ($this->parsedServiceDomains as $serviceName => $service) {
+                    $domain = data_get($service, 'domain');
+                    if ($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='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
+                        }
+                        check_domain_usage(resource: $this->application);
+                    }
+                }
             }
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
@@ -272,7 +344,7 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {
-            $this->isConfigurationChanged = $this->application->isConfigurationChanged();
+            $this->dispatch('configurationChanged');
         }
     }
 }

app/Livewire/Project/Application/Heading.php

@@ -22,6 +22,7 @@ class Heading extends Component
         $teamId = auth()->user()->currentTeam()->id;
         return [
             "echo-private:team.{$teamId},ApplicationStatusChanged" => 'check_status',
+            "compose_loaded" => '$refresh',
         ];
     }
     public function mount()
@@ -33,15 +34,13 @@ class Heading extends Component
     {
         if ($this->application->destination->server->isFunctional()) {
             dispatch(new ContainerStatusJob($this->application->destination->server));
-            // $this->application->refresh();
-            // $this->application->previews->each(function ($preview) {
-            //     $preview->refresh();
-            // });
         } else {
             dispatch(new ServerStatusJob($this->application->destination->server));
         }
 
-        if ($showNotification) $this->dispatch('success', "Application status updated.");
+        if ($showNotification) $this->dispatch('success', "Success", "Application status updated.");
+        // Removed because it caused flickering
+        // $this->dispatch('configurationChanged');
     }
 
     public function force_deploy_without_cache()
@@ -60,11 +59,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();
@@ -103,7 +102,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/Application/Preview/Form.php

@@ -46,7 +46,7 @@ class Form extends Component
         $this->validate();
         $this->application->preview_url_template = str_replace(' ', '', $this->application->preview_url_template);
         $this->application->save();
-        $this->dispatch('success', 'Preview url template updated successfully.');
+        $this->dispatch('success', 'Preview url template updated.');
         $this->generate_real_url();
     }
 }