Merge pull request #1560 from coollabsio/next

v4.0.0-beta.169

.env.production

@@ -4,3 +4,7 @@ APP_KEY=
 
 DB_PASSWORD=
 REDIS_PASSWORD=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=

.github/workflows/development-build.yml

@@ -2,7 +2,7 @@ name: Development Build (v4)
 
 on:
   push:
-    branches: ["next"]
+    branches-ignore: ["main", "v3"]
     paths-ignore:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile
@@ -13,7 +13,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: [self-hosted, x64]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io
@@ -29,7 +29,7 @@ jobs:
           file: docker/prod-ssu/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
   aarch64:
     runs-on: [self-hosted, arm64]
     permissions:
@@ -50,7 +50,7 @@ jobs:
           file: docker/prod-ssu/Dockerfile
           platforms: linux/aarch64
           push: true
-            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -72,7 +72,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/production-build.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: [self-hosted, x64]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io

.tinkerwell/snippets/DeleteUser.php

@@ -0,0 +1,22 @@
+<?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

@@ -0,0 +1,28 @@
+<?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

@@ -22,8 +22,6 @@ You can ask for guidance anytime on our
 - Run `spin up` - You can notice that errors will be thrown. Don't worry.
   - If you see weird permission errors, especially on Mac, run `sudo spin up` instead. 
 
-- Run `./scripts/run setup:dev` - This will generate a secret key for you, delete any existing database layouts, migrate database to the new layout, and seed your database.
-
 ### 4) Start development
 You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`.
 
@@ -31,7 +29,6 @@ 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).
 

README.md

@@ -10,35 +10,40 @@ No vendor lock-in, which means that all the configuration for your applications/
 
 For more information, take a look at our landing page [here](https://coolify.io).
 
-> If you are looking for previous (v3) version, it is [here](https://github.com/coollabsio/coolify/tree/v3).
+# Donations
+To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
+
+https://coolify.io/sponsorships
+
+Thank you so much!
 
 # Cloud
 
 If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
 
-You can easily attach your own servers, get all the automations, free email notifications, etc.
-
 For more information & pricing, take a look at our landing page [here](https://coolify.io).
 
-# Beta
+## Why should I use the Cloud version?
+The recommended way to use Coolify is to have one server for Coolify and one (or more) for the resources you are deploying. A server is around 4-5$/month.
 
-The latest version (v4) is still in beta. That does not mean it is unstable. All the features that are available are stable enough be usable in real-life. 
-
-There are hundreds of people using it for managing their client's applications, freelancers, hobbyists, businesses.
+By subscribing to the cloud version, you get the Coolify server for the same price, but with:
+- High-availability
+- Free email notifications
+- Better support
+- Less maintenance for you
 
 # Installation
 
 ```bash
 curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
 ```
+You can find the installation script source [here](./scripts/install.sh).
 
-You can find the installation script [here](./scripts/install.sh).
-
-## Support
+# Support
 
 Contact us [here](https://coolify.io/docs/contact).
 
-## Recognitions
+# Recognitions
 
 <p>
 <a href="https://news.ycombinator.com/item?id=26624341">
@@ -54,11 +59,11 @@ Contact us [here](https://coolify.io/docs/contact).
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-## 💰 Financial Contributors
+# 💰 Financial Contributors
 
 Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
 
-### Organizations
+## Organizations
 
 Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
 
@@ -78,10 +83,10 @@ Support this project with your organization. Your logo will show up here with a
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
 
-### Individuals
+## Individuals
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
 
-## Star History
+# Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

app/Actions/Application/StopApplication.php

@@ -3,7 +3,6 @@
 namespace App\Actions\Application;
 
 use App\Models\Application;
-use App\Notifications\Application\StatusChanged;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopApplication
@@ -12,7 +11,10 @@ class StopApplication
     public function handle(Application $application)
     {
         $server = $application->destination->server;
-        $containers = getCurrentApplicationContainerStatus($server, $application->id);
+        if ($server->isSwarm()) {
+            instant_remote_process(["docker stack rm {$application->uuid}" ], $server);
+        } else {
+            $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
             if ($containers->count() > 0) {
                 foreach ($containers as $container) {
                     $containerName = data_get($container, 'Names');
@@ -26,5 +28,17 @@ class StopApplication
                 // TODO: make notification for application
                 // $application->environment->project->team->notify(new StatusChanged($application));
             }
+            // Delete Preview Deployments
+            $previewDeployments = $application->previews;
+            foreach ($previewDeployments as $previewDeployment) {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, $previewDeployment->pull_request_id);
+                foreach ($containers as $container) {
+                    $name = str_replace('/', '', $container['Names']);
+                    instant_remote_process(["docker rm -f $name"], $application->destination->server, throwError: false);
+                }
+            }
+        }
+
+
     }
 }

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);
+        $job = new CoolifyTask($this->activity, ignore_errors: $this->remoteProcessArgs->ignore_errors, call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish);
         dispatch($job);
         $this->activity->refresh();
         return $this->activity;

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -17,24 +17,24 @@ class RunRemoteProcess
 
     public bool $hide_from_output;
 
-    public bool $is_finished;
-
     public bool $ignore_errors;
 
+    public $call_event_on_finish = null;
+
     protected $time_start;
 
     protected $current_time;
 
     protected $last_write_at = 0;
 
-    protected $throttle_interval_ms = 500;
+    protected $throttle_interval_ms = 200;
 
     protected int $counter = 1;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Activity $activity, bool $hide_from_output = false, bool $is_finished = false, bool $ignore_errors = false)
+    public function __construct(Activity $activity, bool $hide_from_output = false, bool $ignore_errors = false, $call_event_on_finish = null)
     {
 
         if ($activity->getExtraProperty('type') !== ActivityTypes::INLINE->value) {
@@ -43,8 +43,8 @@ class RunRemoteProcess
 
         $this->activity = $activity;
         $this->hide_from_output = $hide_from_output;
-        $this->is_finished = $is_finished;
         $this->ignore_errors = $ignore_errors;
+        $this->call_event_on_finish = $call_event_on_finish;
     }
 
     public static function decodeOutput(?Activity $activity = null): string
@@ -74,17 +74,29 @@ class RunRemoteProcess
         $this->time_start = hrtime(true);
 
         $status = ProcessStatus::IN_PROGRESS;
-        $processResult = Process::forever()->run($this->getCommand(), $this->handleOutput(...));
+        $timeout = config('constants.ssh.command_timeout');
+        $process = Process::timeout($timeout)->start($this->getCommand(), $this->handleOutput(...));
+        $this->activity->properties = $this->activity->properties->merge([
+            'process_id' => $process->id(),
+        ]);
 
+        $processResult = $process->wait();
+        // $processResult = Process::timeout($timeout)->run($this->getCommand(), $this->handleOutput(...));
         if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) {
             $status = ProcessStatus::ERROR;
         } else {
-            if (($processResult->exitCode() == 0 && $this->is_finished) || $this->activity->properties->get('status') === ProcessStatus::FINISHED->value) {
+            if ($processResult->exitCode() == 0) {
                 $status = ProcessStatus::FINISHED;
             }
             if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
                 $status = ProcessStatus::ERROR;
             }
+            // if (($processResult->exitCode() == 0 && $this->is_finished) || $this->activity->properties->get('status') === ProcessStatus::FINISHED->value) {
+            //     $status = ProcessStatus::FINISHED;
+            // }
+            // if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
+            //     $status = ProcessStatus::ERROR;
+            // }
         }
 
         $this->activity->properties = $this->activity->properties->merge([
@@ -97,7 +109,15 @@ class RunRemoteProcess
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
             throw new \RuntimeException($processResult->errorOutput(), $processResult->exitCode());
         }
-
+        if ($this->call_event_on_finish) {
+            try {
+                event(resolve("App\\Events\\$this->call_event_on_finish", [
+                    'userId' => $this->activity->causer_id,
+                ]));
+            } catch (\Throwable $e) {
+                ray($e);
+            }
+        }
         return $processResult;
     }
 
@@ -117,7 +137,6 @@ class RunRemoteProcess
         }
         $this->current_time = $this->elapsedTime();
         $this->activity->description = $this->encodeOutput($type, $output);
-
         if ($this->isAfterLastThrottle()) {
             // Let's write to database.
             DB::transaction(function () {

app/Actions/Database/StartDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -14,21 +15,53 @@ class StartDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
         $internalPort = null;
-        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+        $type = $database->getMorphClass();
+        $network = data_get($database, 'destination.network');
+        $server = data_get($database, 'destination.server');
+        $containerName = data_get($database, 'uuid');
+        $proxyContainerName = "{$database->uuid}-proxy";
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $databaseType = $database->databaseType();
+            $network = data_get($database, 'service.destination.network');
+            $server = data_get($database, 'service.destination.server');
+            $proxyContainerName = "{$database->service->uuid}-proxy";
+            switch ($databaseType) {
+                case 'standalone-mariadb':
+                    $type = 'App\Models\StandaloneMariadb';
+                    $containerName = "mariadb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mongodb':
+                    $type = 'App\Models\StandaloneMongodb';
+                    $containerName = "mongodb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mysql':
+                    $type = 'App\Models\StandaloneMysql';
+                    $containerName = "mysql-{$database->service->uuid}";
+                    break;
+                case 'standalone-postgresql':
+                    $type = 'App\Models\StandalonePostgresql';
+                    $containerName = "postgresql-{$database->service->uuid}";
+                    break;
+                case 'standalone-redis':
+                    $type = 'App\Models\StandaloneRedis';
+                    $containerName = "redis-{$database->service->uuid}";
+                    break;
+            }
+        }
+        if ($type === 'App\Models\StandaloneRedis') {
             $internalPort = 6379;
-        } else if ($database->getMorphClass() === 'App\Models\StandalonePostgresql') {
+        } else if ($type === 'App\Models\StandalonePostgresql') {
             $internalPort = 5432;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMongodb') {
+        } else if ($type === 'App\Models\StandaloneMongodb') {
             $internalPort = 27017;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMysql') {
+        } else if ($type === 'App\Models\StandaloneMysql') {
             $internalPort = 3306;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMariadb') {
+        } else if ($type === 'App\Models\StandaloneMariadb') {
             $internalPort = 3306;
         }
-        $containerName = "{$database->uuid}-proxy";
         $configuration_dir = database_proxy_dir($database->uuid);
         $nginxconf = <<<EOF
     user  nginx;
@@ -42,7 +75,7 @@ class StartDatabaseProxy
     stream {
        server {
             listen $database->public_port;
-            proxy_pass $database->uuid:$internalPort;
+            proxy_pass $containerName:$internalPort;
        }
     }
     EOF;
@@ -54,19 +87,19 @@ class StartDatabaseProxy
         $docker_compose = [
             'version' => '3.8',
             'services' => [
-                $containerName => [
+                $proxyContainerName => [
                     'build' => [
                         'context' => $configuration_dir,
                         'dockerfile' => 'Dockerfile',
                     ],
                     'image' => "nginx:stable-alpine",
-                    'container_name' => $containerName,
+                    'container_name' => $proxyContainerName,
                     'restart' => RESTART_MODE,
                     'ports' => [
                         "$database->public_port:$database->public_port",
                     ],
                     'networks' => [
-                        $database->destination->network,
+                        $network,
                     ],
                     'healthcheck' => [
                         'test' => [
@@ -81,9 +114,9 @@ class StartDatabaseProxy
                 ]
             ],
             'networks' => [
-                $database->destination->network => [
+                $network => [
                     'external' => true,
-                    'name' => $database->destination->network,
+                    'name' => $network,
                     'attachable' => true,
                 ]
             ]
@@ -96,7 +129,8 @@ class StartDatabaseProxy
             "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",
+            "docker compose --project-directory {$configuration_dir} pull",
             "docker compose --project-directory {$configuration_dir} up --build -d",
-        ], $database->destination->server);
+        ], $server);
     }
 }

app/Actions/Database/StartMariadb.php

@@ -23,7 +23,7 @@ class StartMariadb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -56,7 +56,7 @@ class StartMariadb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -69,6 +69,16 @@ class StartMariadb
                 ]
             ]
         ];
+        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;
         }
@@ -91,9 +101,11 @@ class StartMariadb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $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->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()

app/Actions/Database/StartMongodb.php

@@ -25,7 +25,7 @@ class StartMongodb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -52,7 +52,7 @@ class StartMongodb
                     'healthcheck' => [
                         'test' => [
                             'CMD-SHELL',
-                            'mongo --eval "printjson(db.serverStatus())" | grep uptime | grep -v grep'
+                            'mongosh --eval "printjson(db.runCommand(\"ping\"))"'
                         ],
                         'interval' => '5s',
                         'timeout' => '5s',
@@ -63,7 +63,7 @@ class StartMongodb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -76,6 +76,16 @@ class StartMongodb
                 ]
             ]
         ];
+        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;
         }
@@ -107,9 +117,11 @@ class StartMongodb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $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->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()

app/Actions/Database/StartMysql.php

@@ -23,7 +23,7 @@ class StartMysql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -56,7 +56,7 @@ class StartMysql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -69,6 +69,16 @@ class StartMysql
                 ]
             ]
         ];
+        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;
         }
@@ -91,9 +101,11 @@ class StartMysql
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $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->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()

app/Actions/Database/StartPostgresql.php

@@ -23,7 +23,7 @@ class StartPostgresql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
         ];
@@ -32,6 +32,8 @@ class StartPostgresql
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->generate_init_scripts();
+        $this->add_custom_conf();
+
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -64,7 +66,7 @@ class StartPostgresql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -77,6 +79,17 @@ class StartPostgresql
                 ]
             ]
         ];
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            ray('Log Drain Enabled');
+            $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;
         }
@@ -96,14 +109,29 @@ class StartPostgresql
                 ];
             }
         }
+        if (!is_null($this->database->postgres_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-postgres.conf',
+                'target' => '/etc/postgresql/postgresql.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] = [
+                'postgres',
+                '-c',
+                'config_file=/etc/postgresql/postgresql.conf',
+            ];
+        }
         $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";
         $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->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -171,4 +199,14 @@ class StartPostgresql
             $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
         }
     }
+    private function add_custom_conf()
+    {
+        if (is_null($this->database->postgres_conf)) {
+            return;
+        }
+        $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}";
+    }
 }

app/Actions/Database/StartRedis.php

@@ -26,7 +26,7 @@ class StartRedis
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -65,7 +65,7 @@ class StartRedis
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -78,6 +78,16 @@ class StartRedis
                 ]
             ]
         ];
+        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;
         }
@@ -101,9 +111,11 @@ class StartRedis
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $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->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -154,6 +166,5 @@ class StartRedis
         $content = $this->database->redis_conf;
         $content_base64 = base64_encode($content);
         $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
-
     }
 }

app/Actions/Database/StopDatabase.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Events\DatabaseStatusChanged;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;

app/Actions/Database/StopDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -13,9 +14,13 @@ class StopDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
-        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $database->destination->server);
+        $server = data_get($database, 'destination.server');
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $server = data_get($database, 'service.server');
+        }
+        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $server);
         $database->is_public = false;
         $database->save();
     }

app/Actions/License/CheckResaleLicense.php

@@ -4,26 +4,26 @@ namespace App\Actions\License;
 
 use App\Models\InstanceSettings;
 use Illuminate\Support\Facades\Http;
+use Lorisleiva\Actions\Concerns\AsAction;
+
 
 class CheckResaleLicense
 {
-    public function __invoke()
+    use AsAction;
+    public function handle()
     {
         try {
             $settings = InstanceSettings::get();
+            if (isDev()) {
                 $settings->update([
-                'is_resale_license_active' => false,
+                    'is_resale_license_active' => true,
                 ]);
-            if (isDev()) {
-                return;
-            }
-            if (!$settings->resale_license) {
                 return;
             }
+            // if (!$settings->resale_license) {
+            //     return;
+            // }
             $base_url = config('coolify.license_url');
-            if (isDev()) {
-                $base_url = 'http://host.docker.internal:8787';
-            }
             $instance_id = config('app.id');
 
             ray("Checking license key against $base_url/lemon/validate");

app/Actions/Proxy/CheckProxy.php

@@ -17,6 +17,15 @@ class CheckProxy
                 return false;
             }
         }
+        if ($server->isSwarm()) {
+            $status = getContainerStatus($server, 'coolify-proxy_traefik');
+            $server->proxy->set('status', $status);
+            $server->save();
+            if ($status === 'running') {
+                return false;
+            }
+            return true;
+        } else {
             $status = getContainerStatus($server, 'coolify-proxy');
             if ($status === 'running') {
                 $server->proxy->set('status', 'running');
@@ -49,3 +58,4 @@ class CheckProxy
             return true;
         }
     }
+}

app/Actions/Proxy/StartProxy.php

@@ -13,6 +13,7 @@ class StartProxy
     public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
+
             $proxyType = $server->proxyType();
             $commands = collect([]);
             $proxy_path = get_proxy_path();
@@ -24,6 +25,15 @@ class StartProxy
             $docker_compose_yml_base64 = base64_encode($configuration);
             $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
             $server->save();
+            if ($server->isSwarm()) {
+                $commands = $commands->merge([
+                    "mkdir -p $proxy_path && 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",
+                    "echo 'Proxy started successfully.'"
+                ]);
+            } else {
                 $commands = $commands->merge([
                     "mkdir -p $proxy_path && cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
@@ -36,6 +46,8 @@ class StartProxy
                     "echo 'Proxy started successfully.'"
                 ]);
                 $commands = $commands->merge(connectProxyToNetworks($server));
+            }
+
             if ($async) {
                 $activity = remote_process($commands, $server);
                 return $activity;
@@ -50,7 +62,5 @@ class StartProxy
             ray($e);
             throw $e;
         }
-
-
     }
 }

app/Actions/Server/InstallDocker.php

@@ -11,6 +11,11 @@ class InstallDocker
     use AsAction;
     public function handle(Server $server)
     {
+        $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>.');
+        }
+        ray('Installing Docker on server: ' . $server->name . ' (' . $server->ip . ')' . ' with OS type: ' . $supported_os_type);
         $dockerVersion = '24.0';
         $config = base64_encode('{
             "log-driver": "json-file",
@@ -27,36 +32,65 @@ class InstallDocker
                 'server_id' => $server->id,
             ]);
         }
-
+        $command = collect([]);
         if (isDev() && $server->id === 0) {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
                 "sleep 1",
-                "echo '####### Installing/updating Docker Engine...'",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "echo 'Installing Docker Engine...'",
+                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 "sleep 4",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
-            ];
+            ]);
         } else {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
-                "command -v jq >/dev/null || apt-get update",
-                "command -v jq >/dev/null || apt install -y jq",
-                "echo '####### Installing/updating Docker Engine...'",
-                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+            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",
+
+                ]);
+            } 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",
+                ]);
+            } 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",
+                ]);
+            } else {
+                throw new \Exception('Unsupported OS');
+            }
+            $command = $command->merge([
+                "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",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
+                "systemctl enable docker >/dev/null 2>&1 || true",
                 "systemctl restart docker",
-                "echo '####### Creating default Docker network (coolify)...'",
+            ]);
+            if ($server->isSwarm()) {
+                $command = $command->merge([
+                    "docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true",
+                ]);
+            } else {
+                $command = $command->merge([
                     "docker network create --attachable coolify >/dev/null 2>&1 || true",
-                "echo '####### Done!'"
-            ];
+                ]);
+                $command = $command->merge([
+                    "echo 'Done!'",
+                ]);
             }
+
             return remote_process($command, $server);
         }
     }
+}

app/Actions/Server/InstallLogDrain.php

@@ -0,0 +1,211 @@
+<?php
+
+namespace App\Actions\Server;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Server;
+
+class InstallLogDrain
+{
+    use AsAction;
+    public function handle(Server $server)
+    {
+        if ($server->settings->is_logdrain_newrelic_enabled) {
+            $type = 'newrelic';
+        } else if ($server->settings->is_logdrain_highlight_enabled) {
+            $type = 'highlight';
+        } else if ($server->settings->is_logdrain_axiom_enabled) {
+            $type = 'axiom';
+        } else if ($server->settings->is_logdrain_custom_enabled) {
+            $type = 'custom';
+        } else {
+            $type = 'none';
+        }
+        try {
+            if ($type === 'none') {
+                $command = [
+                    "echo 'Stopping old Fluent Bit'",
+                    "docker rm -f coolify-log-drain || true",
+                ];
+                return instant_remote_process($command, $server);
+            } else if ($type === 'newrelic') {
+                if (!$server->settings->is_logdrain_newrelic_enabled) {
+                    throw new \Exception('New Relic log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Tag container_logs
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name nrlogs
+    Match *
+    license_key \${LICENSE_KEY}
+    # https://log-api.eu.newrelic.com/log/v1 - EU
+    # https://log-api.newrelic.com/log/v1 - US
+    base_uri \${BASE_URI}
+");
+            } else if ($type === 'highlight') {
+                if (!$server->settings->is_logdrain_highlight_enabled) {
+                    throw new \Exception('Highlight log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    tag               \${HIGHLIGHT_PROJECT_ID}
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[OUTPUT]
+    Name                forward
+    Match               *
+    Host                otel.highlight.io
+    Port                24224
+");
+            } else if ($type === 'axiom') {
+                if (!$server->settings->is_logdrain_axiom_enabled) {
+                    throw new \Exception('Axiom log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name            http
+    Match           *
+    Host            api.axiom.co
+    Port            443
+    URI             /v1/datasets/\${AXIOM_DATASET_NAME}/ingest
+    # Authorization Bearer should be an API token
+    Header Authorization Bearer \${AXIOM_API_KEY}
+    compress gzip
+    format json
+    json_date_key _time
+    json_date_format iso8601
+    tls On
+");
+            } else if ($type === 'custom') {
+                if (!$server->settings->is_logdrain_custom_enabled) {
+                    throw new \Exception('Custom log drain is not enabled.');
+                }
+                $config = base64_encode($server->settings->logdrain_custom_config);
+                $parsers = base64_encode($server->settings->logdrain_custom_config_parser);
+            } else {
+                throw new \Exception('Unknown log drain type.');
+            }
+            if ($type !== 'custom') {
+                $parsers = base64_encode("
+[PARSER]
+Name        empty_line_skipper
+Format      regex
+Regex       /^(?!\s*$).+/
+");
+            }
+            $compose = base64_encode("
+services:
+  coolify-log-drain:
+    image: cr.fluentbit.io/fluent/fluent-bit:2.0
+    container_name: coolify-log-drain
+    command: -c /fluent-bit.conf
+    env_file:
+      - .env
+    volumes:
+      - ./fluent-bit.conf:/fluent-bit.conf
+      - ./parsers.conf:/parsers.conf
+    ports:
+      - 127.0.0.1:24224:24224
+    restart: unless-stopped
+");
+            $readme = base64_encode('# New Relic Log Drain
+This log drain is based on [Fluent Bit](https://fluentbit.io/) and New Relic Log Forwarder.
+
+Files:
+- `fluent-bit.conf` - configuration file for Fluent Bit
+- `docker-compose.yml` - docker-compose file to run Fluent Bit
+- `.env` - environment variables for Fluent Bit
+');
+            $license_key = $server->settings->logdrain_newrelic_license_key;
+            $base_uri = $server->settings->logdrain_newrelic_base_uri;
+            $base_path = config('coolify.base_config_path');
+
+            $config_path = $base_path . '/log-drains';
+            $fluent_bit_config = $config_path . '/fluent-bit.conf';
+            $parsers_config = $config_path . '/parsers.conf';
+            $compose_path = $config_path . '/docker-compose.yml';
+            $readme_path = $config_path . '/README.md';
+            $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",
+                "test -f $config_path/.env && rm $config_path/.env",
+
+            ];
+            if ($type === 'newrelic') {
+                $add_envs_command = [
+                    "echo LICENSE_KEY=$license_key >> $config_path/.env",
+                    "echo BASE_URI=$base_uri >> $config_path/.env",
+                ];
+            } else if ($type === 'highlight') {
+                $add_envs_command = [
+                    "echo HIGHLIGHT_PROJECT_ID={$server->settings->logdrain_highlight_project_id} >> $config_path/.env",
+                ];
+            } else if ($type === 'axiom') {
+                $add_envs_command = [
+                    "echo AXIOM_DATASET_NAME={$server->settings->logdrain_axiom_dataset_name} >> $config_path/.env",
+                    "echo AXIOM_API_KEY={$server->settings->logdrain_axiom_api_key} >> $config_path/.env",
+                ];
+            } else if ($type === 'custom') {
+                $add_envs_command = [
+                    "touch $config_path/.env"
+                ];
+            } else {
+                throw new \Exception('Unknown log drain type.');
+            }
+            $restart_command = [
+                "echo 'Stopping old Fluent Bit'",
+                "cd $config_path && docker rm -f coolify-log-drain || true",
+                "echo 'Starting Fluent Bit'",
+                "cd $config_path && docker compose up -d --remove-orphans",
+            ];
+            $command = array_merge($command, $add_envs_command, $restart_command);
+            return instant_remote_process($command, $server);
+        } catch (\Throwable $e) {
+            return handleError($e);
+        }
+    }
+}

app/Actions/Server/UpdateCoolify.php

@@ -18,7 +18,7 @@ class UpdateCoolify
         try {
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
-            $this->server = Server::find(0)->first();
+            $this->server = Server::find(0);
             if (!$this->server) {
                 return;
             }

app/Actions/Service/DeleteService.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+
+class DeleteService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        StopService::run($service);
+        $server = data_get($service, 'server');
+        $storagesToDelete = collect([]);
+
+        $service->environment_variables()->delete();
+        $commands = [];
+        foreach ($service->applications()->get() as $application) {
+            $storages = $application->persistentStorages()->get();
+            foreach ($storages as $storage) {
+                $storagesToDelete->push($storage);
+            }
+            $application->delete();
+        }
+        foreach ($service->databases()->get() as $database) {
+            $storages = $database->persistentStorages()->get();
+            foreach ($storages as $storage) {
+                $storagesToDelete->push($storage);
+            }
+            $database->delete();
+        }
+        foreach ($storagesToDelete as $storage) {
+            $commands[] = "docker volume rm -f $storage->name";
+        }
+        $commands[] = "docker rm -f $service->uuid";
+
+        instant_remote_process($commands, $server, false);
+
+        $service->forceDelete();
+    }
+}

app/Actions/Service/StartService.php

@@ -11,24 +11,25 @@ class StartService
     use AsAction;
     public function handle(Service $service)
     {
+        ray('Starting service: ' . $service->name);
         $network = $service->destination->network;
         $service->saveComposeConfigs();
         $commands[] = "cd " . $service->workdir();
-        $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
-        $commands[] = "echo '####### Creating Docker network.'";
-        $commands[] = "docker network create --attachable {$service->uuid} >/dev/null 2>/dev/null || true";
-        $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
-        $commands[] = "echo '####### Pulling images.'";
+        $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[] = "echo 'Starting service $service->name on {$service->server->name}.'";
+        $commands[] = "echo 'Pulling images.'";
         $commands[] = "docker compose pull";
-        $commands[] = "echo '####### Starting containers.'";
-        $commands[] = "docker compose up -d --remove-orphans --force-recreate";
-        $commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || true";
+        $commands[] = "echo 'Starting containers.'";
+        $commands[] = "docker compose up -d --remove-orphans --force-recreate --build";
+        $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true";
         $compose = data_get($service, 'docker_compose', []);
         $serviceNames = data_get(Yaml::parse($compose), 'services', []);
         foreach ($serviceNames as $serviceName => $serviceConfig) {
-            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid}  $network {$serviceName}-{$service->uuid} 2>/dev/null || true";
+            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
         }
-        $activity = remote_process($commands, $service->server);
+        $activity = remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged');
         return $activity;
     }
 }

app/Actions/Service/StopService.php

@@ -4,13 +4,13 @@ namespace App\Actions\Service;
 
 use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Service;
-use App\Notifications\Application\StatusChanged;
 
 class StopService
 {
     use AsAction;
     public function handle(Service $service)
     {
+        ray('Stopping service: ' . $service->name);
         $applications = $service->applications()->get();
         foreach ($applications as $application) {
             instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);

app/Actions/Shared/PullImage.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Actions\Shared;
+
+use App\Models\Service;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class PullImage
+{
+    use AsAction;
+    public function handle(Service $resource)
+    {
+        $resource->saveComposeConfigs();
+
+        $commands[] = "cd " . $resource->workdir();
+        $commands[] = "echo 'Saved configuration files to {$resource->workdir()}.'";
+        $commands[] = "docker compose pull";
+
+        $server = data_get($resource, 'server');
+
+        if (!$server) return;
+
+        instant_remote_process($commands, $resource->server);
+    }
+}

app/Console/Commands/Dev.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\InstanceSettings;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Process;
+
+class Dev extends Command
+{
+    protected $signature = 'dev:init';
+    protected $description = 'Init the app in dev mode';
+
+    public function handle()
+    {
+        // Generate APP_KEY if not exists
+        if (empty(env('APP_KEY'))) {
+            echo "Generating APP_KEY.\n";
+            Artisan::call('key:generate');
+        }
+        // Seed database if it's empty
+        $settings = InstanceSettings::find(0);
+        if (!$settings) {
+            echo "Initializing instance, seeding database.\n";
+            Artisan::call('migrate --seed');
+        } else {
+            echo "Instance already initialized.\n";
+        }
+        // Set permissions
+        Process::run(['chmod', '-R', 'o+rwx', '.']);
+    }
+}

app/Console/Commands/Init.php

@@ -3,32 +3,103 @@
 namespace App\Console\Commands;
 
 use App\Enums\ApplicationDeploymentStatus;
+use App\Jobs\CleanupHelperContainersJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\InstanceSettings;
+use App\Models\Server;
 use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 
 class Init extends Command
 {
-    protected $signature = 'app:init';
+    protected $signature = 'app:init {--cleanup}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
-        ray()->clearAll();
-        $this->cleanup_in_progress_application_deployments();
+        $this->alive();
+        $cleanup = $this->option('cleanup');
+        if ($cleanup) {
+            echo "Running cleanup\n";
             $this->cleanup_stucked_resources();
+            // $this->cleanup_ssh();
+        }
+        $this->cleanup_in_progress_application_deployments();
+        $this->cleanup_stucked_helper_containers();
+
+        try {
+            setup_dynamic_configuration();
+        } catch (\Throwable $e) {
+            echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
         }
 
+        $settings = InstanceSettings::get();
+        if (!is_null(env('AUTOUPDATE', null))) {
+            if (env('AUTOUPDATE') == true) {
+                $settings->update(['is_auto_update_enabled' => true]);
+            } else {
+                $settings->update(['is_auto_update_enabled' => false]);
+            }
+        }
+    }
+    private function cleanup_stucked_helper_containers()
+    {
+        $servers = Server::all();
+        foreach ($servers as $server) {
+            if ($server->isFunctional()) {
+                CleanupHelperContainersJob::dispatch($server);
+            }
+        }
+    }
+    private function alive()
+    {
+        $id = config('app.id');
+        $version = config('version');
+        $settings = InstanceSettings::get();
+        $do_not_track = data_get($settings, 'do_not_track');
+        if ($do_not_track == true) {
+            echo "Skipping alive as do_not_track is enabled\n";
+            return;
+        }
+        try {
+            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
+            echo "I am alive!\n";
+        } catch (\Throwable $e) {
+            echo "Error in alive: {$e->getMessage()}\n";
+        }
+    }
+    // private function cleanup_ssh()
+    // {
+
+    // TODO: it will cleanup id.root@host.docker.internal
+    //     try {
+    //         $files = Storage::allFiles('ssh/keys');
+    //         foreach ($files as $file) {
+    //             Storage::delete($file);
+    //         }
+    //         $files = Storage::allFiles('ssh/mux');
+    //         foreach ($files as $file) {
+    //             Storage::delete($file);
+    //         }
+    //     } catch (\Throwable $e) {
+    //         echo "Error in cleaning ssh: {$e->getMessage()}\n";
+    //     }
+    // }
     private function cleanup_in_progress_application_deployments()
     {
         // Cleanup any failed deployments
 
         try {
-            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
+            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', ApplicationDeploymentStatus::IN_PROGRESS)->where('status', '==', ApplicationDeploymentStatus::QUEUED)->get();
             foreach ($halted_deployments as $deployment) {
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
@@ -37,70 +108,190 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_stucked_resources() {
+    private function cleanup_stucked_resources()
+    {
         // Cleanup any resources that are not attached to any environment or destination or server
         try {
             $applications = Application::all();
             foreach ($applications as $application) {
-                if (!$application->environment) {
-                    ray('Application without environment', $application->name);
+                if (!data_get($application, 'environment')) {
+                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
                     $application->delete();
+                    continue;
                 }
                 if (!$application->destination()) {
-                    ray('Application without destination', $application->name);
+                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
                     $application->delete();
+                    continue;
                 }
-            }
-            $postgresqls = StandalonePostgresql::all();
-            foreach($postgresqls as $postgresql) {
-                if (!$postgresql->environment) {
-                    ray('Postgresql without environment', $postgresql->name);
-                    $postgresql->delete();
-                }
-                if (!$postgresql->destination()) {
-                    ray('Postgresql without destination', $postgresql->name);
-                    $postgresql->delete();
-                }
-            }
-            $redis = StandaloneRedis::all();
-            foreach($redis as $redis) {
-                if (!$redis->environment) {
-                    ray('Redis without environment', $redis->name);
-                    $redis->delete();
-                }
-                if (!$redis->destination()) {
-                    ray('Redis without destination', $redis->name);
-                    $redis->delete();
-                }
-            }
-            $mongodbs = StandaloneMongodb::all();
-            foreach($mongodbs as $mongodb) {
-                if (!$mongodb->environment) {
-                    ray('Mongodb without environment', $mongodb->name);
-                    $mongodb->delete();
-                }
-                if (!$mongodb->destination()) {
-                    ray('Mongodb without destination', $mongodb->name);
-                    $mongodb->delete();
-                }
-            }
-            $services = Service::all();
-            foreach($services as $service) {
-                if (!$service->environment) {
-                    ray('Service without environment', $service->name);
-                    $service->delete();
-                }
-                if (!$service->server) {
-                    ray('Service without server', $service->name);
-                    $service->delete();
-                }
-                if (!$service->destination()) {
-                    ray('Service without destination', $service->name);
-                    $service->delete();
+                if (!data_get($application, 'destination.server')) {
+                    echo 'Application without server: ' . $application->name . ' soft deleting\n';
+                    $application->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
-            echo "Error: {$e->getMessage()}\n";
+            echo "Error in application: {$e->getMessage()}\n";
+        }
+        try {
+            $postgresqls = StandalonePostgresql::all();
+            foreach ($postgresqls as $postgresql) {
+                if (!data_get($postgresql, 'environment')) {
+                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+                if (!$postgresql->destination()) {
+                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+                if (!data_get($postgresql, 'destination.server')) {
+                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in postgresql: {$e->getMessage()}\n";
+        }
+        try {
+            $redis = StandaloneRedis::all();
+            foreach ($redis as $redis) {
+                if (!data_get($redis, 'environment')) {
+                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+                if (!$redis->destination()) {
+                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+                if (!data_get($redis, 'destination.server')) {
+                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in redis: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mongodbs = StandaloneMongodb::all();
+            foreach ($mongodbs as $mongodb) {
+                if (!data_get($mongodb, 'environment')) {
+                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+                if (!$mongodb->destination()) {
+                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+                if (!data_get($mongodb, 'destination.server')) {
+                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mongodb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mysqls = StandaloneMysql::all();
+            foreach ($mysqls as $mysql) {
+                if (!data_get($mysql, 'environment')) {
+                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+                if (!$mysql->destination()) {
+                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+                if (!data_get($mysql, 'destination.server')) {
+                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mysql: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mariadbs = StandaloneMariadb::all();
+            foreach ($mariadbs as $mariadb) {
+                if (!data_get($mariadb, 'environment')) {
+                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+                if (!$mariadb->destination()) {
+                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+                if (!data_get($mariadb, 'destination.server')) {
+                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mariadb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $services = Service::all();
+            foreach ($services as $service) {
+                if (!data_get($service, 'environment')) {
+                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+                if (!$service->destination()) {
+                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+                if (!data_get($service, 'server')) {
+                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApplications = ServiceApplication::all();
+            foreach ($serviceApplications as $service) {
+                if (!data_get($service, 'service')) {
+                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in serviceApplications: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDatabases = ServiceDatabase::all();
+            foreach ($serviceDatabases as $service) {
+                if (!data_get($service, 'service')) {
+                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
         }
     }
 }

app/Console/Commands/RootChangeEmail.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class RootChangeEmail extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'root:change-email';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Change Root Email';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        //
+        $this->info('You are about to change the root user\'s email.');
+        $email = $this->ask('Give me a new email for root user');
+        $this->info('Updating root email...');
+        try {
+            User::find(0)->update(['email' => $email]);
+            $this->info('Root user\'s email updated successfully.');
+        } catch (\Exception $e) {
+            $this->error('Failed to update root user\'s email.');
+            return;
+        }
+    }
+}

app/Console/Commands/RootResetPassword.php

@@ -8,14 +8,14 @@ use Illuminate\Support\Facades\Hash;
 
 use function Laravel\Prompts\password;
 
-class UsersResetRoot extends Command
+class RootResetPassword extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'users:reset-root';
+    protected $signature = 'root:reset-password';
 
     /**
      * The console command description.

app/Console/Commands/ServicesDelete.php

@@ -12,21 +12,21 @@ use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\multiselect;
 use function Laravel\Prompts\select;
 
-class ResourcesDelete extends Command
+class ServicesDelete extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'resources:delete';
+    protected $signature = 'services:delete';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete a resource from the database';
+    protected $description = 'Delete a service from the database';
 
     /**
      * Execute the console command.
@@ -34,7 +34,7 @@ class ResourcesDelete extends Command
     public function handle()
     {
         $resource = select(
-            'What resource do you want to delete?',
+            'What service do you want to delete?',
             ['Application', 'Database', 'Service', 'Server'],
         );
         if ($resource === 'Application') {
@@ -61,6 +61,7 @@ class ResourcesDelete extends Command
 
         foreach ($serversToDelete as $server) {
             $toDelete = $servers->where('id', $server)->first();
+            if ($toDelete) {
                 $this->info($toDelete);
                 $confirmed = confirm("Are you sure you want to delete all selected resources?");
                 if (!$confirmed) {
@@ -69,6 +70,7 @@ class ResourcesDelete extends Command
                 $toDelete->delete();
             }
         }
+    }
     private function deleteApplication()
     {
         $applications = Application::all();
@@ -82,8 +84,8 @@ class ResourcesDelete extends Command
         );
 
         foreach ($applicationsToDelete as $application) {
-            ray($application);
             $toDelete = $applications->where('id', $application)->first();
+            if ($toDelete) {
                 $this->info($toDelete);
                 $confirmed = confirm("Are you sure you want to delete all selected resources? ");
                 if (!$confirmed) {
@@ -92,6 +94,7 @@ class ResourcesDelete extends Command
                 $toDelete->delete();
             }
         }
+    }
     private function deleteDatabase()
     {
         $databases = StandalonePostgresql::all();
@@ -106,6 +109,7 @@ class ResourcesDelete extends Command
 
         foreach ($databasesToDelete as $database) {
             $toDelete = $databases->where('id', $database)->first();
+            if ($toDelete) {
                 $this->info($toDelete);
                 $confirmed = confirm("Are you sure you want to delete all selected resources?");
                 if (!$confirmed) {
@@ -114,6 +118,7 @@ class ResourcesDelete extends Command
                 $toDelete->delete();
             }
         }
+    }
     private function deleteService()
     {
         $services = Service::all();
@@ -128,6 +133,7 @@ class ResourcesDelete extends Command
 
         foreach ($servicesToDelete as $service) {
             $toDelete = $services->where('id', $service)->first();
+            if ($toDelete) {
                 $this->info($toDelete);
                 $confirmed = confirm("Are you sure you want to delete all selected resources?");
                 if (!$confirmed) {
@@ -137,3 +143,4 @@ class ResourcesDelete extends Command
             }
         }
     }
+}

app/Console/Commands/ServicesGenerate.php

@@ -26,7 +26,7 @@ class ServicesGenerate extends Command
      */
     public function handle()
     {
-        ray()->clearAll();
+        // ray()->clearAll();
         $files = array_diff(scandir(base_path('templates/compose')), ['.', '..']);
         $files = array_filter($files, function ($file) {
             return strpos($file, '.yaml') !== false;

app/Console/Commands/SyncBunny.php

@@ -71,6 +71,15 @@ class SyncBunny extends Command
             ]);
         });
         try {
+            if (!$only_template && !$only_version) {
+                $this->info('About to sync files (docker-compose.prod.yaml, upgrade.sh, install.sh, etc) to BunnyCDN.');
+            }
+            if ($only_template) {
+                $this->info('About to sync service-templates.json to BunnyCDN.');
+            }
+            if ($only_version) {
+                $this->info('About to sync versions.json to BunnyCDN.');
+            }
             $confirmed = confirm('Are you sure you want to sync?');
             if (!$confirmed) {
                 return;

app/Console/Kernel.php

@@ -2,15 +2,17 @@
 
 namespace App\Console;
 
-use App\Jobs\CheckResaleLicenseJob;
+use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
-use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
+use App\Jobs\PullHelperImageJob;
+use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
+use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -19,38 +21,54 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            // Server Jobs
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->check_scheduled_backups($schedule);
+            $this->pull_helper_image($schedule);
         } else {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
-            $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+
+            // Server Jobs
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
+            $this->pull_helper_image($schedule);
         }
     }
-    private function cleanup_servers($schedule)
+    private function pull_helper_image($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
-            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
+            $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
     }
     private function check_resources($schedule)
     {
         if (isCloud()) {
-            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
+            $own = Team::find(0)->servers;
+            $servers = $servers->merge($own);
+            $containerServers = $servers->where('settings.is_swarm_worker', false);
         } else {
-            $servers = Server::all();
+            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
+            $containerServers = $servers->where('settings.is_swarm_worker', false);
+        }
+        foreach ($containerServers as $server) {
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            if ($server->isLogDrainEnabled()) {
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+            }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)

app/Data/CoolifyTaskArgs.php

@@ -16,9 +16,11 @@ class CoolifyTaskArgs extends Data
         public string  $command,
         public string  $type,
         public ?string $type_uuid = null,
+        public ?int $process_id = null,
         public ?Model  $model = null,
         public ?string  $status = null ,
         public bool    $ignore_errors = false,
+        public $call_event_on_finish = null,
     ) {
         if(is_null($status)){
             $this->status = ProcessStatus::QUEUED->value;

app/Enums/ProcessStatus.php

@@ -8,5 +8,6 @@ enum ProcessStatus: string
     case IN_PROGRESS = 'in_progress';
     case FINISHED = 'finished';
     case ERROR = 'error';
+    case KILLED = 'killed';
     case CANCELLED = 'cancelled';
 }

app/Events/ApplicationStatusChanged.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ApplicationStatusChanged implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $teamId;
+    public function __construct($teamId = null)
+    {
+        if (is_null($teamId)) {
+            $teamId = auth()->user()->currentTeam()->id ?? null;
+        }
+        if (is_null($teamId)) {
+            throw new \Exception("Team id is null");
+        }
+        $this->teamId = $teamId;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("team.{$this->teamId}"),
+        ];
+    }
+}

app/Events/BackupCreated.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class BackupCreated implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $teamId;
+    public function __construct($teamId = null)
+    {
+        if (is_null($teamId)) {
+            $teamId = auth()->user()->currentTeam()->id ?? null;
+        }
+        if (is_null($teamId)) {
+            throw new \Exception("Team id is null");
+        }
+        $this->teamId = $teamId;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("team.{$this->teamId}"),
+        ];
+    }
+}

app/Events/DatabaseStatusChanged.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class DatabaseStatusChanged implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $userId;
+    public function __construct($userId = null)
+    {
+        if (is_null($userId)) {
+            $userId = auth()->user()->id ?? null;
+        }
+        if (is_null($userId)) {
+            throw new \Exception("User id is null");
+        }
+        $this->userId = $userId;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("user.{$this->userId}"),
+        ];
+    }
+}

app/Events/ServiceStatusChanged.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ServiceStatusChanged implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $userId;
+    public function __construct($userId = null)
+    {
+        if (is_null($userId)) {
+            $userId = auth()->user()->id ?? null;
+        }
+        if (is_null($userId)) {
+            throw new \Exception("User id is null");
+        }
+        $this->userId = $userId;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("user.{$this->userId}"),
+        ];
+    }
+}

app/Events/TestEvent.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class TestEvent implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $teamId;
+    public function __construct()
+    {
+        $this->teamId = auth()->user()->currentTeam()->id;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("team.{$this->teamId}"),
+        ];
+    }
+}

app/Exceptions/Handler.php

@@ -4,7 +4,9 @@ namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
 use App\Models\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use RuntimeException;
 use Sentry\Laravel\Integration;
 use Sentry\State\Scope;
 use Throwable;
@@ -40,6 +42,13 @@ class Handler extends ExceptionHandler
     ];
     private InstanceSettings $settings;
 
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->is('api/*') || $request->expectsJson() || $this->shouldReturnJson($request, $exception)) {
+            return response()->json(['message' => $exception->getMessage()], 401);
+        }
+        return  redirect()->guest($exception->redirectTo() ?? route('login'));
+    }
     /**
      * Register the exception handling callbacks for the application.
      */
@@ -47,6 +56,9 @@ class Handler extends ExceptionHandler
     {
         $this->reportable(function (Throwable $e) {
             if (isDev()) {
+                // return;
+            }
+            if ($e instanceof RuntimeException) {
                 return;
             }
             $this->settings = InstanceSettings::get();
@@ -65,6 +77,7 @@ class Handler extends ExceptionHandler
                     );
                 }
             );
+            ray('reporting to sentry');
             Integration::captureUnhandledException($e);
         });
     }

app/Http/Controllers/ApplicationController.php

@@ -10,23 +10,6 @@ class ApplicationController extends Controller
 {
     use AuthorizesRequests, ValidatesRequests;
 
-    public function configuration()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.application.configuration', ['application' => $application]);
-    }
-
     public function deployments()
     {
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -41,7 +24,7 @@ class ApplicationController extends Controller
         if (!$application) {
             return redirect()->route('dashboard');
         }
-        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 8);
+        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
         return view('project.application.deployments', ['application' => $application, 'deployments' => $deployments, 'deployments_count' => $count]);
     }
 

app/Http/Controllers/Controller.php

@@ -39,6 +39,10 @@ class Controller extends BaseController
                 } else {
                     $team = $user->teams()->first();
                 }
+                if (is_null(data_get($user, 'email_verified_at'))) {
+                    $user->email_verified_at = now();
+                    $user->save();
+                }
                 Auth::login($user);
                 session(['currentTeam' => $team]);
                 return redirect()->route('dashboard');
@@ -76,6 +80,10 @@ class Controller extends BaseController
             $settings = InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
             if ($database) {
+                if ($database->status !== 'running') {
+                    $database->status = 'running';
+                    $database->save();
+                }
                 $s3s = S3Storage::whereTeamId(0)->get();
             }
             return view('settings.configuration', [
@@ -129,17 +137,29 @@ class Controller extends BaseController
     public function acceptInvitation()
     {
         try {
-            $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();
+            $resetPassword = request()->query('reset-password');
+            $invitationUuid = request()->route('uuid');
+            $invitation = TeamInvitation::whereUuid($invitationUuid)->firstOrFail();
             $user = User::whereEmail($invitation->email)->firstOrFail();
-            if (auth()->user()->id !== $user->id) {
-                abort(401);
-            }
             $invitationValid = $invitation->isValid();
             if ($invitationValid) {
-                $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
-                refreshSession($invitation->team);
+                if ($resetPassword) {
+                    $user->update([
+                        'password' => Hash::make($invitationUuid),
+                        'force_password_reset' => true
+                    ]);
+                }
+                if ($user->teams()->where('team_id', $invitation->team->id)->exists()) {
                     $invitation->delete();
                     return redirect()->route('team.index');
+                }
+                $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
+                $invitation->delete();
+                if (auth()->user()?->id !== $user->id) {
+                    return redirect()->route('login');
+                }
+                refreshSession($invitation->team);
+                return redirect()->route('team.index');
             } else {
                 abort(401);
             }

app/Http/Controllers/MagicController.php

@@ -32,8 +32,14 @@ class MagicController extends Controller
 
     public function environments()
     {
+        $project = Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first();
+        if (!$project) {
             return response()->json([
-            'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
+                'environments' => []
+            ]);
+        }
+        return response()->json([
+            'environments' => $project->environments
         ]);
     }
 

app/Http/Controllers/ProjectController.php

@@ -81,7 +81,9 @@ class ProjectController extends Controller
             $oneClickService = data_get($services, "$oneClickServiceName.compose");
             $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
             if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/');
+                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                    return !empty($value);
+                });
             }
             if ($oneClickService) {
                 $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
@@ -102,27 +104,7 @@ class ProjectController extends Controller
                         $generatedValue = $value;
                         if ($value->contains('SERVICE_')) {
                             $command = $value->after('SERVICE_')->beforeLast('_');
-                            // TODO: make it shared with Service.php
-                            switch ($command->value()) {
-                                case 'PASSWORD':
-                                    $generatedValue = Str::password(symbols: false);
-                                    break;
-                                case 'PASSWORD_64':
-                                    $generatedValue = Str::password(length: 64, symbols: false);
-                                    break;
-                                case 'BASE64_64':
-                                    $generatedValue = Str::random(64);
-                                    break;
-                                case 'BASE64_128':
-                                    $generatedValue = Str::random(128);
-                                    break;
-                                case 'BASE64':
-                                    $generatedValue = Str::random(32);
-                                    break;
-                                case 'USER':
-                                    $generatedValue = Str::random(16);
-                                    break;
-                            }
+                            $generatedValue = generateEnvValue($command->value());
                         }
                         EnvironmentVariable::create([
                             'key' => $key,
@@ -134,8 +116,7 @@ class ProjectController extends Controller
                     });
                 }
                 $service->parse(isNew: true);
-
-                return redirect()->route('project.service', [
+                return redirect()->route('project.service.configuration', [
                     'service_uuid' => $service->uuid,
                     'environment_name' => $environment->name,
                     'project_uuid' => $project->uuid,

app/Http/Livewire/Destination/New/StandaloneDocker.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Destination\New;
-
-use App\Models\Server;
-use App\Models\StandaloneDocker as ModelsStandaloneDocker;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Str;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class StandaloneDocker extends Component
-{
-    public string $name;
-    public string $network;
-
-    public Collection $servers;
-    public Server $server;
-    public int|null $server_id = null;
-
-    protected $rules = [
-        'name' => 'required|string',
-        'network' => 'required|string',
-        'server_id' => 'required|integer'
-    ];
-    protected $validationAttributes = [
-        'name' => 'name',
-        'network' => 'network',
-        'server_id' => 'server'
-    ];
-
-    public function mount()
-    {
-        if (request()->query('server_id')) {
-            $this->server_id = request()->query('server_id');
-        } else {
-            if ($this->servers->count() > 0) {
-                $this->server_id = $this->servers->first()->id;
-            }
-        }
-        if (request()->query('network_name')) {
-            $this->network = request()->query('network_name');
-        } else {
-            $this->network = new Cuid2(7);
-        }
-        $this->name = Str::kebab("{$this->servers->first()->name}-{$this->network}");
-    }
-
-    public function generate_name()
-    {
-        $this->server = Server::find($this->server_id);
-        $this->name = Str::kebab("{$this->server->name}-{$this->network}");
-    }
-
-    public function submit()
-    {
-        $this->validate();
-        try {
-            $this->server = Server::find($this->server_id);
-            $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
-            if ($found) {
-                $this->createNetworkAndAttachToProxy();
-                $this->emit('error', 'Network already added to this server.');
-                return;
-            } else {
-                $docker = ModelsStandaloneDocker::create([
-                    'name' => $this->name,
-                    'network' => $this->network,
-                    'server_id' => $this->server_id,
-                ]);
-            }
-            $this->createNetworkAndAttachToProxy();
-            return redirect()->route('destination.show', $docker->uuid);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    private function createNetworkAndAttachToProxy()
-    {
-        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-    }
-}

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

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Actions\Application\StopApplication;
-use App\Jobs\ContainerStatusJob;
-use App\Models\Application;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Heading extends Component
-{
-    public Application $application;
-    public array $parameters;
-
-    protected string $deploymentUuid;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function check_status()
-    {
-        if ($this->application->destination->server->isFunctional()) {
-            dispatch(new ContainerStatusJob($this->application->destination->server));
-            $this->application->refresh();
-            $this->application->previews->each(function ($preview) {
-                $preview->refresh();
-            });
-        }
-    }
-
-    public function force_deploy_without_cache()
-    {
-        $this->deploy(force_rebuild: true);
-    }
-
-    public function deploy(bool $force_rebuild = false)
-    {
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: $force_rebuild,
-        );
-        return redirect()->route('project.application.deployment', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
-
-    protected function setDeploymentUuid()
-    {
-        $this->deploymentUuid = new Cuid2(7);
-        $this->parameters['deployment_uuid'] = $this->deploymentUuid;
-    }
-
-    public function stop()
-    {
-        StopApplication::run($this->application);
-        $this->application->status = 'exited';
-        $this->application->save();
-        $this->application->refresh();
-    }
-}

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

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use Illuminate\Support\Str;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Rollback extends Component
-{
-    public Application $application;
-    public $images = [];
-    public string|null $current;
-    public array $parameters;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function rollbackImage($commit)
-    {
-        $deployment_uuid = new Cuid2(7);
-
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $deployment_uuid,
-            commit: $commit,
-            force_rebuild: false,
-        );
-
-        return redirect()->route('project.application.deployment', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $deployment_uuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
-
-    public function loadImages()
-    {
-        try {
-            $image = $this->application->uuid;
-            $output = instant_remote_process([
-                "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
-            ], $this->application->destination->server, throwError: false);
-            $current_tag = Str::of($output)->trim()->explode(":");
-            $this->current = data_get($current_tag, 1);
-
-            $output = instant_remote_process([
-                "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
-            ], $this->application->destination->server);
-            $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
-                return Str::of($item)->contains($image);
-            })->map(function ($item) {
-                $item = Str::of($item)->explode('#');
-                if ($item[1] === $this->current) {
-                    // $is_current = true;
-                }
-                return [
-                    'tag' => $item[1],
-                    'created_at' => $item[2],
-                    'is_current' => $is_current ?? null,
-                ];
-            })->toArray();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

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

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use Livewire\Component;
-
-class BackupExecutions extends Component
-{
-    public $backup;
-    public $executions;
-    public $setDeletableBackup;
-    protected $listeners = ['refreshBackupExecutions', 'deleteBackup'];
-
-    public function deleteBackup($exeuctionId)
-    {
-        $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
-        if (is_null($execution)) {
-            $this->emit('error', 'Backup execution not found.');
-            return;
-        }
-        delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
-        $execution->delete();
-        $this->emit('success', 'Backup deleted successfully.');
-        $this->emit('refreshBackupExecutions');
-    }
-    public function refreshBackupExecutions(): void
-    {
-        $this->executions = $this->backup->executions;
-    }
-}

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

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use Livewire\Component;
-
-class ScheduledBackups extends Component
-{
-    public $database;
-    public $parameters;
-    protected $listeners = ['refreshScheduledBackups'];
-
-    public function mount(): void
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function delete($scheduled_backup_id): void
-    {
-        $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
-        $this->emit('success', 'Scheduled backup deleted successfully.');
-        $this->refreshScheduledBackups();
-    }
-
-    public function refreshScheduledBackups(): void
-    {
-        ray('refreshScheduledBackups');
-        $this->database->refresh();
-    }
-}

app/Http/Livewire/Project/New/DockerCompose.php

@@ -1,141 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\New;
-
-use App\Models\EnvironmentVariable;
-use App\Models\Project;
-use App\Models\Service;
-use Livewire\Component;
-use Illuminate\Support\Str;
-use Symfony\Component\Yaml\Yaml;
-
-class DockerCompose extends Component
-{
-    public string $dockerComposeRaw = '';
-    public string $envFile = '';
-    public array $parameters;
-    public array $query;
-    public function mount()
-    {
-
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        if (isDev()) {
-            $this->dockerComposeRaw = 'services:
-            ghost:
-              image: ghost:5
-              volumes:
-                - ~/configs:/etc/configs/:ro
-                - ./var/lib/ghost/content:/tmp/ghost2/content:ro
-                - /var/lib/ghost/content:/tmp/ghost/content:rw
-                - ghost-content-data:/var/lib/ghost/content
-                - type: volume
-                  source: mydata
-                  target: /data
-                - type: bind
-                  source: ./var/lib/ghost/data
-                  target: /data
-                - type: bind
-                  source: /tmp
-                  target: /tmp
-              labels:
-                - "test.label=true"
-              ports:
-                - "3000"
-                - "3000-3005"
-                - "8000:8000"
-                - "9090-9091:8080-8081"
-                - "49100:22"
-                - "127.0.0.1:8001:8001"
-                - "127.0.0.1:5000-5010:5000-5010"
-                - "127.0.0.1::5000"
-                - "6060:6060/udp"
-                - "12400-12500:1240"
-                - target: 80
-                  published: 8080
-                  protocol: tcp
-                  mode: host
-              networks:
-                - some-network
-                - other-network
-              environment:
-                - database__client=${DATABASE_CLIENT:-mysql}
-                - database__connection__database=${MYSQL_DATABASE:-ghost}
-                - database__connection__host=${DATABASE_CONNECTION_HOST:-mysql}
-                - test=${TEST:?true}
-                - url=$SERVICE_FQDN_GHOST
-                - database__connection__user=$SERVICE_USER_MYSQL
-                - database__connection__password=$SERVICE_PASSWORD_MYSQL
-              depends_on:
-                - mysql
-            mysql:
-              image: mysql:8.0
-              volumes:
-                - ghost-mysql-data:/var/lib/mysql
-              environment:
-                - MYSQL_USER=${SERVICE_USER_MYSQL}
-                - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
-                - MYSQL_DATABASE=$MYSQL_DATABASE
-                - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
-                - SESSION_SECRET
-            minio:
-              image: minio/minio
-              environment:
-                RACK_ENV: development
-                A: $A
-                SHOW: ${SHOW}
-                SHOW1: ${SHOW2-show1}
-                SHOW2: ${SHOW3:-show2}
-                SHOW3: ${SHOW4?show3}
-                SHOW4: ${SHOW5:?show4}
-                SHOW5: ${SERVICE_USER_MINIO}
-                SHOW6: ${SERVICE_PASSWORD_MINIO}
-                SHOW7: ${SERVICE_PASSWORD_64_MINIO}
-                SHOW8: ${SERVICE_BASE64_64_MINIO}
-                SHOW9: ${SERVICE_BASE64_128_MINIO}
-                SHOW10: ${SERVICE_BASE64_MINIO}
-                SHOW11:
-          ';
-        }
-    }
-    public function submit()
-    {
-        try {
-            $this->validate([
-                'dockerComposeRaw' => 'required'
-            ]);
-            $this->dockerComposeRaw = Yaml::dump(Yaml::parse($this->dockerComposeRaw), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
-            $server_id = $this->query['server_id'];
-
-            $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
-            $service = Service::create([
-                'name' => 'service' . Str::random(10),
-                'docker_compose_raw' => $this->dockerComposeRaw,
-                'environment_id' => $environment->id,
-                'server_id' => (int) $server_id,
-            ]);
-            $variables = parseEnvFormatToArray($this->envFile);
-            foreach ($variables as $key => $variable) {
-                EnvironmentVariable::create([
-                    'key' => $key,
-                    'value' => $variable,
-                    'is_build_time' => false,
-                    'is_preview' => false,
-                    'service_id' => $service->id,
-                ]);
-            }
-            $service->name = "service-$service->uuid";
-
-            $service->parse(isNew: true);
-
-            return redirect()->route('project.service', [
-                'service_uuid' => $service->uuid,
-                'environment_name' => $environment->name,
-                'project_uuid' => $project->uuid,
-            ]);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

app/Http/Livewire/Project/Service/ComposeModal.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Service;
-
-use Livewire\Component;
-
-class ComposeModal extends Component
-{
-    public ?string $raw = null;
-    public ?string $actual = null;
-    public function render()
-    {
-        return view('livewire.project.service.compose-modal');
-    }
-    public function submit() {
-        $this->emit('warning', "Saving new docker compose...");
-        $this->emit('saveCompose', $this->raw);
-    }
-}

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

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Service;
-
-use App\Models\ServiceDatabase;
-use Livewire\Component;
-
-class Database extends Component
-{
-    public ServiceDatabase $database;
-    public $fileStorages;
-    protected $listeners = ["refreshFileStorages"];
-    protected $rules = [
-        'database.human_name' => 'nullable',
-        'database.description' => 'nullable',
-        'database.image' => 'required',
-        'database.exclude_from_status' => 'required|boolean',
-    ];
-    public function render()
-    {
-        return view('livewire.project.service.database');
-    }
-    public function mount() {
-        $this->refreshFileStorages();
-    }
-    public function instantSave() {
-        $this->submit();
-    }
-    public function refreshFileStorages()
-    {
-        $this->fileStorages = $this->database->fileStorages()->get();
-    }
-    public function submit()
-    {
-        try {
-            $this->validate();
-            $this->database->save();
-            updateCompose($this->database);
-            $this->emit('success', 'Database saved successfully.');
-        } catch (\Throwable $e) {
-            ray($e);
-        } finally {
-            $this->emit('generateDockerCompose');
-        }
-    }
-}

app/Http/Livewire/Project/Service/Navbar.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Service;
-
-use App\Actions\Service\StartService;
-use App\Actions\Service\StopService;
-use App\Jobs\ContainerStatusJob;
-use App\Models\Service;
-use Livewire\Component;
-
-class Navbar extends Component
-{
-    public Service $service;
-    public array $parameters;
-    public array $query;
-
-    public function render()
-    {
-        return view('livewire.project.service.navbar');
-    }
-
-    public function checkStatus()
-    {
-        $this->emit('checkStatus');
-    }
-    public function deploy()
-    {
-        $this->service->parse();
-        $activity = StartService::run($this->service);
-        $this->emit('newMonitorActivity', $activity->id);
-    }
-    public function stop()
-    {
-        StopService::run($this->service);
-        $this->service->refresh();
-        $this->emit('success', 'Service stopped successfully.');
-        $this->checkStatus();
-    }
-}

app/Http/Livewire/Project/Service/StackForm.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Service;
-
-use Livewire\Component;
-
-class StackForm extends Component
-{
-    public $service;
-    protected $listeners = ["saveCompose"];
-    protected $rules = [
-        'service.docker_compose_raw' => 'required',
-        'service.docker_compose' => 'required',
-        'service.name' => 'required',
-        'service.description' => 'nullable',
-    ];
-    public function saveCompose($raw)
-    {
-        $this->service->docker_compose_raw = $raw;
-        $this->submit();
-    }
-
-    public function submit()
-    {
-        try {
-            $this->validate();
-            $this->service->save();
-            $this->service->parse();
-            $this->service->refresh();
-            $this->service->saveComposeConfigs();
-            $this->emit('refreshStacks');
-            $this->emit('refreshEnvs');
-            $this->emit('success', 'Service saved successfully.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-    public function render()
-    {
-        return view('livewire.project.service.stack-form');
-    }
-}

app/Http/Livewire/Project/Shared/Danger.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Jobs\StopResourceJob;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Danger extends Component
-{
-    public $resource;
-    public array $parameters;
-    public ?string $modalId = null;
-
-    public function mount()
-    {
-        $this->modalId = new Cuid2(7);
-        $this->parameters = get_route_parameters();
-    }
-
-    public function delete()
-    {
-        try {
-            StopResourceJob::dispatchSync($this->resource);
-            return redirect()->route('project.resources', [
-                'project_uuid' => $this->parameters['project_uuid'],
-                'environment_name' => $this->parameters['environment_name']
-            ]);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

app/Http/Livewire/Project/Shared/Destination.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use Livewire\Component;
-
-class Destination extends Component
-{
-    public $destination;
-}

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

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
-
-use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-use Illuminate\Support\Str;
-
-class Show extends Component
-{
-    public $parameters;
-    public ModelsEnvironmentVariable $env;
-    public ?string $modalId = null;
-    public bool $isDisabled = false;
-    public string $type;
-
-    protected $rules = [
-        'env.key' => 'required|string',
-        'env.value' => 'nullable',
-        'env.is_build_time' => 'required|boolean',
-    ];
-    protected $validationAttributes = [
-        'key' => 'key',
-        'value' => 'value',
-        'is_build_time' => 'build',
-    ];
-
-    public function mount()
-    {
-        $this->isDisabled = false;
-        if (Str::of($this->env->key)->startsWith('SERVICE_FQDN') || Str::of($this->env->key)->startsWith('SERVICE_URL')) {
-            $this->isDisabled = true;
-        }
-        $this->modalId = new Cuid2(7);
-        $this->parameters = get_route_parameters();
-    }
-
-    public function instantSave()
-    {
-        $this->submit();
-    }
-    public function submit()
-    {
-        $this->validate();
-        $this->env->save();
-        $this->emit('success', 'Environment variable updated successfully.');
-        $this->emit('refreshEnvs');
-    }
-
-    public function delete()
-    {
-        $this->env->delete();
-        $this->emit('refreshEnvs');
-    }
-}

app/Http/Livewire/Project/Shared/GetLogs.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Models\Server;
-use Illuminate\Support\Facades\Process;
-use Livewire\Component;
-
-class GetLogs extends Component
-{
-    public string $outputs = '';
-    public string $errors = '';
-    public Server $server;
-    public ?string $container = null;
-    public ?bool $streamLogs = false;
-    public ?bool $showTimeStamps = true;
-    public int $numberOfLines = 100;
-    public function doSomethingWithThisChunkOfOutput($output)
-    {
-        $this->outputs .= $output;
-    }
-    public function instantSave()
-    {
-    }
-    public function getLogs($refresh = false)
-    {
-        if ($this->container) {
-            if ($this->showTimeStamps) {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
-            } else {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
-            }
-            if ($refresh) {
-                $this->outputs = '';
-            }
-            Process::run($sshCommand, function (string $type, string $output) {
-                $this->doSomethingWithThisChunkOfOutput($output);
-            });
-        }
-    }
-    public function render()
-    {
-        return view('livewire.project.shared.get-logs');
-    }
-}

app/Http/Livewire/Project/Shared/Storages/Add.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared\Storages;
-
-use Livewire\Component;
-
-class Add extends Component
-{
-    public $uuid;
-    public $parameters;
-    public string $name;
-    public string $mount_path;
-    public string|null $host_path = null;
-
-    protected $listeners = ['clearAddStorage' => 'clear'];
-    protected $rules = [
-        'name' => 'required|string',
-        'mount_path' => 'required|string',
-        'host_path' => 'string|nullable',
-    ];
-    protected $validationAttributes = [
-        'name' => 'name',
-        'mount_path' => 'mount',
-        'host_path' => 'host',
-    ];
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function submit()
-    {
-        $this->validate();
-        $name = $this->uuid . '-' . $this->name;
-        $this->emit('addNewVolume', [
-            'name' => $name,
-            'mount_path' => $this->mount_path,
-            'host_path' => $this->host_path,
-        ]);
-    }
-
-    public function clear()
-    {
-        $this->name = '';
-        $this->mount_path = '';
-        $this->host_path = null;
-    }
-}

app/Http/Livewire/Settings/Configuration.php

@@ -1,153 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Settings;
-
-use App\Jobs\ContainerStatusJob;
-use App\Models\InstanceSettings as ModelsInstanceSettings;
-use App\Models\Server;
-use Livewire\Component;
-use Spatie\Url\Url;
-use Symfony\Component\Yaml\Yaml;
-
-class Configuration extends Component
-{
-    public ModelsInstanceSettings $settings;
-    public bool $do_not_track;
-    public bool $is_auto_update_enabled;
-    public bool $is_registration_enabled;
-    public bool $next_channel;
-    protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
-    protected Server $server;
-
-    protected $rules = [
-        'settings.fqdn' => 'nullable',
-        'settings.resale_license' => 'nullable',
-        'settings.public_port_min' => 'required',
-        'settings.public_port_max' => 'required',
-    ];
-    protected $validationAttributes = [
-        'settings.fqdn' => 'FQDN',
-        'settings.resale_license' => 'Resale License',
-        'settings.public_port_min' => 'Public port min',
-        'settings.public_port_max' => 'Public port max',
-    ];
-
-    public function mount()
-    {
-        $this->do_not_track = $this->settings->do_not_track;
-        $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
-        $this->is_registration_enabled = $this->settings->is_registration_enabled;
-        $this->next_channel = $this->settings->next_channel;
-    }
-
-    public function instantSave()
-    {
-        $this->settings->do_not_track = $this->do_not_track;
-        $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
-        $this->settings->is_registration_enabled = $this->is_registration_enabled;
-        if ($this->next_channel) {
-            $this->settings->next_channel = false;
-            $this->next_channel = false;
-        } else {
-            $this->settings->next_channel = $this->next_channel;
-        }
-        $this->settings->save();
-        $this->emit('success', 'Settings updated!');
-    }
-
-    public function submit()
-    {
-        $this->resetErrorBag();
-        if ($this->settings->public_port_min > $this->settings->public_port_max) {
-            $this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
-            return;
-        }
-        $this->validate();
-        $this->settings->save();
-        $this->server = Server::findOrFail(0);
-        $this->setup_instance_fqdn();
-        $this->emit('success', 'Instance settings updated successfully!');
-    }
-
-    private function setup_instance_fqdn()
-    {
-        $file = "$this->dynamic_config_path/coolify.yaml";
-        if (empty($this->settings->fqdn)) {
-            instant_remote_process([
-                "rm -f $file",
-            ], $this->server);
-        } else {
-            $url = Url::fromString($this->settings->fqdn);
-            $host = $url->getHost();
-            $schema = $url->getScheme();
-            $traefik_dynamic_conf = [
-                'http' =>
-                [
-                    'routers' =>
-                    [
-                        'coolify-http' =>
-                        [
-                            'entryPoints' => [
-                                0 => 'http',
-                            ],
-                            'service' => 'coolify',
-                            'rule' => "Host(`{$host}`)",
-                        ],
-                    ],
-                    'services' =>
-                    [
-                        'coolify' =>
-                        [
-                            'loadBalancer' =>
-                            [
-                                'servers' =>
-                                [
-                                    0 =>
-                                    [
-                                        'url' => 'http://coolify:80',
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ];
-
-            if ($schema === 'https') {
-                $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
-                ];
-                $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
-                    'entryPoints' => [
-                        0 => 'https',
-                    ],
-                    'service' => 'coolify',
-                    'rule' => "Host(`{$host}`)",
-                    'tls' => [
-                        'certresolver' => 'letsencrypt',
-                    ],
-                ];
-            }
-            $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-        }
-    }
-
-    private function save_configuration_to_disk(array $traefik_dynamic_conf, string $file)
-    {
-        $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
-        $yaml =
-            "# This file is automatically generated by Coolify.\n" .
-            "# Do not edit it manually (only if you know what are you doing).\n\n" .
-            $yaml;
-
-        $base64 = base64_encode($yaml);
-        instant_remote_process([
-            "mkdir -p $this->dynamic_config_path",
-            "echo '$base64' | base64 -d > $file",
-        ], $this->server);
-
-        if (config('app.env') == 'local') {
-            ray($yaml);
-        }
-    }
-}

app/Http/Livewire/Source/Github/Change.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Source\Github;
-
-use App\Models\GithubApp;
-use Livewire\Component;
-
-class Change extends Component
-{
-    public string $webhook_endpoint;
-    public string|null $ipv4;
-    public string|null $ipv6;
-    public string|null $fqdn;
-
-    public bool|null $default_permissions = true;
-    public bool|null $preview_deployment_permissions = true;
-
-    public $parameters;
-    public GithubApp $github_app;
-    public string $name;
-    public bool $is_system_wide;
-
-    protected $rules = [
-        'github_app.name' => 'required|string',
-        'github_app.organization' => 'nullable|string',
-        'github_app.api_url' => 'required|string',
-        'github_app.html_url' => 'required|string',
-        'github_app.custom_user' => 'required|string',
-        'github_app.custom_port' => 'required|int',
-        'github_app.app_id' => 'required|int',
-        'github_app.installation_id' => 'nullable',
-        'github_app.client_id' => 'nullable',
-        'github_app.client_secret' => 'nullable',
-        'github_app.webhook_secret' => 'nullable',
-        'github_app.is_system_wide' => 'required|bool',
-    ];
-
-    public function mount()
-    {
-        if (isCloud() && !isDev()) {
-            $this->webhook_endpoint = config('app.url');
-        } else {
-            $this->webhook_endpoint = $this->ipv4;
-            $this->is_system_wide = $this->github_app->is_system_wide;
-        }
-        $this->parameters = get_route_parameters();
-    }
-
-    public function submit()
-    {
-        try {
-            $this->validate();
-            $this->github_app->save();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSave()
-    {
-    }
-
-    public function delete()
-    {
-        try {
-            $this->github_app->delete();
-            redirect()->route('source.all');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

app/Http/Middleware/CheckForcePasswordReset.php

@@ -24,7 +24,7 @@ class CheckForcePasswordReset
             }
             $force_password_reset = auth()->user()->force_password_reset;
             if ($force_password_reset) {
-                if ($request->routeIs('auth.force-password-reset') || $request->path() === 'livewire/message/force-password-reset') {
+                if ($request->routeIs('auth.force-password-reset') || $request->path() === 'force-password-reset' || $request->path() === 'livewire/update' ||  $request->path() === 'logout') {
                     return $next($request);
                 }
                 return redirect()->route('auth.force-password-reset');

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -11,6 +11,9 @@ class DecideWhatToDoWithUser
 {
     public function handle(Request $request, Closure $next): Response
     {
+        if(auth()?->user()?->currentTeam()){
+            refreshSession(auth()->user()->currentTeam());
+        }
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
             if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
                 return redirect('boarding');

app/Http/Middleware/NOTUSEDIsBoardingFlow.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Support\Str;
-
-class IsBoardingFlow
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        // ray()->showQueries()->color('orange');
-        if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
-            if (Str::startsWith($request->path(), 'invitations')) {
-                return $next($request);
-            }
-            return redirect('boarding');
-        }
-        return $next($request);
-    }
-}

app/Http/Middleware/NOTUSEDIsSubscriptionValid.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Support\Str;
-
-class IsSubscriptionValid
-{
-    public function handle(Request $request, Closure $next): Response
-    {
-        if (isInstanceAdmin()) {
-            return $next($request);
-        }
-        if (!auth()->user() || !isCloud()) {
-            if ($request->path() === 'subscription') {
-                return redirect('/');
-            } else {
-                return $next($request);
-            }
-        }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
-            // ray('active subscription Middleware');
-            return redirect('/');
-        }
-        if (isSubscriptionOnGracePeriod()) {
-            // ray('is_subscription_in_grace_period Middleware');
-            return $next($request);
-        }
-        if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
-            // ray('SubscriptionValid Middleware');
-            if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
-                if (Str::startsWith($request->path(), 'invitations')) {
-                    return $next($request);
-                }
-                return redirect('subscription');
-            } else {
-                return $next($request);
-            }
-        }
-        return $next($request);
-    }
-}

app/Jobs/ApplicationDeploymentNewJob.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Enums\ApplicationDeploymentStatus;
+use App\Models\Application;
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Server;
+use App\Traits\ExecuteRemoteCommand;
+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;
+use RuntimeException;
+use Throwable;
+
+class ApplicationDeploymentNewJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
+
+    public $timeout = 3600;
+    public $tries = 1;
+
+    public static int $batch_counter = 0;
+    public Server $mainServer;
+    public $servers;
+    public string $basedir;
+    public string $workdir;
+
+    public string $deploymentUuid;
+    public int $pullRequestId = 0;
+
+    // Git related
+    public string $gitImportCommands;
+    public ?string $gitType = null;
+    public string $gitRepository;
+    public string $gitBranch;
+    public int $gitPort;
+    public string $gitFullRepoUrl;
+
+    public function __construct(public ApplicationDeploymentQueue $deployment, public Application $application)
+    {
+        $this->mainServer = data_get($this->application, 'destination.server');
+        $this->deploymentUuid = data_get($this->deployment, 'deployment_uuid');
+        $this->pullRequestId = data_get($this->deployment, 'pull_request_id', 0);
+        $this->gitType = data_get($this->deployment, 'git_type');
+
+        $this->basedir = $this->application->generateBaseDir($this->deploymentUuid);
+        $this->workdir = $this->basedir . rtrim($this->application->base_directory, '/');
+    }
+    public function handle()
+    {
+        try {
+            ray()->clearAll();
+            $this->deployment->setStatus(ApplicationDeploymentStatus::IN_PROGRESS->value);
+
+            $hostIpMappings = $this->mainServer->getHostIPMappings($this->application->destination->network);
+            if ($this->application->dockerfile_target_build) {
+                $buildTarget = " --target {$this->application->dockerfile_target_build} ";
+            }
+
+            // Get the git repository and port (custom port or default port)
+            [
+                'repository' => $this->gitRepository,
+                'port' => $this->gitPort
+            ] = $this->application->customRepository();
+
+            // Get the git branch and git import commands
+            [
+                'commands' => $this->gitImportCommands,
+                'branch' => $this->gitBranch,
+                'fullRepoUrl' => $this->gitFullRepoUrl
+            ] = $this->application->generateGitImportCommands($this->deploymentUuid, $this->pullRequestId, $this->gitType);
+
+            $this->servers = $this->application->servers();
+
+            if ($this->deployment->restart_only) {
+                if ($this->application->build_pack === 'dockerimage') {
+                    throw new \Exception('Restart only is not supported for docker image based deployments');
+                }
+                $this->deployment->addLogEntry("Starting deployment of {$this->application->name}.");
+                $this->servers->each(function ($server) {
+                    $this->deployment->addLogEntry("Restarting {$this->application->name} on {$server->name}.");
+                    $this->restartOnly($server);
+                });
+            }
+            $this->next(ApplicationDeploymentStatus::FINISHED->value);
+        } catch (Throwable $exception) {
+            $this->fail($exception);
+        } finally {
+            $this->servers->each(function ($server) {
+                $this->deployment->addLogEntry("Cleaning up temporary containers on {$server->name}.");
+                $server->executeRemoteCommand(
+                    commands: collect([])->push([
+                        "command" => "docker rm -f {$this->deploymentUuid}",
+                        "hidden" => true,
+                        "ignoreErrors" => true,
+                    ]),
+                    loggingModel: $this->deployment
+                );
+            });
+        }
+    }
+    public function restartOnly(Server $server)
+    {
+        $server->executeRemoteCommand(
+            commands: $this->application->prepareHelperImage($this->deploymentUuid),
+            loggingModel: $this->deployment
+        );
+
+        $privateKey = data_get($this->application, 'private_key.private_key', null);
+        $gitLsRemoteCommand = collect([]);
+        if ($privateKey) {
+            $privateKey = base64_decode($privateKey);
+            $gitLsRemoteCommand
+                ->push([
+                    "command" => executeInDocker($this->deploymentUuid, "mkdir -p /root/.ssh")
+                ])
+                ->push([
+                    "command" => executeInDocker($this->deploymentUuid, "echo '{$privateKey}' | base64 -d > /root/.ssh/id_rsa")
+                ])
+                ->push([
+                    "command" => executeInDocker($this->deploymentUuid, "chmod 600 /root/.ssh/id_rsa")
+                ])
+                ->push([
+                    "name" => "git_commit_sha",
+                    "command" => executeInDocker($this->deploymentUuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->gitPort} -o Port={$this->gitPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->gitFullRepoUrl} {$this->gitBranch}"),
+                    "hidden" => true,
+                ]);
+        } else {
+            $gitLsRemoteCommand->push([
+                "name" => "git_commit_sha",
+                "command" => executeInDocker($this->deploymentUuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->gitPort} -o Port={$this->gitPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->gitFullRepoUrl} {$this->gitBranch}"),
+                "hidden" => true,
+            ]);
+        }
+        $this->deployment->addLogEntry("Checking if there is any new commit on {$this->gitBranch} branch.");
+
+        $server->executeRemoteCommand(
+            commands: $gitLsRemoteCommand,
+            loggingModel: $this->deployment
+        );
+        $commit = str($this->deployment->getOutput('git_commit_sha'))->before("\t");
+
+        [
+            'productionImageName' => $productionImageName
+        ] = $this->application->generateImageNames($commit, $this->pullRequestId);
+
+        $this->deployment->addLogEntry("Checking if the image {$productionImageName} already exists.");
+        $server->checkIfDockerImageExists($productionImageName, $this->deployment);
+
+        if (str($this->deployment->getOutput('local_image_found'))->isNotEmpty()) {
+            $this->deployment->addLogEntry("Image {$productionImageName} already exists. Skipping the build.");
+
+            $server->createWorkDirForDeployment($this->workdir, $this->deployment);
+
+            $this->application->generateDockerComposeFile($server, $this->deployment, $this->workdir);
+            $this->application->rollingUpdateApplication($server, $this->deployment, $this->workdir);
+            return;
+        }
+        throw new RuntimeException('Cannot find image anywhere. Please redeploy the application.');
+    }
+    public function failed(Throwable $exception): void
+    {
+        ray($exception);
+        $this->next(ApplicationDeploymentStatus::FAILED->value);
+    }
+    private function next(string $status)
+    {
+        // If the deployment is cancelled by the user, don't update the status
+        if ($this->deployment->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
+            $this->deployment->update([
+                'status' => $status,
+            ]);
+        }
+        queue_next_deployment($this->application, isNew: true);
+    }
+}

app/Jobs/ApplicationRestartJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Traits\ExecuteRemoteCommand;
+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 ApplicationRestartJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
+
+    public $timeout = 3600;
+    public $tries = 1;
+    public string $applicationDeploymentQueueId;
+    public function __construct(string $applicationDeploymentQueueId)
+    {
+        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
+    }
+    public function handle() {
+        ray('Restarting application');
+    }
+}

app/Jobs/CheckLogDrainContainerJob.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Server\InstallLogDrain;
+use App\Models\Server;
+use App\Notifications\Container\ContainerRestarted;
+use App\Notifications\Container\ContainerStopped;
+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\Sleep;
+
+class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+    public function healthcheck()
+    {
+        $status = instant_remote_process(["docker inspect --format='{{json .State.Status}}' coolify-log-drain"], $this->server, false);
+        if (str($status)->contains('running')) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    public function handle(): void
+    {
+        // ray("checking log drain statuses for {$this->server->id}");
+        try {
+            if (!$this->server->isFunctional()) {
+                return;
+            };
+            $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
+            if (!$containers) {
+                return;
+            }
+            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+            $containers = format_docker_command_output_to_json($containers);
+
+            $foundLogDrainContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-log-drain';
+            })->first();
+            if (!$foundLogDrainContainer || !$this->healthcheck()) {
+                ray('Log drain container not found or unhealthy. Restarting...');
+                InstallLogDrain::run($this->server);
+                Sleep::for(10)->seconds();
+                if ($this->healthcheck()) {
+                    if ($this->server->log_drain_notification_sent) {
+                        $this->server->team?->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                        $this->server->update(['log_drain_notification_sent' => false]);
+                    }
+                    return;
+                }
+                if (!$this->server->log_drain_notification_sent) {
+                    ray('Log drain container still unhealthy. Sending notification...');
+                    $this->server->team?->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
+                    $this->server->update(['log_drain_notification_sent' => true]);
+                }
+            } else {
+                if ($this->server->log_drain_notification_sent) {
+                    $this->server->team?->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                    $this->server->update(['log_drain_notification_sent' => false]);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification("CheckLogDrainContainerJob failed on ({$this->server->id}) with: " . $e->getMessage());
+            ray($e->getMessage());
+            handleError($e);
+        }
+    }
+}

app/Jobs/CheckResaleLicenseJob.php

@@ -21,7 +21,7 @@ class CheckResaleLicenseJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
-            resolve(CheckResaleLicense::class)();
+            CheckResaleLicense::run();
         } catch (\Throwable $e) {
             send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
             ray($e);

app/Jobs/CleanupHelperContainersJob.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CleanupHelperContainersJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function handle(): void
+    {
+        try {
+            ray('Cleaning up helper containers on ' . $this->server->name);
+            $containers = instant_remote_process(['docker container ps --filter "ancestor=ghcr.io/coollabsio/coolify-helper:next" --filter "ancestor=ghcr.io/coollabsio/coolify-helper:latest" --format \'{{json .}}\''], $this->server, false);
+            $containers = format_docker_command_output_to_json($containers);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerId = data_get($container,'ID');
+                    ray('Removing container ' . $containerId);
+                    instant_remote_process(['docker container rm -f ' . $containerId], $this->server, false);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('CleanupHelperContainersJob failed with error: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+    }
+}

app/Jobs/ContainerStatusJob.php

@@ -2,14 +2,13 @@
 
 namespace App\Jobs;
 
+use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
-use App\Notifications\Server\Revived;
-use App\Notifications\Server\Unreachable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -18,131 +17,101 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 
 class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public function __construct(public Server $server)
+    public $tries = 4;
+    public function backoff(): int
     {
+        return isDev() ? 1 : 3;
     }
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): int
     {
-        return $this->server->id;
+        return $this->server->uuid;
     }
 
-    public function handle(): void
+    public function __construct(public Server $server)
     {
-        ray("checking server status for {$this->server->id}");
+        // $this->handle();
+    }
+
+    public function handle()
+    {
+        if (!$this->server->isServerReady($this->tries)) {
+            throw new \RuntimeException('Server is not reachable.');
+        };
         try {
-            // ray()->clearAll();
-            $serverUptimeCheckNumber = $this->server->unreachable_count;
-            $serverUptimeCheckNumberMax = 3;
-
-            // ray('checking # ' . $serverUptimeCheckNumber);
-            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
-                if ($this->server->unreachable_email_sent === false) {
-                    ray('Server unreachable, sending notification...');
-                    $this->server->team->notify(new Unreachable($this->server));
-                    $this->server->update(['unreachable_email_sent' => true]);
-                }
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-                return;
-            }
-            $result = $this->server->validateConnection();
-            if ($result) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
+            if ($this->server->isSwarm()) {
+                $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
+                $containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
             } else {
-                $serverUptimeCheckNumber++;
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => $serverUptimeCheckNumber,
-                ]);
-                return;
-            }
-
-            if (data_get($this->server, 'unreachable_email_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->server->team->notify(new Revived($this->server));
-                $this->server->update(['unreachable_email_sent' => false]);
-            }
-            if (
-                data_get($this->server, 'settings.is_reachable') === false ||
-                data_get($this->server, 'settings.is_usable') === false
-            ) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
-            // $this->server->validateDockerEngine(true);
-            $containers = instant_remote_process(["docker container ls -q"], $this->server);
+                // Precheck for containers
+                $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
                 if (!$containers) {
                     return;
                 }
-            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+                $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
+                $containerReplicates = null;
+            }
+            if (is_null($containers)) {
+                return;
+            }
             $containers = format_docker_command_output_to_json($containers);
+            if ($containerReplicates) {
+                $containerReplicates = format_docker_command_output_to_json($containerReplicates);
+                foreach ($containerReplicates as $containerReplica) {
+                    $name = data_get($containerReplica, 'Name');
+                    $containers = $containers->map(function ($container) use ($name, $containerReplica) {
+                        if (data_get($container, 'Spec.Name') === $name) {
+                            $replicas = data_get($containerReplica, 'Replicas');
+                            $running = str($replicas)->explode('/')[0];
+                            $total = str($replicas)->explode('/')[1];
+                            if ($running === $total) {
+                                data_set($container, 'State.Status', 'running');
+                                data_set($container, 'State.Health.Status', 'healthy');
+                            } else {
+                                data_set($container, 'State.Status', 'starting');
+                                data_set($container, 'State.Health.Status', 'unhealthy');
+                            }
+                        }
+                        return $container;
+                    });
+                }
+            }
             $applications = $this->server->applications();
             $databases = $this->server->databases();
             $services = $this->server->services()->get();
             $previews = $this->server->previews();
-            $this->server->proxyType();
-            /// Check if proxy is running
-            $foundProxyContainer = $containers->filter(function ($value, $key) {
-                return data_get($value, 'Name') === '/coolify-proxy';
-            })->first();
-            if (!$foundProxyContainer) {
-                try {
-                    $shouldStart = CheckProxy::run($this->server);
-                    if ($shouldStart) {
-                        StartProxy::run($this->server, false);
-                        $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                    } else {
-                        ray('Proxy could not be started.');
-                    }
-                } catch (\Throwable $e) {
-                    ray($e);
-                }
-            } else {
-                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
-                $this->server->save();
-                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-            }
             $foundApplications = [];
             $foundApplicationPreviews = [];
             $foundDatabases = [];
             $foundServices = [];
 
             foreach ($containers as $container) {
+                if ($this->server->isSwarm()) {
+                    $labels = data_get($container, 'Spec.Labels');
+                    $uuid = data_get($labels, 'coolify.name');
+                } else {
+                    $labels = data_get($container, 'Config.Labels');
+                }
                 $containerStatus = data_get($container, 'State.Status');
                 $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
                 $containerStatus = "$containerStatus ($containerHealth)";
-                $labels = data_get($container, 'Config.Labels');
                 $labels = Arr::undot(format_docker_labels_to_json($labels));
-                $labelId = data_get($labels, 'coolify.applicationId');
-                if ($labelId) {
-                    if (str_contains($labelId, '-pr-')) {
+                $applicationId = data_get($labels, 'coolify.applicationId');
+                if ($applicationId) {
                     $pullRequestId = data_get($labels, 'coolify.pullRequestId');
-                        $applicationId = (int) Str::before($labelId, '-pr-');
+                    if ($pullRequestId) {
+                        if (str($applicationId)->contains('-')) {
+                            $applicationId = str($applicationId)->before('-');
+                        }
                         $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
@@ -154,7 +123,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                             //Notify user that this container should not be there.
                         }
                     } else {
-                        $application = $applications->where('id', $labelId)->first();
+                        $application = $applications->where('id', $applicationId)->first();
                         if ($application) {
                             $foundApplications[] = $application->id;
                             $statusFromDb = $application->status;
@@ -170,11 +139,25 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     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";
+                                    }
+                                })->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.
                         }
@@ -230,11 +213,16 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
-                $project = data_get($service, 'environment.project');
-                $environment = data_get($service, 'environment');
+                $projectUuid = data_get($service, 'environment.project.uuid');
+                $serviceUuid = data_get($service, 'uuid');
+                $environmentName = data_get($service, 'environment.name');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/service/" . $service->uuid;
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                if ($projectUuid && $serviceUuid && $environmentName) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
+                } else {
+                    $url = null;
+                }
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
                 $exitedService->update(['status' => 'exited']);
             }
 
@@ -251,12 +239,17 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
 
-                $project = data_get($application, 'environment.project');
-                $environment = data_get($application, 'environment');
+                $projectUuid = data_get($application, 'environment.project.uuid');
+                $applicationUuid = data_get($application, 'uuid');
+                $environment = data_get($application, 'environment.name');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $application->uuid;
+                if ($projectUuid && $applicationUuid && $environment) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
+                }
 
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
             foreach ($notRunningApplicationPreviews as $previewId) {
@@ -271,11 +264,17 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
 
-                $project = data_get($preview, 'application.environment.project');
-                $environment = data_get($preview, 'application.environment');
+                $projectUuid = data_get($preview, 'application.environment.project.uuid');
+                $environmentName = data_get($preview, 'application.environment.name');
+                $applicationUuid = data_get($preview, 'application.uuid');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $preview->application->uuid;
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                if ($projectUuid && $applicationUuid && $environmentName) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
+                }
+
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
             foreach ($notRunningDatabases as $database) {
@@ -290,16 +289,47 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name;
 
-                $project = data_get($database, 'environment.project');
-                $environment = data_get($database, 'environment');
+                $projectUuid = data_get($database, 'environment.project.uuid');
+                $environmentName = data_get($database, 'environment.name');
+                $databaseUuid = data_get($database, 'uuid');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                if ($projectUuid && $databaseUuid && $environmentName) {
+                    $url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
+                } else {
+                    $url = null;
+                }
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            }
+
+            // Check if proxy is running
+            $this->server->proxyType();
+            $foundProxyContainer = $containers->filter(function ($value, $key) {
+                if ($this->server->isSwarm()) {
+                    return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
+                } else {
+                    return data_get($value, 'Name') === '/coolify-proxy';
+                }
+            })->first();
+            if (!$foundProxyContainer) {
+                try {
+                    $shouldStart = CheckProxy::run($this->server);
+                    if ($shouldStart) {
+                        StartProxy::run($this->server, false);
+                        $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
                     }
                 } catch (\Throwable $e) {
-            send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
+                    ray($e);
+                }
+            } else {
+                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
+                $this->server->save();
+                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
-            handleError($e);
+            return handleError($e);
         }
     }
 }

app/Jobs/CoolifyTask.php

@@ -21,6 +21,7 @@ class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
     public function __construct(
         public Activity $activity,
         public bool     $ignore_errors = false,
+        public $call_event_on_finish = null
     ) {
     }
 
@@ -32,6 +33,7 @@ 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
         ]);
 
         $remote_process();

app/Jobs/DatabaseBackupJob.php

@@ -2,10 +2,13 @@
 
 namespace App\Jobs;
 
+use App\Actions\Database\StopDatabase;
+use App\Events\BackupCreated;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -22,6 +25,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Str;
+use Throwable;
 
 class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -30,9 +34,10 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public ?Team $team = null;
     public Server $server;
     public ScheduledDatabaseBackup $backup;
-    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database;
+    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
+    public ?string $directory_name = null;
     public ?ScheduledDatabaseBackupExecution $backup_log = null;
     public string $backup_status = 'failed';
     public ?string $backup_location = null;
@@ -46,10 +51,16 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
+        if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+            $this->database = data_get($this->backup, 'database');
+            $this->server = $this->database->service->server;
+            $this->s3 = $this->backup->s3;
+        } else {
             $this->database = data_get($this->backup, 'database');
             $this->server = $this->database->destination->server;
             $this->s3 = $this->backup->s3;
         }
+    }
 
     public function middleware(): array
     {
@@ -64,13 +75,116 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
+            BackupCreated::dispatch($this->team->id);
+            // Check if team is exists
+            if (is_null($this->team)) {
+                $this->backup->update(['status' => 'failed']);
+                StopDatabase::run($this->database);
+                $this->database->delete();
+                return;
+            }
             $status = Str::of(data_get($this->database, 'status'));
             if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $databaseType = $this->database->databaseType();
+                $serviceUuid = $this->database->service->uuid;
+                $serviceName = str($this->database->service->name)->slug();
+                if ($databaseType === 'standalone-postgresql') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+
+                    $user = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_USER=');
+                    })->first();
+                    if ($user) {
+                        $this->database->postgres_user = str($user)->after('POSTGRES_USER=')->value();
+                    } else {
+                        $this->database->postgres_user = 'postgres';
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_DB=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('POSTGRES_DB=')->value();
+                    } else {
+                        $databasesToBackup = $this->database->postgres_user;
+                    }
+                } else if ($databaseType === 'standalone-mysql') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env | grep MYSQL_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mysql_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                    } else {
+                        throw new \Exception('MYSQL_DATABASE not found');
+                    }
+                } else if ($databaseType === 'standalone-mariadb') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mariadb_root_password = str($rootPassword)->after('MARIADB_ROOT_PASSWORD=')->value();
+                    } else {
+                        $rootPassword = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                        })->first();
+                        if ($rootPassword) {
+                            $this->database->mariadb_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                        }
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MARIADB_DATABASE=')->value();
+                    } else {
+                        $db = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_DATABASE=');
+                        })->first();
+
+                        if ($db) {
+                            $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                        } else {
+                            throw new \Exception('MARIADB_DATABASE or MYSQL_DATABASE not found');
+                        }
+                    }
+                }
+            } else {
+                $databaseName = str($this->database->name)->slug()->value();
+                $this->container_name = $this->database->uuid;
+                $this->directory_name = $databaseName . '-' . $this->container_name;
                 $databaseType = $this->database->type();
                 $databasesToBackup = data_get($this->backup, 'databases_to_backup');
+            }
 
             if (is_null($databasesToBackup)) {
                 if ($databaseType === 'standalone-postgresql') {
@@ -106,12 +220,11 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     return;
                 }
             }
-            $this->container_name = $this->database->uuid;
-            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->container_name;
+            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->directory_name;
 
             if ($this->database->name === 'coolify-db') {
                 $databasesToBackup = ['coolify'];
-                $this->container_name = "coolify-db";
+                $this->directory_name = $this->container_name = "coolify-db";
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }
@@ -173,7 +286,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));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,
@@ -189,13 +302,15 @@ 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));
+                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
                     throw $e;
                 }
             }
         } catch (\Throwable $e) {
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
             throw $e;
+        } finally {
+            BackupCreated::dispatch($this->team->id);
         }
     }
     private function backup_standalone_mongodb(string $databaseWithCollections): void
@@ -304,7 +419,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->backup->number_of_backups_locally === 0) {
             $deletable = $this->backup->executions()->where('status', 'success');
         } else {
-            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally);
+            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally - 1);
         }
         foreach ($deletable->get() as $execution) {
             delete_backup_locally($execution->filename, $this->server);
@@ -323,9 +438,13 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
-            $this->s3->testConnection();
-            $commands[] = "docker run --pull=always -d --network {$this->database->destination->network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper >/dev/null 2>&1";
-
+            $this->s3->testConnection(shouldSave: true);
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $network = $this->database->service->destination->network;
+            } else {
+                $network = $this->database->destination->network;
+            }
+            $commands[] = "docker run --pull=always -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);

app/Jobs/DeleteResourceJob.php

@@ -4,7 +4,7 @@ namespace App\Jobs;
 
 use App\Actions\Application\StopApplication;
 use App\Actions\Database\StopDatabase;
-use App\Actions\Service\StopService;
+use App\Actions\Service\DeleteService;
 use App\Models\Application;
 use App\Models\Service;
 use App\Models\StandaloneMariadb;
@@ -19,7 +19,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
+class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -32,8 +32,10 @@ class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
         try {
             $server = $this->resource->destination->server;
             if (!$server->isFunctional()) {
+                $this->resource->forceDelete();
                 return 'Server is not functional';
             }
+            $this->resource->delete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
@@ -53,15 +55,15 @@ class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
                 case 'standalone-mariadb':
                     StopDatabase::run($this->resource);
                     break;
-                case 'service':
-                    StopService::run($this->resource);
-                    break;
+            }
+            if ($this->resource->type() === 'service') {
+                DeleteService::dispatch($this->resource);
+            } else {
+                $this->resource->forceDelete();
             }
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
-        } finally {
-            $this->resource->delete();
         }
     }
 }

app/Jobs/DockerCleanupJob.php

@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -11,68 +10,58 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+use RuntimeException;
 
 class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 1000;
-    public ?string $dockerRootFilesystem = null;
+    public $timeout = 300;
     public ?int $usageBefore = null;
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
     public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $queuedCount = 0;
-        $this->server->applications()->each(function ($application) use ($queuedCount) {
-            $count = data_get($application->deployments(), 'count', 0);
-            $queuedCount += $count;
-        });
-        if ($queuedCount > 0) {
-            ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
+        try {
+            $isInprogress = false;
+            $this->server->applications()->each(function ($application) use (&$isInprogress) {
+                if ($application->isDeploymentInprogress()) {
+                    $isInprogress = true;
                     return;
                 }
-        try {
+            });
+            if ($isInprogress) {
+                throw new RuntimeException('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+            }
             if (!$this->server->isFunctional()) {
                 return;
             }
-            $this->dockerRootFilesystem = "/";
-            $this->usageBefore = $this->getFilesystemUsage();
+            $this->usageBefore = $this->server->getDiskUsage();
+            ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
-                ray('Cleaning up ' . $this->server->name)->color('orange');
-                instant_remote_process(['docker image prune -af'], $this->server);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
-                instant_remote_process(['docker builder prune -af'], $this->server);
-                $usageAfter = $this->getFilesystemUsage();
+                ray('Cleaning up ' . $this->server->name);
+                instant_remote_process(['docker image prune -af'], $this->server, false);
+                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server, false);
+                instant_remote_process(['docker builder prune -af'], $this->server, false);
+                $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    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 {
-                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
+                    Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);
                 }
             } else {
-                ray('No need to clean up ' . $this->server->name)->color('orange');
+                ray('No need to clean up ' . $this->server->name);
+                Log::info('No need to clean up ' . $this->server->name);
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
-            ray($e->getMessage())->color('orange');
+            ray($e->getMessage());
             throw $e;
         }
     }
-
-    private function getFilesystemUsage()
-    {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
-    }
 }

app/Jobs/PullHelperImageJob.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+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 PullHelperImageJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 1000;
+
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+    public function __construct(public Server $server)
+    {
+    }
+    public function handle(): void
+    {
+        try {
+            $helperImage = config('coolify.helper_image');
+            ray("Pulling {$helperImage}");
+            instant_remote_process(["docker pull -q {$helperImage}"], $this->server, false);
+            ray('PullHelperImageJob done');
+        } catch (\Throwable $e) {
+            send_internal_notification('PullHelperImageJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/SendMessageToTelegramJob.php

@@ -46,11 +46,12 @@ class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
         if (!empty($this->buttons)) {
             foreach ($this->buttons as $button) {
                 $buttonUrl = data_get($button, 'url');
+                $text = data_get($button, 'text', 'Click here');
                 if ($buttonUrl && Str::contains($buttonUrl, 'http://localhost')) {
                     $buttonUrl = str_replace('http://localhost', config('app.url'), $buttonUrl);
                 }
                 $inlineButtons[] = [
-                    'text' => $button['text'],
+                    'text' => $text,
                     'url' => $buttonUrl,
                 ];
             }

app/Jobs/ServerStatusJob.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+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 ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public ?int $disk_usage = null;
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->uuid;
+    }
+
+    public function handle()
+    {
+        ray("checking server status for {$this->server->id}");
+        if (!$this->server->isServerReady(4)) {
+            throw new \RuntimeException('Server is not reachable.');
+        };
+        try {
+            if ($this->server->isFunctional()) {
+                $this->cleanup(notify: false);
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function cleanup(bool $notify = false): void
+    {
+        $this->disk_usage = $this->server->getDiskUsage();
+        if ($this->disk_usage >= $this->server->settings->cleanup_after_percentage) {
+            if ($notify) {
+                if ($this->server->high_disk_usage_notification_sent) {
+                    ray('high disk usage notification already sent');
+                    return;
+                } else {
+                    $this->server->high_disk_usage_notification_sent = true;
+                    $this->server->save();
+                    $this->server->team?->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
+                }
+            } else {
+                DockerCleanupJob::dispatchSync($this->server);
+                $this->cleanup(notify: true);
+            }
+        } else {
+            $this->server->high_disk_usage_notification_sent = false;
+            $this->server->save();
+        }
+    }
+}

app/Livewire/ActivityMonitor.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Enums\ProcessStatus;
 use Livewire\Component;
@@ -8,7 +8,7 @@ use Spatie\Activitylog\Models\Activity;
 
 class ActivityMonitor extends Component
 {
-    public string|null $header = null;
+    public ?string $header = null;
     public $activityId;
     public $isPollingActive = false;
 
@@ -26,31 +26,30 @@ class ActivityMonitor extends Component
 
     public function hydrateActivity()
     {
-        $this->activity = Activity::query()
-            ->find($this->activityId);
+        $this->activity = Activity::find($this->activityId);
     }
 
     public function polling()
     {
         $this->hydrateActivity();
-        $this->setStatus(ProcessStatus::IN_PROGRESS);
+        // $this->setStatus(ProcessStatus::IN_PROGRESS);
         $exit_code = data_get($this->activity, 'properties.exitCode');
         if ($exit_code !== null) {
             if ($exit_code === 0) {
-                $this->setStatus(ProcessStatus::FINISHED);
+                // $this->setStatus(ProcessStatus::FINISHED);
             } else {
-                $this->setStatus(ProcessStatus::ERROR);
+                // $this->setStatus(ProcessStatus::ERROR);
             }
             $this->isPollingActive = false;
-            $this->emit('activityFinished');
+            $this->dispatch('activityFinished');
         }
     }
 
-    protected function setStatus($status)
-    {
-        $this->activity->properties = $this->activity->properties->merge([
-            'status' => $status,
-        ]);
-        $this->activity->save();
-    }
+    // protected function setStatus($status)
+    // {
+    //     $this->activity->properties = $this->activity->properties->merge([
+    //         'status' => $status,
+    //     ]);
+    //     $this->activity->save();
+    // }
 }

app/Livewire/Boarding/Index.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Boarding;
+namespace App\Livewire\Boarding;
 
 use App\Actions\Server\InstallDocker;
 use App\Models\PrivateKey;
@@ -31,9 +31,11 @@ class Index extends Component
     public ?string $remoteServerHost = null;
     public ?int    $remoteServerPort = 22;
     public ?string $remoteServerUser = 'root';
+    public bool $isSwarmManager = false;
+    public bool $isCloudflareTunnel = false;
     public ?Server $createdServer = null;
 
-    public Collection|array $projects = [];
+    public Collection $projects;
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 
@@ -86,7 +88,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         if ($this->selectedServerType === 'localhost') {
             $this->createdServer = Server::find(0);
             if (!$this->createdServer) {
-                return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
+                return $this->dispatch('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
             $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
@@ -108,7 +110,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->createdServer = Server::find($this->selectedExistingServer);
         if (!$this->createdServer) {
-            $this->emit('error', 'Server is not found.');
+            $this->dispatch('error', 'Server is not found.');
             $this->currentState = 'private-key';
             return;
         }
@@ -164,14 +166,14 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->validate([
             'remoteServerName' => 'required',
-            'remoteServerHost' => 'required|ip',
+            'remoteServerHost' => 'required',
             'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);
         $this->privateKey = formatPrivateKey($this->privateKey);
         $foundServer = Server::whereIp($this->remoteServerHost)->first();
         if ($foundServer) {
-            return $this->emit('error', 'IP address is already in use by another team.');
+            return $this->dispatch('error', 'IP address is already in use by another team.');
         }
         $this->createdServer = Server::create([
             'name' => $this->remoteServerName,
@@ -182,13 +184,15 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'private_key_id' => $this->createdPrivateKey->id,
             'team_id' => currentTeam()->id,
         ]);
-        $this->createdServer->save();
+        $this->createdServer->settings->is_swarm_manager = $this->isSwarmManager;
+        $this->createdServer->settings->is_cloudflare_tunnel = $this->isCloudflareTunnel;
+        $this->createdServer->settings->save();
+        $this->createdServer->addInitialNetwork();
         $this->validateServer();
     }
     public function validateServer()
     {
         try {
-            $customErrorMessage = "Server is not reachable:";
             config()->set('coolify.mux_enabled', false);
 
             instant_remote_process(['uptime'], $this->createdServer, true);
@@ -198,7 +202,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             ]);
         } catch (\Throwable $e) {
             $this->serverReachable = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            $this->createdServer->delete();
+            return handleError(error: $e, livewire: $this);
         }
 
         try {
@@ -206,7 +211,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
             if (is_null($dockerVersion)) {
                 $this->currentState = 'install-docker';
-                throw new \Exception('Docker version is not supported or not installed.');
+                throw new \Exception('Docker not found or old version is installed.');
             }
             $this->createdServer->settings()->update([
                 'is_usable' => true,
@@ -214,14 +219,20 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->getProxyType();
         } catch (\Throwable $e) {
             // $this->dockerInstallationStarted = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            return handleError(error: $e, livewire: $this);
         }
     }
     public function installDocker()
     {
+        try {
             $this->dockerInstallationStarted = true;
             $activity = InstallDocker::run($this->createdServer);
-        $this->emit('newMonitorActivity', $activity->id);
+            $this->dispatch('installDocker');
+            $this->dispatch('newMonitorActivity', $activity->id);
+        } catch (\Throwable $e) {
+            $this->dockerInstallationStarted = false;
+            return handleError(error: $e, livewire: $this);
+        }
     }
     public function dockerInstalledOrSkipped()
     {

app/Livewire/CheckLicense.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Actions\License\CheckResaleLicense;
 use App\Models\InstanceSettings;
@@ -32,12 +32,12 @@ class CheckLicense extends Component
         $this->settings->save();
         if ($this->settings->resale_license) {
             try {
-                resolve(CheckResaleLicense::class)();
-                $this->emit('reloadWindow');
+                CheckResaleLicense::run();
+                $this->dispatch('reloadWindow');
             } catch (\Throwable $e) {
                 session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
                 ray($e->getMessage());
-                return redirect()->to('/settings/license');
+                return $this->redirect('/settings/license', navigate: true);
             }
         }
     }

app/Livewire/Dashboard.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Models\Project;
-use App\Models\S3Storage;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -11,7 +10,6 @@ class Dashboard extends Component
 {
     public $projects = [];
     public $servers = [];
-
     public function mount()
     {
         $this->servers = Server::ownedByCurrentTeam()->get();

app/Livewire/Destination/Form.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Destination;
+namespace App\Livewire\Destination;
 
 use Livewire\Component;
 
@@ -16,7 +16,7 @@ class Form extends Component
     protected $validationAttributes = [
         'destination.name' => 'name',
         'destination.network' => 'network',
-        'destination.server.ip' => 'IP Address',
+        'destination.server.ip' => 'IP Address/Domain',
     ];
 
     public function submit()
@@ -30,13 +30,13 @@ class Form extends Component
         try {
             if ($this->destination->getMorphClass() === 'App\Models\StandaloneDocker') {
                 if ($this->destination->attachedTo()) {
-                    return $this->emit('error', 'You must delete all resources before deleting this destination.');
+                    return $this->dispatch('error', 'You must delete all resources before deleting this destination.');
                 }
                 instant_remote_process(["docker network disconnect {$this->destination->network} coolify-proxy"], $this->destination->server, throwError: false);
                 instant_remote_process(['docker network rm -f ' . $this->destination->network], $this->destination->server);
             }
             $this->destination->delete();
-            return redirect()->route('dashboard');
+            return $this->redirectRoute('dashboard', navigate: true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Destination/New/Docker.php

@@ -0,0 +1,100 @@
+<?php
+
+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 Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class Docker extends Component
+{
+    public string $name;
+    public string $network;
+
+    public Collection $servers;
+    public Server $server;
+    public ?int $server_id = null;
+    public bool $is_swarm = false;
+
+    protected $rules = [
+        'name' => 'required|string',
+        'network' => 'required|string',
+        'server_id' => 'required|integer',
+        'is_swarm' => 'boolean'
+    ];
+    protected $validationAttributes = [
+        'name' => 'name',
+        'network' => 'network',
+        'server_id' => 'server',
+        'is_swarm' => 'swarm'
+    ];
+
+    public function mount()
+    {
+        if (request()->query('server_id')) {
+            $this->server_id = request()->query('server_id');
+        } else {
+            if ($this->servers->count() > 0) {
+                $this->server_id = $this->servers->first()->id;
+            }
+        }
+        if (request()->query('network_name')) {
+            $this->network = request()->query('network_name');
+        } else {
+            $this->network = new Cuid2(7);
+        }
+        $this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab();
+    }
+
+    public function generate_name()
+    {
+        $this->server = Server::find($this->server_id);
+        $this->name = str("{$this->server->name}-{$this->network}")->kebab();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->server = Server::find($this->server_id);
+            if ($this->is_swarm) {
+                $found = $this->server->swarmDockers()->where('network', $this->network)->first();
+                if ($found) {
+                    $this->dispatch('error', 'Network already added to this server.');
+                    return;
+                } else {
+                    $docker = SwarmDocker::create([
+                        'name' => $this->name,
+                        'network' => $this->network,
+                        'server_id' => $this->server_id,
+                    ]);
+                }
+            } else {
+                $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
+                if ($found) {
+                    $this->dispatch('error', 'Network already added to this server.');
+                    return;
+                } else {
+                    $docker = ModelsStandaloneDocker::create([
+                        'name' => $this->name,
+                        'network' => $this->network,
+                        'server_id' => $this->server_id,
+                    ]);
+                }
+            }
+            $this->createNetworkAndAttachToProxy();
+            return $this->redirectRoute('destination.show', $docker->uuid, navigate: true);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    private function createNetworkAndAttachToProxy()
+    {
+        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+    }
+}

app/Livewire/Destination/Show.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Destination;
+namespace App\Livewire\Destination;
 
 use App\Models\Server;
 use Illuminate\Support\Collection;
@@ -13,7 +13,11 @@ class Show extends Component
 
     public function scan()
     {
+        if ($this->server->isSwarm()) {
+            $alreadyAddedNetworks = $this->server->swarmDockers;
+        } else {
             $alreadyAddedNetworks = $this->server->standaloneDockers;
+        }
         $networks = instant_remote_process(['docker network ls --format "{{json .}}"'], $this->server, false);
         $this->networks = format_docker_command_output_to_json($networks)->filter(function ($network) {
             return $network['Name'] !== 'bridge' && $network['Name'] !== 'host' && $network['Name'] !== 'none';
@@ -21,7 +25,7 @@ class Show extends Component
             return !$alreadyAddedNetworks->contains('network', $network['Name']);
         });
         if ($this->networks->count() === 0) {
-            $this->emit('success', 'No new networks found.');
+            $this->dispatch('success', 'No new networks found.');
         }
     }
 }

app/Livewire/Dev/Compose.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Dev;
+namespace App\Livewire\Dev;
 
 use Livewire\Component;
 

app/Livewire/ForcePasswordReset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Illuminate\Support\Facades\Hash;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
@@ -35,7 +35,7 @@ class ForcePasswordReset extends Component
             if ($firstLogin) {
                 send_internal_notification('First login for ' . auth()->user()->email);
             }
-            return redirect()->route('dashboard');
+            return $this->redirectRoute('dashboard', navigate: true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Help.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -42,7 +42,7 @@ class Help extends Component
             );
             $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
             send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
-            $this->emit('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
+            $this->dispatch('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Modal/EditCompose.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Livewire\Modal;
+
+use App\Models\Service;
+use LivewireUI\Modal\ModalComponent;
+
+class EditCompose extends ModalComponent
+{
+    public Service $service;
+    public $serviceId;
+    protected $rules = [
+        'service.docker_compose_raw' => 'required',
+        'service.docker_compose' => 'required',
+    ];
+    public function mount() {
+        $this->service = Service::find($this->serviceId);
+    }
+    public function render()
+    {
+        return view('livewire.modal.edit-compose');
+    }
+    public function submit() {
+        $this->dispatch('warning', "Saving new docker compose...");
+        $this->dispatch('saveCompose', $this->service->docker_compose_raw);
+        $this->closeModal();
+    }
+}

app/Livewire/Notifications/DiscordSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Notifications;
+namespace App\Livewire\Notifications;
 
 use App\Models\Team;
 use App\Notifications\Test;
@@ -47,12 +47,12 @@ class DiscordSettings extends Component
     {
         $this->team->save();
         refreshSession();
-        $this->emit('success', 'Settings saved.');
+        $this->dispatch('success', 'Settings saved.');
     }
 
     public function sendTestNotification()
     {
-        $this->team->notify(new Test());
-        $this->emit('success', 'Test notification sent.');
+        $this->team?->notify(new Test());
+        $this->dispatch('success', 'Test notification sent.');
     }
 }

app/Livewire/Notifications/EmailSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Notifications;
+namespace App\Livewire\Notifications;
 
 use App\Models\InstanceSettings;
 use App\Models\Team;
@@ -63,15 +63,15 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->emit('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
     public function sendTestNotification()
     {
-        $this->team->notify(new Test($this->emails));
-        $this->emit('success', 'Test Email sent successfully.');
+        $this->team?->notify(new Test($this->emails));
+        $this->dispatch('success', 'Test Email sent successfully.');
     }
     public function instantSaveInstance()
     {
@@ -83,7 +83,7 @@ class EmailSettings extends Component
             $this->team->resend_enabled = false;
             $this->team->save();
             refreshSession();
-            $this->emit('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -113,7 +113,7 @@ class EmailSettings extends Component
     {
         $this->team->save();
         refreshSession();
-        $this->emit('success', 'Settings saved.');
+        $this->dispatch('success', 'Settings saved.');
     }
     public function submit()
     {
@@ -131,7 +131,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->emit('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved successfully.');
         } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return handleError($e, $this);
@@ -148,7 +148,7 @@ class EmailSettings extends Component
             ]);
             $this->team->save();
             refreshSession();
-            $this->emit('success', 'Settings saved successfully.');
+            $this->dispatch('success', 'Settings saved successfully.');
         } catch (\Throwable $e) {
             $this->team->resend_enabled = false;
             return handleError($e, $this);
@@ -173,7 +173,7 @@ class EmailSettings extends Component
             ]);
             refreshSession();
             $this->team = $team;
-            $this->emit('success', 'Settings saved.');
+            $this->dispatch('success', 'Settings saved.');
             return;
         }
         if ($settings->resend_enabled) {
@@ -184,9 +184,9 @@ class EmailSettings extends Component
             ]);
             refreshSession();
             $this->team = $team;
-            $this->emit('success', 'Settings saved.');
+            $this->dispatch('success', 'Settings saved.');
             return;
         }
-        $this->emit('error', 'Instance SMTP/Resend settings are not enabled.');
+        $this->dispatch('error', 'Instance SMTP/Resend settings are not enabled.');
     }
 }

app/Livewire/Notifications/TelegramSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Notifications;
+namespace App\Livewire\Notifications;
 
 use App\Models\Team;
 use App\Notifications\Test;
@@ -53,12 +53,12 @@ class TelegramSettings extends Component
     {
         $this->team->save();
         refreshSession();
-        $this->emit('success', 'Settings saved.');
+        $this->dispatch('success', 'Settings saved.');
     }
 
     public function sendTestNotification()
     {
-        $this->team->notify(new Test());
-        $this->emit('success', 'Test notification sent.');
+        $this->team?->notify(new Test());
+        $this->dispatch('success', 'Test notification sent.');
     }
 }

app/Livewire/PrivateKey/Change.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PrivateKey;
+namespace App\Livewire\PrivateKey;
 
 use App\Models\PrivateKey;
 use Livewire\Component;
@@ -35,9 +35,9 @@ class Change extends Component
             if ($this->private_key->isEmpty()) {
                 $this->private_key->delete();
                 currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
-                return redirect()->route('security.private-key.index');
+                return $this->redirectRoute('security.private-key.index', navigate: true);
             }
-            $this->emit('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
+            $this->dispatch('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/PrivateKey/Create.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PrivateKey;
+namespace App\Livewire\PrivateKey;
 
 use App\Models\PrivateKey;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
@@ -67,9 +67,9 @@ class Create extends Component
                 'team_id' => currentTeam()->id
             ]);
             if ($this->from === 'server') {
-                return redirect()->route('server.create');
+                return $this->redirectRoute('server.create', navigate: true);
             }
-            return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
+            return $this->redirectRoute('security.private-key.show', ['private_key_uuid' => $private_key->uuid], navigate: true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Profile/Form.php

@@ -1,22 +1,17 @@
 <?php
 
-namespace App\Http\Livewire\Profile;
+namespace App\Livewire\Profile;
 
-use App\Models\User;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Form extends Component
 {
     public int $userId;
-    public string $name;
     public string $email;
 
-    protected $rules = [
-        'name' => 'required',
-    ];
-    protected $validationAttributes = [
-        'name' => 'name',
-    ];
+    #[Validate('required')]
+    public string $name;
 
     public function mount()
     {
@@ -30,9 +25,11 @@ class Form extends Component
     {
         try {
             $this->validate();
-            User::where('id', $this->userId)->update([
+            auth()->user()->update([
                 'name' => $this->name,
             ]);
+
+            $this->dispatch('success', 'Profile updated successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }