Merge pull request #1532 from coollabsio/next

v4.0.0-beta.155

.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

@@ -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

.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

@@ -6,13 +6,14 @@
 You can ask for guidance anytime on our 
 [Discord server](https://coollabs.io/discord) in the `#contribution` channel.
 
+## Code Contribution
 
-## 1) Setup your development environment
+### 1) Setup your development environment
 
 - You need to have Docker Engine (or equivalent) [installed](https://docs.docker.com/engine/install/) on your system.
 - For better DX, install [Spin](https://serversideup.net/open-source/spin/).
 
-## 2) Set your environment variables
+### 2) Set your environment variables
 
 - Copy [.env.development.example](./.env.development.example) to .env.
 
@@ -23,7 +24,14 @@ You can ask for guidance anytime on our
 
 - 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
+### 4) Start development
 You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`.
 
 Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if you logged in with root user.
+
+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

@@ -4,42 +4,48 @@ Coolify is an open-source & self-hostable alternative to Heroku / Netlify / Verc
 
 It helps you to manage your servers, applications, databases on your own hardware, all you need is SSH connection. You can manage VPS, Bare Metal, Raspberry PI's anything.
 
-Image if you could have the ease of a cloud but with your own servers. That is **Coolify**.
+Imagine if you could have the ease of a cloud but with your own servers. That is **Coolify**.
 
 No vendor lock-in, which means that all the configuration for your applications/databases/etc are saved to your server. So if you decide to stop using Coolify (oh nooo), you could still manage your running resources. You just lose the automations and all the magic. 🪄️
 
 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).
 
-Contact us [here](https://coolify.io/contact).
-
-## Recognitions
+# Recognitions
 
+<p>
 <a href="https://news.ycombinator.com/item?id=26624341">
   <img
     style="width: 250px; height: 54px;" width="250" height="54"
@@ -47,14 +53,17 @@ Contact us [here](https://coolify.io/contact).
     src="https://hackernews-badge.vercel.app/api?id=26624341"
   />
 </a>
+</p>
 
 <a href="https://www.producthunt.com/posts/coolify?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-coolify" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=338273&theme=light" alt="Coolify - An&#0032;open&#0045;source&#0032;&#0038;&#0032;self&#0045;hostable&#0032;Heroku&#0044;&#0032;Netlify&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
-## 💰 Financial Contributors
+<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
 
 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)!
 
@@ -74,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

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Actions\Application;
+
+use App\Models\Application;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopApplication
+{
+    use AsAction;
+    public function handle(Application $application)
+    {
+        $server = $application->destination->server;
+        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');
+                    if ($containerName) {
+                        instant_remote_process(
+                            ["docker rm -f {$containerName}"],
+                            $server
+                        );
+                    }
+                }
+                // 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

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Actions\Database;
+
+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 Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
+
+class StartDatabaseProxy
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    {
+        $internalPort = null;
+        $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 ($type === 'App\Models\StandalonePostgresql') {
+            $internalPort = 5432;
+        } else if ($type === 'App\Models\StandaloneMongodb') {
+            $internalPort = 27017;
+        } else if ($type === 'App\Models\StandaloneMysql') {
+            $internalPort = 3306;
+        } else if ($type === 'App\Models\StandaloneMariadb') {
+            $internalPort = 3306;
+        }
+        $configuration_dir = database_proxy_dir($database->uuid);
+        $nginxconf = <<<EOF
+    user  nginx;
+    worker_processes  auto;
+
+    error_log  /var/log/nginx/error.log;
+
+    events {
+        worker_connections  1024;
+    }
+    stream {
+       server {
+            listen $database->public_port;
+            proxy_pass $containerName:$internalPort;
+       }
+    }
+    EOF;
+        $dockerfile = <<< EOF
+    FROM nginx:stable-alpine
+
+    COPY nginx.conf /etc/nginx/nginx.conf
+    EOF;
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $proxyContainerName => [
+                    'build' => [
+                        'context' => $configuration_dir,
+                        'dockerfile' => 'Dockerfile',
+                    ],
+                    'image' => "nginx:stable-alpine",
+                    'container_name' => $proxyContainerName,
+                    'restart' => RESTART_MODE,
+                    'ports' => [
+                        "$database->public_port:$database->public_port",
+                    ],
+                    'networks' => [
+                        $network,
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'stat /etc/nginx/nginx.conf || exit 1',
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 3,
+                        'start_period' => '1s'
+                    ],
+                ]
+            ],
+            'networks' => [
+                $network => [
+                    'external' => true,
+                    'name' => $network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        $dockercompose_base64 = base64_encode(Yaml::dump($docker_compose, 4, 2));
+        $nginxconf_base64 = base64_encode($nginxconf);
+        $dockerfile_base64 = base64_encode($dockerfile);
+        instant_remote_process([
+            "mkdir -p $configuration_dir",
+            "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",
+            "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
+            "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
+            "docker compose --project-directory {$configuration_dir} pull",
+            "docker compose --project-directory {$configuration_dir} up --build -d",
+        ], $server);
+    }
+}

app/Actions/Database/StartMariadb.php

@@ -0,0 +1,170 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMariadb;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMariadb
+{
+    use AsAction;
+
+    public StandaloneMariadb $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMariadb $database)
+    {
+        $this->database = $database;
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mysql();
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mariadb_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
+                'target' => '/etc/mysql/conf.d/custom-config.cnf',
+                'read_only' => true,
+            ];
+        }
+        $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, callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MARIADB_ROOT_PASSWORD={$this->database->mariadb_root_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MARIADB_DATABASE={$this->database->mariadb_database}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_USER'))->isEmpty()) {
+            $environment_variables->push("MARIADB_USER={$this->database->mariadb_user}");
+        }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MARIADB_PASSWORD={$this->database->mariadb_password}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mysql()
+    {
+        if (is_null($this->database->mariadb_conf)) {
+            return;
+        }
+        $filename = 'custom-config.cnf';
+        $content = $this->database->mariadb_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+}

app/Actions/Database/StartMongodb.php

@@ -0,0 +1,190 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMongodb;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMongodb
+{
+    use AsAction;
+
+    public StandaloneMongodb $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMongodb $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "mongod";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mongo_conf();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'mongosh --eval "printjson(db.runCommand(\"ping\"))"'
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mongo_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/mongod.conf',
+                'target' => '/etc/mongo/mongod.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' --config /etc/mongo/mongod.conf';
+        }
+        $this->add_default_database();
+        $docker_compose['services'][$container_name]['volumes'][] = [
+            'type' => 'bind',
+            'source' => $this->configuration_dir . '/docker-entrypoint-initdb.d',
+            'target' => '/docker-entrypoint-initdb.d',
+            'read_only' => true,
+        ];
+
+        $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,callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {
+            $environment_variables->push("MONGO_INITDB_ROOT_USERNAME={$this->database->mongo_initdb_root_username}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_ROOT_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MONGO_INITDB_ROOT_PASSWORD={$this->database->mongo_initdb_root_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MONGO_INITDB_DATABASE={$this->database->mongo_initdb_database}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mongo_conf()
+    {
+        if (is_null($this->database->mongo_conf)) {
+            return;
+        }
+        $filename = 'mongod.conf';
+        $content = $this->database->mongo_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+    private function add_default_database()
+    {
+        $content = "db = db.getSiblingDB(\"{$this->database->mongo_initdb_database}\");db.createCollection('init_collection');db.createUser({user: \"{$this->database->mongo_initdb_root_username}\", pwd: \"{$this->database->mongo_initdb_root_password}\",roles: [{role:\"readWrite\",db:\"{$this->database->mongo_initdb_database}\"}]});";
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js";
+    }
+}

app/Actions/Database/StartMysql.php

@@ -0,0 +1,170 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMysql;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMysql
+{
+    use AsAction;
+
+    public StandaloneMysql $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMysql $database)
+    {
+        $this->database = $database;
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mysql();
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p{$this->database->mysql_root_password}"],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mysql_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
+                'target' => '/etc/mysql/conf.d/custom-config.cnf',
+                'read_only' => true,
+            ];
+        }
+        $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,callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MYSQL_ROOT_PASSWORD={$this->database->mysql_root_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MYSQL_DATABASE={$this->database->mysql_database}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_USER'))->isEmpty()) {
+            $environment_variables->push("MYSQL_USER={$this->database->mysql_user}");
+        }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MYSQL_PASSWORD={$this->database->mysql_password}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mysql()
+    {
+        if (is_null($this->database->mysql_conf)) {
+            return;
+        }
+        $filename = 'custom-config.cnf';
+        $content = $this->database->mysql_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+}

app/Actions/Database/StartPostgresql.php

@@ -2,26 +2,28 @@
 
 namespace App\Actions\Database;
 
-use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use Illuminate\Support\Str;
 use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
 
 class StartPostgresql
 {
+    use AsAction;
+
     public StandalonePostgresql $database;
     public array $commands = [];
     public array $init_scripts = [];
     public string $configuration_dir;
 
-    public function __invoke(Server $server, StandalonePostgresql $database)
+    public function handle(StandalonePostgresql $database)
     {
         $this->database = $database;
         $container_name = $this->database->uuid;
         $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/"
         ];
@@ -30,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' => [
@@ -41,6 +45,9 @@ class StartPostgresql
                     'networks' => [
                         $this->database->destination->network,
                     ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
                     'healthcheck' => [
                         'test' => [
                             'CMD-SHELL',
@@ -59,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,
                 ]
@@ -72,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;
         }
@@ -91,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, $server);
+        $this->commands[] = "echo '{$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -139,6 +172,9 @@ class StartPostgresql
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
             $environment_variables->push("POSTGRES_USER={$this->database->postgres_user}");
         }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PGUSER'))->isEmpty()) {
+            $environment_variables->push("PGUSER={$this->database->postgres_user}");
+        }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_PASSWORD'))->isEmpty()) {
             $environment_variables->push("POSTGRES_PASSWORD={$this->database->postgres_password}");
@@ -163,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

@@ -0,0 +1,170 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneRedis;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartRedis
+{
+    use AsAction;
+
+    public StandaloneRedis $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+
+    public function handle(StandaloneRedis $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "redis-server --requirepass {$this->database->redis_password} --appendonly yes";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo 'Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_redis();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'redis-cli',
+                            'ping'
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
+            $docker_compose['services'][$container_name]['logging'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->redis_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/redis.conf',
+                'target' => '/usr/local/etc/redis/redis.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' /usr/local/etc/redis/redis.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, callEventOnFinish: 'DatabaseStatusChanged');
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("REDIS_PASSWORD={$this->database->redis_password}");
+        }
+
+        return $environment_variables->all();
+    }
+    private function add_custom_redis()
+    {
+        if (is_null($this->database->redis_conf)) {
+            return;
+        }
+        $filename = 'redis.conf';
+        $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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Events\DatabaseStatusChanged;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopDatabase
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    {
+        $server = $database->destination->server;
+        instant_remote_process(
+            ["docker rm -f {$database->uuid}"],
+            $server
+        );
+        if ($database->is_public) {
+            StopDatabaseProxy::run($database);
+        }
+        // TODO: make notification for services
+        // $database->environment->project->team->notify(new StatusChanged($database));
+    }
+}

app/Actions/Database/StopDatabaseProxy.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Actions\Database;
+
+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 Lorisleiva\Actions\Concerns\AsAction;
+
+class StopDatabaseProxy
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    {
+        $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();
-            $settings->update([
-                'is_resale_license_active' => false,
-            ]);
             if (isDev()) {
+                $settings->update([
+                    'is_resale_license_active' => true,
+                ]);
                 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

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class CheckProxy
+{
+    use AsAction;
+    public function handle(Server $server, $fromUI = false)
+    {
+        if (!$server->isProxyShouldRun()) {
+            if ($fromUI) {
+                throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
+            } else {
+                return false;
+            }
+        }
+        if ($server->isSwarm()) {
+            $status = getContainerStatus($server, 'coolify-proxy_traefik');
+            $server->proxy->set('status', $status);
+            $server->save();
+            return false;
+        } else {
+            $status = getContainerStatus($server, 'coolify-proxy');
+            if ($status === 'running') {
+                $server->proxy->set('status', 'running');
+                $server->save();
+                return false;
+            }
+            $ip = $server->ip;
+            if ($server->id === 0) {
+                $ip = 'host.docker.internal';
+            }
+
+            $connection80 = @fsockopen($ip, '80');
+            $connection443 = @fsockopen($ip, '443');
+            $port80 = is_resource($connection80) && fclose($connection80);
+            $port443 = is_resource($connection443) && fclose($connection443);
+            if ($port80) {
+                if ($fromUI) {
+                    throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                } else {
+                    return false;
+                }
+            }
+            if ($port443) {
+                if ($fromUI) {
+                    throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                } else {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+}

app/Actions/Proxy/StartProxy.php

@@ -10,56 +10,57 @@ use Spatie\Activitylog\Models\Activity;
 class StartProxy
 {
     use AsAction;
-    public function handle(Server $server, bool $async = true): Activity|string
+    public function handle(Server $server, bool $async = true): string|Activity
     {
-        $commands = collect([]);
-        $proxyType = $server->proxyType();
-        if ($proxyType === 'none') {
-            return 'OK';
-        }
-        $proxy_path = get_proxy_path();
-        $configuration = CheckConfiguration::run($server);
-        if (!$configuration) {
-            throw new \Exception("Configuration is not synced");
-        }
-        SaveConfiguration::run($server, $configuration);
-        $docker_compose_yml_base64 = base64_encode($configuration);
-        $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-        $server->save();
+        try {
 
-        $commands = $commands->merge([
-            "apt-get update > /dev/null 2>&1 || true",
-            "command -v lsof >/dev/null || echo '####### Installing lsof.'",
-            "command -v lsof >/dev/null || apt install -y lsof",
-            "command -v lsof >/dev/null || command -v fuser >/dev/null || apt install -y psmisc",
-            "mkdir -p $proxy_path && cd $proxy_path",
-            "echo '####### Creating Docker Compose file.'",
-            "echo '####### Pulling docker image.'",
-            'docker compose pull',
-            "echo '####### Stopping existing coolify-proxy.'",
-            "docker compose down -v --remove-orphans > /dev/null 2>&1",
-            "command -v fuser >/dev/null || command -v lsof >/dev/null || echo '####### Could not kill existing processes listening on port 80 & 443. Please stop the process holding these ports...'",
-            "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9 || true",
-            "command -v lsof >/dev/null && lsof -nt -i:443 | xargs -r kill -9 || true",
-            "command -v fuser >/dev/null && fuser -k 80/tcp || true",
-            "command -v fuser >/dev/null && fuser -k 443/tcp || true",
-            "systemctl disable nginx > /dev/null 2>&1 || true",
-            "systemctl disable apache2 > /dev/null 2>&1 || true",
-            "systemctl disable apache > /dev/null 2>&1 || true",
-            "echo '####### Starting coolify-proxy.'",
-            'docker compose up -d --remove-orphans',
-            "echo '####### Proxy installed successfully.'"
-        ]);
-        $commands = $commands->merge(connectProxyToNetworks($server));
-        if ($async) {
-            $activity = remote_process($commands, $server);
-            return $activity;
-        } else {
-            instant_remote_process($commands, $server);
-            $server->proxy->set('status', 'running');
-            $server->proxy->set('type', $proxyType);
+            $proxyType = $server->proxyType();
+            $commands = collect([]);
+            $proxy_path = get_proxy_path();
+            $configuration = CheckConfiguration::run($server);
+            if (!$configuration) {
+                throw new \Exception("Configuration is not synced");
+            }
+            SaveConfiguration::run($server, $configuration);
+            $docker_compose_yml_base64 = base64_encode($configuration);
+            $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
             $server->save();
-            return 'OK';
+            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.'",
+                    "echo 'Pulling docker image.'",
+                    'docker compose pull',
+                    "echo 'Stopping existing coolify-proxy.'",
+                    "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                    "echo 'Starting coolify-proxy.'",
+                    'docker compose up -d --remove-orphans',
+                    "echo 'Proxy started successfully.'"
+                ]);
+                $commands = $commands->merge(connectProxyToNetworks($server));
+            }
+
+            if ($async) {
+                $activity = remote_process($commands, $server);
+                return $activity;
+            } else {
+                instant_remote_process($commands, $server);
+                $server->proxy->set('status', 'running');
+                $server->proxy->set('type', $proxyType);
+                $server->save();
+                return 'OK';
+            }
+        } catch (\Throwable $e) {
+            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)...'",
-                "docker network create --attachable coolify >/dev/null 2>&1 || true",
-                "echo '####### Done!'"
-            ];
+            ]);
+            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",
+                ]);
+                $command = $command->merge([
+                    "echo 'Done!'",
+                ]);
+            }
+
+            return remote_process($command, $server);
         }
-        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

@@ -2,16 +2,18 @@
 
 namespace App\Actions\Server;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 
 class UpdateCoolify
 {
+    use AsAction;
     public ?Server $server = null;
     public ?string $latestVersion = null;
     public ?string $currentVersion = null;
 
-    public function __invoke(bool $force)
+    public function handle(bool $force)
     {
         try {
             $settings = InstanceSettings::get();

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

@@ -14,21 +14,21 @@ class StartService
         $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";
-        $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[] = "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} || 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

@@ -22,5 +22,7 @@ class StopService
         }
         instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
         instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+        // TODO: make notification for databases
+        // $service->environment->project->team->notify(new StatusChanged($service));
     }
 }

app/Console/Commands/Init.php

@@ -3,19 +3,83 @@
 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;
+use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
 {
-    protected $signature = 'app:init';
+    protected $signature = 'app:init {--cleanup}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
+        $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();
     }
+    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
@@ -30,4 +94,167 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
+    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 (!data_get($application, 'environment')) {
+                    echo 'Application without environment' . $application->name . 'deleting\n';
+                    $application->delete();
+                }
+                if (!$application->destination()) {
+                    echo 'Application without destination' . $application->name . 'deleting\n';
+                    $application->delete();
+                }
+                if (!data_get($application, 'destination.server')) {
+                    echo 'Application without server' . $application->name . 'deleting\n';
+                    $application->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            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 . 'deleting\n';
+                    $postgresql->delete();
+                }
+                if (!$postgresql->destination()) {
+                    echo 'Postgresql without destination' . $postgresql->name . 'deleting\n';
+                    $postgresql->delete();
+                }
+                if (!data_get($postgresql, 'destination.server')) {
+                    echo 'Postgresql without server' . $postgresql->name . 'deleting\n';
+                    $postgresql->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $redis->delete();
+                }
+                if (!$redis->destination()) {
+                    echo 'Redis without destination' . $redis->name . 'deleting\n';
+                    $redis->delete();
+                }
+                if (!data_get($redis, 'destination.server')) {
+                    echo 'Redis without server' . $redis->name . 'deleting\n';
+                    $redis->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $mongodb->delete();
+                }
+                if (!$mongodb->destination()) {
+                    echo 'Mongodb without destination' . $mongodb->name . 'deleting\n';
+                    $mongodb->delete();
+                }
+                if (!data_get($mongodb, 'destination.server')) {
+                    echo 'Mongodb without server' . $mongodb->name . 'deleting\n';
+                    $mongodb->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $mysql->delete();
+                }
+                if (!$mysql->destination()) {
+                    echo 'Mysql without destination' . $mysql->name . 'deleting\n';
+                    $mysql->delete();
+                }
+                if (!data_get($mysql, 'destination.server')) {
+                    echo 'Mysql without server' . $mysql->name . 'deleting\n';
+                    $mysql->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $mariadb->delete();
+                }
+                if (!$mariadb->destination()) {
+                    echo 'Mariadb without destination' . $mariadb->name . 'deleting\n';
+                    $mariadb->delete();
+                }
+                if (!data_get($mariadb, 'destination.server')) {
+                    echo 'Mariadb without server' . $mariadb->name . 'deleting\n';
+                    $mariadb->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $service->delete();
+                }
+                if (!$service->destination()) {
+                    echo 'Service without destination' . $service->name . 'deleting\n';
+                    $service->delete();
+                }
+                if (!data_get($service, 'server')) {
+                    echo 'Service without server' . $service->name . 'deleting\n';
+                    $service->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $service->delete();
+                }
+            }
+        } 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 . 'deleting\n';
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
+        }
+    }
 }

app/Console/Commands/ResourcesDelete.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Application;
-use App\Models\Service;
-use App\Models\StandalonePostgresql;
-use Illuminate\Console\Command;
-
-use function Laravel\Prompts\confirm;
-use function Laravel\Prompts\multiselect;
-use function Laravel\Prompts\select;
-
-class ResourcesDelete extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'resources:delete';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Delete a resource from the database';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $resource = select(
-            'What resource do you want to delete?',
-            ['Application', 'Database', 'Service'],
-        );
-        if ($resource === 'Application') {
-            $this->deleteApplication();
-        } elseif ($resource === 'Database') {
-            $this->deleteDatabase();
-        } elseif ($resource === 'Service') {
-            $this->deleteService();
-        }
-    }
-    private function deleteApplication()
-    {
-        $applications = Application::all();
-        if ($applications->count() === 0) {
-            $this->error('There are no applications to delete.');
-            return;
-        }
-        $applicationsToDelete = multiselect(
-            'What application do you want to delete?',
-            $applications->pluck('name')->toArray(),
-        );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
-        foreach ($applicationsToDelete as $application) {
-            $toDelete = $applications->where('name', $application)->first();
-            $toDelete->delete();
-        }
-    }
-    private function deleteDatabase()
-    {
-        $databases = StandalonePostgresql::all();
-        if ($databases->count() === 0) {
-            $this->error('There are no databases to delete.');
-            return;
-        }
-        $databasesToDelete = multiselect(
-            'What database do you want to delete?',
-            $databases->pluck('name')->toArray(),
-        );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
-        foreach ($databasesToDelete as $database) {
-            $toDelete = $databases->where('name', $database)->first();
-            $toDelete->delete();
-        }
-
-    }
-    private function deleteService()
-    {
-        $services = Service::all();
-        if ($services->count() === 0) {
-            $this->error('There are no services to delete.');
-            return;
-        }
-        $servicesToDelete = multiselect(
-            'What service do you want to delete?',
-            $services->pluck('name')->toArray(),
-        );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
-        foreach ($servicesToDelete as $service) {
-            $toDelete = $services->where('name', $service)->first();
-            $toDelete->delete();
-        }
-    }
-}

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

@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Application;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandalonePostgresql;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\multiselect;
+use function Laravel\Prompts\select;
+
+class ServicesDelete extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:delete';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete a service from the database';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $resource = select(
+            'What service do you want to delete?',
+            ['Application', 'Database', 'Service', 'Server'],
+        );
+        if ($resource === 'Application') {
+            $this->deleteApplication();
+        } elseif ($resource === 'Database') {
+            $this->deleteDatabase();
+        } elseif ($resource === 'Service') {
+            $this->deleteService();
+        } elseif ($resource === 'Server') {
+            $this->deleteServer();
+        }
+    }
+    private function deleteServer()
+    {
+        $servers = Server::all();
+        if ($servers->count() === 0) {
+            $this->error('There are no applications to delete.');
+            return;
+        }
+        $serversToDelete = multiselect(
+            label: 'What server do you want to delete?',
+            options: $servers->pluck('name', 'id')->sortKeys(),
+        );
+
+        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) {
+                    break;
+                }
+                $toDelete->delete();
+            }
+        }
+    }
+    private function deleteApplication()
+    {
+        $applications = Application::all();
+        if ($applications->count() === 0) {
+            $this->error('There are no applications to delete.');
+            return;
+        }
+        $applicationsToDelete = multiselect(
+            'What application do you want to delete?',
+            $applications->pluck('name', 'id')->sortKeys(),
+        );
+
+        foreach ($applicationsToDelete as $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) {
+                    break;
+                }
+                $toDelete->delete();
+            }
+        }
+    }
+    private function deleteDatabase()
+    {
+        $databases = StandalonePostgresql::all();
+        if ($databases->count() === 0) {
+            $this->error('There are no databases to delete.');
+            return;
+        }
+        $databasesToDelete = multiselect(
+            'What database do you want to delete?',
+            $databases->pluck('name', 'id')->sortKeys(),
+        );
+
+        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) {
+                    return;
+                }
+                $toDelete->delete();
+            }
+        }
+    }
+    private function deleteService()
+    {
+        $services = Service::all();
+        if ($services->count() === 0) {
+            $this->error('There are no services to delete.');
+            return;
+        }
+        $servicesToDelete = multiselect(
+            'What service do you want to delete?',
+            $services->pluck('name', 'id')->sortKeys(),
+        );
+
+        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) {
+                    return;
+                }
+                $toDelete->delete();
+            }
+        }
+    }
+}

app/Console/Commands/ServicesGenerate.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Yaml\Yaml;
+
+class ServicesGenerate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:generate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate service-templates.yaml based on /templates/compose directory';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        // ray()->clearAll();
+        $files = array_diff(scandir(base_path('templates/compose')), ['.', '..']);
+        $files = array_filter($files, function ($file) {
+            return strpos($file, '.yaml') !== false;
+        });
+        $serviceTemplatesJson = [];
+        foreach ($files as $file) {
+            $parsed = $this->process_file($file);
+            if ($parsed) {
+                $name = data_get($parsed, 'name');
+                $parsed = data_forget($parsed, 'name');
+                $serviceTemplatesJson[$name] = $parsed;
+            }
+        }
+        $serviceTemplatesJson = json_encode($serviceTemplatesJson, JSON_PRETTY_PRINT);
+        file_put_contents(base_path('templates/service-templates.json'), $serviceTemplatesJson);
+    }
+
+    private function process_file($file)
+    {
+        $serviceName = str($file)->before('.yaml')->value();
+        $content = file_get_contents(base_path("templates/compose/$file"));
+        // $this->info($content);
+        $ignore = collect(preg_grep('/^# ignore:/', explode("\n", $content)))->values();
+        if ($ignore->count() > 0) {
+            $ignore = (bool)str($ignore[0])->after('# ignore:')->trim()->value();
+        } else {
+            $ignore = false;
+        }
+        if ($ignore) {
+            $this->info("Ignoring $file");
+            return;
+        }
+        $this->info("Processing $file");
+        $documentation = collect(preg_grep('/^# documentation:/', explode("\n", $content)))->values();
+        if ($documentation->count() > 0) {
+            $documentation = str($documentation[0])->after('# documentation:')->trim()->value();
+        } else {
+            $documentation = 'https://coolify.io/docs';
+        }
+
+        $slogan = collect(preg_grep('/^# slogan:/', explode("\n", $content)))->values();
+        if ($slogan->count() > 0) {
+            $slogan = str($slogan[0])->after('# slogan:')->trim()->value();
+        } else {
+            $slogan = str($file)->headline()->value();
+        }
+        $env_file = collect(preg_grep('/^# env_file:/', explode("\n", $content)))->values();
+        if ($env_file->count() > 0) {
+            $env_file = str($env_file[0])->after('# env_file:')->trim()->value();
+        } else {
+            $env_file = null;
+        }
+
+        $tags = collect(preg_grep('/^# tags:/', explode("\n", $content)))->values();
+        if ($tags->count() > 0) {
+            $tags = str($tags[0])->after('# tags:')->trim()->explode(',')->map(function ($tag) {
+                return str($tag)->trim()->lower()->value();
+            })->values();
+        } else {
+            $tags = null;
+        }
+        $json = Yaml::parse($content);
+        $yaml = base64_encode(Yaml::dump($json, 10, 2));
+        $payload = [
+            'name' => $serviceName,
+            'documentation' => $documentation,
+            'slogan' => $slogan,
+            'compose' => $yaml,
+            'tags' => $tags,
+        ];
+        if ($env_file) {
+            $env_file_content = file_get_contents(base_path("templates/compose/$env_file"));
+            $env_file_base64 = base64_encode($env_file_content);
+            $payload['envs'] = $env_file_base64;
+        }
+        return $payload;
+    }
+}

app/Console/Commands/SyncBunny.php

@@ -16,7 +16,7 @@ class SyncBunny extends Command
      *
      * @var string
      */
-    protected $signature = 'sync:bunny {--only-template} {--only-version}';
+    protected $signature = 'sync:bunny {--templates} {--release}';
 
     /**
      * The console command description.
@@ -31,8 +31,8 @@ class SyncBunny extends Command
     public function handle()
     {
         $that = $this;
-        $only_template = $this->option('only-template');
-        $only_version = $this->option('only-version');
+        $only_template = $this->option('templates');
+        $only_version = $this->option('release');
         $bunny_cdn = "https://cdn.coollabs.io";
         $bunny_cdn_path = "coolify";
         $bunny_cdn_storage_name = "coolcdn";
@@ -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,42 +21,50 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
-            // $schedule->job(new ContainerStatusJob(Server::find(0)))->everyTenMinutes()->onOneServer();
-            // $schedule->command('horizon:snapshot')->everyMinute();
+            // Instance Jobs
+            $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            // $schedule->job(new CheckResaleLicenseJob)->hourly();
-            // $schedule->job(new DockerCleanupJob)->everyOddHour();
-            // $this->instance_auto_update($schedule);
-            // $this->check_scheduled_backups($schedule);
+            // $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 DockerCleanupJob)->everyTenMinutes()->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);
         } else {
-            $servers = Server::all();
+            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
         }
         foreach ($servers as $server) {
+            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            if ($server->isLogDrainEnabled()) {
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+            }
         }
     }
     private function instance_auto_update($schedule)
@@ -69,7 +79,6 @@ class Kernel extends ConsoleKernel
     }
     private function check_scheduled_backups($schedule)
     {
-        ray('check_scheduled_backups');
         $scheduled_backups = ScheduledDatabaseBackup::all();
         if ($scheduled_backups->isEmpty()) {
             ray('no scheduled backups');

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');
@@ -46,15 +50,6 @@ class Controller extends BaseController
         }
         return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
-    public function subscription()
-    {
-        if (!isCloud()) {
-            abort(404);
-        }
-        return view('subscription.index', [
-            'settings' => InstanceSettings::get(),
-        ]);
-    }
 
     public function license()
     {
@@ -84,6 +79,10 @@ class Controller extends BaseController
         if (isInstanceAdmin()) {
             $settings = InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
+            if ($database->status !== 'running') {
+                $database->status = 'running';
+                $database->save();
+            }
             if ($database) {
                 $s3s = S3Storage::whereTeamId(0)->get();
             }

app/Http/Controllers/DatabaseController.php

@@ -19,7 +19,7 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
@@ -37,7 +37,7 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
@@ -64,10 +64,18 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
+        // No backups for redis
+        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+            return redirect()->route('project.database.configuration', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'database_uuid' => $database->uuid,
+            ]);
+        }
         return view('project.database.backups.all', [
             'database' => $database,
             's3s' => currentTeam()->s3s,

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' => []
+            ]);
+        }
         return response()->json([
-            'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
+            'environments' => $project->environments
         ]);
     }
 

app/Http/Controllers/ProjectController.php

@@ -59,19 +59,31 @@ class ProjectController extends Controller
             return redirect()->route('dashboard');
         }
         if (in_array($type, DATABASE_TYPES)) {
-            $standalone_postgresql = create_standalone_postgresql($environment->id, $destination_uuid);
+            if ($type->value() === "postgresql") {
+                $database = create_standalone_postgresql($environment->id, $destination_uuid);
+            } else if ($type->value() === 'redis') {
+                $database = create_standalone_redis($environment->id, $destination_uuid);
+            } else if ($type->value() === 'mongodb') {
+                $database = create_standalone_mongodb($environment->id, $destination_uuid);
+            } else if ($type->value() === 'mysql') {
+                $database = create_standalone_mysql($environment->id, $destination_uuid);
+            } else if ($type->value() === 'mariadb') {
+                $database = create_standalone_mariadb($environment->id, $destination_uuid);
+            }
             return redirect()->route('project.database.configuration', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
-                'database_uuid' => $standalone_postgresql->uuid,
+                'database_uuid' => $database->uuid,
             ]);
         }
-        if ($type->startsWith('one-click-service-') && !is_null( (int)$server_id)) {
+        if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
             $oneClickServiceName = $type->after('one-click-service-')->value();
             $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();
@@ -92,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,
@@ -124,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/Project/Application/General.php

@@ -1,152 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use App\Models\InstanceSettings;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use Livewire\Component;
-use Spatie\Url\Url;
-use Symfony\Component\Yaml\Yaml;
-
-class General extends Component
-{
-    public string $applicationId;
-
-    public Application $application;
-    public Collection $services;
-    public string $name;
-    public ?string $fqdn = null;
-    public string $git_repository;
-    public string $git_branch;
-    public ?string $git_commit_sha = null;
-    public string $build_pack;
-
-    public bool $is_static;
-    public bool $is_git_submodules_enabled;
-    public bool $is_git_lfs_enabled;
-    public bool $is_debug_enabled;
-    public bool $is_preview_deployments_enabled;
-    public bool $is_auto_deploy_enabled;
-    public bool $is_force_https_enabled;
-
-
-    protected $rules = [
-        'application.name' => 'required',
-        'application.description' => 'nullable',
-        'application.fqdn' => 'nullable',
-        'application.git_repository' => 'required',
-        'application.git_branch' => 'required',
-        'application.git_commit_sha' => 'nullable',
-        'application.install_command' => 'nullable',
-        'application.build_command' => 'nullable',
-        'application.start_command' => 'nullable',
-        'application.build_pack' => 'required',
-        'application.static_image' => 'required',
-        'application.base_directory' => 'required',
-        'application.publish_directory' => 'nullable',
-        'application.ports_exposes' => 'required',
-        'application.ports_mappings' => 'nullable',
-        'application.dockerfile' => 'nullable',
-        'application.docker_registry_image_name' => 'nullable',
-        'application.docker_registry_image_tag' => 'nullable',
-        'application.dockerfile_location' => 'nullable',
-    ];
-    protected $validationAttributes = [
-        'application.name' => 'name',
-        'application.description' => 'description',
-        'application.fqdn' => 'FQDN',
-        'application.git_repository' => 'Git repository',
-        'application.git_branch' => 'Git branch',
-        'application.git_commit_sha' => 'Git commit SHA',
-        'application.install_command' => 'Install command',
-        'application.build_command' => 'Build command',
-        'application.start_command' => 'Start command',
-        'application.build_pack' => 'Build pack',
-        'application.static_image' => 'Static image',
-        'application.base_directory' => 'Base directory',
-        'application.publish_directory' => 'Publish directory',
-        'application.ports_exposes' => 'Ports exposes',
-        'application.ports_mappings' => 'Ports mappings',
-        'application.dockerfile' => 'Dockerfile',
-        'application.docker_registry_image_name' => 'Docker registry image name',
-        'application.docker_registry_image_tag' => 'Docker registry image tag',
-        'application.dockerfile_location' => 'Dockerfile location',
-
-    ];
-
-    public function instantSave()
-    {
-        // @TODO: find another way - if possible
-        $this->application->settings->is_static = $this->is_static;
-        if ($this->is_static) {
-            $this->application->ports_exposes = 80;
-        } else {
-            $this->application->ports_exposes = 3000;
-        }
-        $this->application->settings->is_git_submodules_enabled = $this->is_git_submodules_enabled;
-        $this->application->settings->is_git_lfs_enabled = $this->is_git_lfs_enabled;
-        $this->application->settings->is_debug_enabled = $this->is_debug_enabled;
-        $this->application->settings->is_preview_deployments_enabled = $this->is_preview_deployments_enabled;
-        $this->application->settings->is_auto_deploy_enabled = $this->is_auto_deploy_enabled;
-        $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
-        $this->application->settings->save();
-        $this->application->save();
-        $this->application->refresh();
-        $this->emit('success', 'Application settings updated!');
-    }
-
-    public function getWildcardDomain() {
-        $server = data_get($this->application, 'destination.server');
-        if ($server) {
-            $fqdn = generateFqdn($server, $this->application->uuid);
-            ray($fqdn);
-            $this->application->fqdn = $fqdn;
-            $this->application->save();
-            $this->emit('success', 'Application settings updated!');
-        }
-
-    }
-    public function mount()
-    {
-        if (data_get($this->application,'settings')) {
-            $this->is_static = $this->application->settings->is_static;
-            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        }
-    }
-
-    public function submit()
-    {
-        try {
-            $this->validate();
-            if (data_get($this->application, 'fqdn')) {
-                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return Str::of($domain)->trim()->lower();
-                });
-                $this->application->fqdn = $domains->implode(',');
-            }
-            if (data_get($this->application, 'dockerfile')) {
-                $port = get_port_from_dockerfile($this->application->dockerfile);
-                if ($port && !$this->application->ports_exposes) {
-                    $this->application->ports_exposes = $port;
-                }
-            }
-            if ($this->application->base_directory && $this->application->base_directory !== '/') {
-                $this->application->base_directory = rtrim($this->application->base_directory, '/');
-            }
-            if ($this->application->publish_directory && $this->application->publish_directory !== '/') {
-                $this->application->publish_directory = rtrim($this->application->publish_directory, '/');
-            }
-            $this->application->save();
-            $this->emit('success', 'Application settings updated!');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

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

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-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()
-    {
-        $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
-        if ($containers->count() === 0) {
-            return;
-        }
-        foreach ($containers as $container) {
-            $containerName = data_get($container, 'Names');
-            if ($containerName) {
-                instant_remote_process(
-                    ["docker rm -f {$containerName}"],
-                    $this->application->destination->server
-                );
-                $this->application->status = 'exited';
-                $this->application->save();
-                // $this->application->environment->project->team->notify(new StatusChanged($this->application));
-            }
-        }
-        $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/BackupExecution.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use App\Models\ScheduledDatabaseBackupExecution;
-use Livewire\Component;
-
-class BackupExecution extends Component
-{
-    public ScheduledDatabaseBackupExecution $execution;
-
-    public function download()
-    {
-    }
-
-    public function delete(): void
-    {
-        delete_backup_locally($this->execution->filename, $this->execution->scheduledDatabaseBackup->database->destination->server);
-        $this->execution->delete();
-        $this->emit('success', 'Backup deleted successfully.');
-        $this->emit('refreshBackupExecutions');
-    }
-}

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

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use Livewire\Component;
-
-class BackupExecutions extends Component
-{
-    public $backup;
-    public $executions;
-    protected $listeners = ['refreshBackupExecutions'];
-
-    public function refreshBackupExecutions(): void
-    {
-        $this->executions = $this->backup->executions;
-    }
-}

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

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use App\Actions\Database\StartPostgresql;
-use App\Jobs\ContainerStatusJob;
-use Livewire\Component;
-
-class Heading extends Component
-{
-    public $database;
-    public array $parameters;
-
-    protected $listeners = ['activityFinished'];
-
-    public function activityFinished()
-    {
-        $this->database->update([
-            'started_at' => now(),
-        ]);
-        $this->emit('refresh');
-        $this->check_status();
-    }
-
-    public function check_status()
-    {
-        dispatch_sync(new ContainerStatusJob($this->database->destination->server));
-        $this->database->refresh();
-    }
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function stop()
-    {
-        instant_remote_process(
-            ["docker rm -f {$this->database->uuid}"],
-            $this->database->destination->server
-        );
-        if ($this->database->is_public) {
-            stopPostgresProxy($this->database);
-            $this->database->is_public = false;
-        }
-        $this->database->status = 'exited';
-        $this->database->save();
-        $this->check_status();
-        // $this->database->environment->project->team->notify(new StatusChanged($this->database));
-    }
-
-    public function start()
-    {
-        if ($this->database->type() === 'standalone-postgresql') {
-            $activity = resolve(StartPostgresql::class)($this->database->destination->server, $this->database);
-            $this->emit('newMonitorActivity', $activity->id);
-        }
-    }
-}

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;
-    public string $actual;
-    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,43 +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;
-    protected $listeners = ['serviceStatusUpdated'];
-
-    public function render()
-    {
-        return view('livewire.project.service.navbar');
-    }
-    public function serviceStatusUpdated()
-    {
-        $this->check_status();
-    }
-    public function check_status()
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->service->refresh();
-    }
-    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.');
-    }
-}

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

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Actions\Service\StopService;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Danger extends Component
-{
-    public $resource;
-    public array $parameters;
-    public string|null $modalId = null;
-
-    public function mount()
-    {
-        $this->modalId = new Cuid2(7);
-        $this->parameters = get_route_parameters();
-    }
-
-    public function delete()
-    {
-        // Should be queued
-        try {
-            if ($this->resource->type() === 'service') {
-                $server = $this->resource->server;
-                StopService::run($this->resource);
-            } else {
-                $destination = data_get($this->resource, 'destination');
-                if ($destination) {
-                    $destination = $this->resource->destination->getMorphClass()::where('id', $this->resource->destination->id)->first();
-                    $server = $destination->server;
-                }
-                if ($this->resource->destination->server->isFunctional()) {
-                    instant_remote_process(["docker rm -f {$this->resource->uuid}"], $server);
-                }
-            }
-            $this->resource->delete();
-            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/GetLogs.php

@@ -1,40 +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 int $numberOfLines = 100;
-    public function doSomethingWithThisChunkOfOutput($output)
-    {
-        $this->outputs .= $output;
-    }
-    public function instantSave()
-    {
-    }
-    public function getLogs($refresh = false)
-    {
-        if ($this->container) {
-            $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$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/Logs.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Models\Application;
-use App\Models\Server;
-use App\Models\Service;
-use App\Models\StandalonePostgresql;
-use Livewire\Component;
-
-class Logs extends Component
-{
-    public ?string $type = null;
-    public Application|StandalonePostgresql|Service $resource;
-    public Server $server;
-    public ?string $container = null;
-    public $parameters;
-    public $query;
-    public $status;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        if (data_get($this->parameters, 'application_uuid')) {
-            $this->type = 'application';
-            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id);
-            if ($containers->count() > 0) {
-                $this->container = data_get($containers[0], 'Names');
-            }
-        } else if (data_get($this->parameters, 'database_uuid')) {
-            $this->type = 'database';
-            $this->resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            $this->container = $this->resource->uuid;
-        } else if (data_get($this->parameters, 'service_uuid')) {
-            $this->type = 'service';
-            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->server;
-            $this->container = data_get($this->parameters, 'service_name') . '-' . $this->resource->uuid;
-        }
-    }
-
-    public function render()
-    {
-        return view('livewire.project.shared.logs');
-    }
-}

app/Http/Livewire/Server/Form.php

@@ -1,126 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server;
-
-use App\Actions\Server\InstallDocker;
-use App\Models\Server;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Livewire\Component;
-
-class Form extends Component
-{
-    use AuthorizesRequests;
-    public Server $server;
-    public bool $isValidConnection = false;
-    public bool $isValidDocker = false;
-    public ?string $wildcard_domain = null;
-    public int $cleanup_after_percentage;
-    public bool $dockerInstallationStarted = false;
-    protected $listeners = ['serverRefresh'];
-
-    protected $rules = [
-        'server.name' => 'required|min:6',
-        'server.description' => 'nullable',
-        'server.ip' => 'required',
-        'server.user' => 'required',
-        'server.port' => 'required',
-        'server.settings.is_cloudflare_tunnel' => 'required',
-        'server.settings.is_reachable' => 'required',
-        'server.settings.is_part_of_swarm' => 'required',
-        'wildcard_domain' => 'nullable|url',
-    ];
-    protected $validationAttributes = [
-        'server.name' => 'name',
-        'server.description' => 'description',
-        'server.ip' => 'ip',
-        'server.user' => 'user',
-        'server.port' => 'port',
-        'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
-        'server.settings.is_reachable' => 'is reachable',
-        'server.settings.is_part_of_swarm' => 'is part of swarm'
-    ];
-
-    public function mount()
-    {
-        $this->wildcard_domain = $this->server->settings->wildcard_domain;
-        $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
-    }
-    public function serverRefresh() {
-        $this->validateServer();
-    }
-    public function instantSave()
-    {
-        refresh_server_connection($this->server->privateKey);
-        $this->validateServer();
-        $this->server->settings->save();
-    }
-    public function installDocker()
-    {
-        $this->emit('installDocker');
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->server);
-        $this->emit('newMonitorActivity', $activity->id);
-    }
-
-    public function validateServer($install = true)
-    {
-        try {
-            $uptime = $this->server->validateConnection();
-            if ($uptime) {
-                $install && $this->emit('success', 'Server is reachable.');
-            } else {
-                $install &&$this->emit('error', 'Server is not reachable. Please check your connection and private key configuration.');
-                return;
-            }
-            $dockerInstalled = $this->server->validateDockerEngine();
-            if ($dockerInstalled) {
-                $install && $this->emit('success', 'Docker Engine is installed.<br> Checking version.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            $dockerVersion = $this->server->validateDockerEngineVersion();
-            if ($dockerVersion) {
-                $install && $this->emit('success', 'Docker Engine version is 23+.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->emit('proxyStatusUpdated');
-        }
-    }
-
-    public function delete()
-    {
-        try {
-            $this->authorize('delete', $this->server);
-            if (!$this->server->isEmpty()) {
-                $this->emit('error', 'Server has defined resources. Please delete them first.');
-                return;
-            }
-            $this->server->delete();
-            return redirect()->route('server.all');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-    public function submit()
-    {
-        $this->validate();
-        $uniqueIPs = Server::all()->reject(function (Server $server) {
-            return $server->id === $this->server->id;
-        })->pluck('ip')->toArray();
-        if (in_array($this->server->ip, $uniqueIPs)) {
-            $this->emit('error', 'IP address is already in use by another team.');
-            return;
-        }
-        $this->server->settings->wildcard_domain = $this->wildcard_domain;
-        $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage;
-        $this->server->settings->save();
-        $this->server->save();
-        $this->emit('success', 'Server updated successfully.');
-    }
-}

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server\Proxy;
-
-use App\Actions\Proxy\StartProxy;
-use App\Models\Server;
-use Livewire\Component;
-
-class Deploy extends Component
-{
-    public Server $server;
-    public bool $traefikDashboardAvailable = false;
-    public ?string $currentRoute = null;
-    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable', 'serverRefresh' => 'proxyStatusUpdated'];
-
-    public function mount() {
-        $this->currentRoute = request()->route()->getName();
-    }
-    public function traefikDashboardAvailable(bool $data) {
-        $this->traefikDashboardAvailable = $data;
-    }
-    public function proxyStatusUpdated()
-    {
-        $this->server->refresh();
-    }
-    public function startProxy()
-    {
-        try {
-            $activity = StartProxy::run($this->server);
-            $this->emit('newMonitorActivity', $activity->id);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function stop()
-    {
-        instant_remote_process([
-            "docker rm -f coolify-proxy",
-        ], $this->server);
-        $this->server->proxy->status = 'exited';
-        $this->server->save();
-        $this->emit('proxyStatusUpdated');
-    }
-}

app/Http/Livewire/Server/Proxy/Modal.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server\Proxy;
-
-use App\Models\Server;
-use Livewire\Component;
-
-class Modal extends Component
-{
-    public Server $server;
-
-    public function proxyStatusUpdated()
-    {
-        $this->server->proxy->set('status', 'running');
-        $this->server->save();
-        $this->emit('proxyStatusUpdated');
-    }
-}

app/Http/Livewire/Server/Proxy/Status.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server\Proxy;
-
-use App\Jobs\ContainerStatusJob;
-use App\Models\Server;
-use Livewire\Component;
-
-class Status extends Component
-{
-    public Server $server;
-
-    protected $listeners = ['proxyStatusUpdated'];
-    public function proxyStatusUpdated()
-    {
-        $this->server->refresh();
-    }
-    public function getProxyStatus()
-    {
-        try {
-            dispatch_sync(new ContainerStatusJob($this->server));
-            $this->emit('proxyStatusUpdated');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-    public function getProxyStatusWithNoti()
-    {
-        if ($this->server->isFunctional()) {
-            $this->emit('success', 'Refreshed proxy status.');
-            $this->getProxyStatus();
-        }
-    }
-}

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

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

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->isServerReady()) {
+                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,142 +2,113 @@
 
 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\ShouldBeUnique;
 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\Arr;
-use Illuminate\Support\Str;
 
 class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $tries = 1;
-    public $timeout = 120;
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
 
     public function __construct(public Server $server)
     {
         $this->handle();
     }
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
-    }
 
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
     public function handle()
     {
+        // ray("checking container statuses for {$this->server->id}");
         try {
-            // ray("checking server status for {$this->server->name}");
-            // 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,
-                ]);
+            if (!$this->server->isServerReady()) {
                 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);
+                $containerReplicase = 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,
-                ]);
+                // 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, false);
+                $containerReplicase = null;
+            }
+            if (is_null($containers)) {
                 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);
-            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);
+            if ($containerReplicase) {
+                $containerReplicase = format_docker_command_output_to_json($containerReplicase);
+                foreach ($containerReplicase 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) {
-                ray('Proxy not found, starting it...');
-                if ($this->server->isProxyShouldRun()) {
-                    StartProxy::run($this->server, false);
-                    $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                }
-            } 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-')) {
-                        $pullRequestId = data_get($labels, 'coolify.pullRequestId');
-                        $applicationId = (int) Str::before($labelId, '-pr-');
+                $applicationId = data_get($labels, 'coolify.applicationId');
+                if ($applicationId) {
+                    $pullRequestId = data_get($labels, 'coolify.pullRequestId');
+                    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;
@@ -149,7 +120,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;
@@ -165,11 +136,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.
                         }
@@ -225,11 +210,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']);
             }
 
@@ -246,12 +236,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) {
@@ -266,11 +261,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) {
@@ -285,14 +286,45 @@ 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) {
+                    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 with: ' . $e->getMessage());
+            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
             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,16 @@
 
 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;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
 use App\Notifications\Database\BackupFailed;
@@ -19,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
 {
@@ -27,9 +34,10 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public ?Team $team = null;
     public Server $server;
     public ScheduledDatabaseBackup $backup;
-    public StandalonePostgresql $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;
@@ -43,9 +51,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
-        $this->database = data_get($this->backup, 'database');
-        $this->server = $this->database->destination->server;
-        $this->s3 = $this->backup->s3;
+        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
@@ -61,55 +75,266 @@ 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;
             }
-            $this->container_name = $this->database->uuid;
-            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->container_name;
+            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') {
+                    $databasesToBackup = [$this->database->postgres_db];
+                } else if ($databaseType === 'standalone-mongodb') {
+                    $databasesToBackup = ['*'];
+                } else if ($databaseType === 'standalone-mysql') {
+                    $databasesToBackup = [$this->database->mysql_database];
+                } else if ($databaseType === 'standalone-mariadb') {
+                    $databasesToBackup = [$this->database->mariadb_database];
+                } else {
+                    return;
+                }
+            } else {
+                if ($databaseType === 'standalone-postgresql') {
+                    // Format: db1,db2,db3
+                    $databasesToBackup = explode(',', $databasesToBackup);
+                    $databasesToBackup = array_map('trim', $databasesToBackup);
+                } else if ($databaseType === 'standalone-mongodb') {
+                    // Format: db1:collection1,collection2|db2:collection3,collection4
+                    $databasesToBackup = explode('|', $databasesToBackup);
+                    $databasesToBackup = array_map('trim', $databasesToBackup);
+                    ray($databasesToBackup);
+                } else if ($databaseType === 'standalone-mysql') {
+                    // Format: db1,db2,db3
+                    $databasesToBackup = explode(',', $databasesToBackup);
+                    $databasesToBackup = array_map('trim', $databasesToBackup);
+                } else if ($databaseType === 'standalone-mariadb') {
+                    // Format: db1,db2,db3
+                    $databasesToBackup = explode(',', $databasesToBackup);
+                    $databasesToBackup = array_map('trim', $databasesToBackup);
+                } else {
+                    return;
+                }
+            }
+            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->directory_name;
 
             if ($this->database->name === 'coolify-db') {
-                $this->container_name = "coolify-db";
+                $databasesToBackup = ['coolify'];
+                $this->directory_name = $this->container_name = "coolify-db";
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }
-            $this->backup_file = "/pg-backup-customformat-" . Carbon::now()->timestamp . ".backup";
-            $this->backup_location = $this->backup_dir . $this->backup_file;
-
-            $this->backup_log = ScheduledDatabaseBackupExecution::create([
-                'filename' => $this->backup_location,
-                'scheduled_database_backup_id' => $this->backup->id,
-            ]);
-            if ($this->database->type() === 'standalone-postgresql') {
-                $this->backup_standalone_postgresql();
+            foreach ($databasesToBackup as $database) {
+                $size = 0;
+                ray('Backing up ' . $database);
+                try {
+                    if ($databaseType === 'standalone-postgresql') {
+                        $this->backup_file = "/pg-dump-$database-" . Carbon::now()->timestamp . ".dmp";
+                        $this->backup_location = $this->backup_dir . $this->backup_file;
+                        $this->backup_log = ScheduledDatabaseBackupExecution::create([
+                            'database_name' => $database,
+                            'filename' => $this->backup_location,
+                            'scheduled_database_backup_id' => $this->backup->id,
+                        ]);
+                        $this->backup_standalone_postgresql($database);
+                    } else if ($databaseType === 'standalone-mongodb') {
+                        if ($database === '*') {
+                            $database = 'all';
+                            $databaseName = 'all';
+                        } else {
+                            if (str($database)->contains(':')) {
+                                $databaseName = str($database)->before(':');
+                            } else {
+                                $databaseName = $database;
+                            }
+                        }
+                        $this->backup_file = "/mongo-dump-$databaseName-" . Carbon::now()->timestamp . ".tar.gz";
+                        $this->backup_location = $this->backup_dir . $this->backup_file;
+                        $this->backup_log = ScheduledDatabaseBackupExecution::create([
+                            'database_name' => $databaseName,
+                            'filename' => $this->backup_location,
+                            'scheduled_database_backup_id' => $this->backup->id,
+                        ]);
+                        $this->backup_standalone_mongodb($database);
+                    } else if ($databaseType === 'standalone-mysql') {
+                        $this->backup_file = "/mysql-dump-$database-" . Carbon::now()->timestamp . ".dmp";
+                        $this->backup_location = $this->backup_dir . $this->backup_file;
+                        $this->backup_log = ScheduledDatabaseBackupExecution::create([
+                            'database_name' => $database,
+                            'filename' => $this->backup_location,
+                            'scheduled_database_backup_id' => $this->backup->id,
+                        ]);
+                        $this->backup_standalone_mysql($database);
+                    } else if ($databaseType === 'standalone-mariadb') {
+                        $this->backup_file = "/mariadb-dump-$database-" . Carbon::now()->timestamp . ".dmp";
+                        $this->backup_location = $this->backup_dir . $this->backup_file;
+                        $this->backup_log = ScheduledDatabaseBackupExecution::create([
+                            'database_name' => $database,
+                            'filename' => $this->backup_location,
+                            'scheduled_database_backup_id' => $this->backup->id,
+                        ]);
+                        $this->backup_standalone_mariadb($database);
+                    } else {
+                        throw new \Exception('Unsupported database type');
+                    }
+                    $size = $this->calculate_size();
+                    $this->remove_old_backups();
+                    if ($this->backup->save_s3) {
+                        $this->upload_to_s3();
+                    }
+                    $this->team->notify(new BackupSuccess($this->backup, $this->database));
+                    $this->backup_log->update([
+                        'status' => 'success',
+                        'message' => $this->backup_output,
+                        'size' => $size,
+                    ]);
+                } catch (\Throwable $e) {
+                    if ($this->backup_log) {
+                        $this->backup_log->update([
+                            'status' => 'failed',
+                            'message' => $this->backup_output,
+                            'size' => $size,
+                            'filename' => null
+                        ]);
+                    }
+                    send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
+                    $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
+                    throw $e;
+                }
             }
-            $this->calculate_size();
-            $this->remove_old_backups();
-            if ($this->backup->save_s3) {
-                $this->upload_to_s3();
-            }
-            $this->save_backup_logs();
-            $this->team->notify(new BackupSuccess($this->backup, $this->database));
-            $this->backup_status = 'success';
         } catch (\Throwable $e) {
-            $this->backup_status = 'failed';
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
-            $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
             throw $e;
         } finally {
-            $this->backup_log->update([
-                'status' => $this->backup_status,
-            ]);
+            BackupCreated::dispatch($this->team->id);
         }
     }
-
-    private function backup_standalone_postgresql(): void
+    private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
-            ray($this->backup_dir);
-            $commands[] = "mkdir -p " . $this->backup_dir;
-            $commands[] = "docker exec $this->container_name pg_dump -Fc -U {$this->database->postgres_user} > $this->backup_location";
+            $url = $this->database->getDbUrl(useInternal: true);
+            if ($databaseWithCollections === 'all') {
+                $commands[] = "mkdir -p " . $this->backup_dir;
+                $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";
+            } else {
+                if (str($databaseWithCollections)->contains(':')) {
+                    $databaseName = str($databaseWithCollections)->before(':');
+                    $collectionsToExclude = str($databaseWithCollections)->after(':')->explode(',');
+                } else {
+                    $databaseName = $databaseWithCollections;
+                    $collectionsToExclude = collect();
+                }
+                $commands[] = "mkdir -p " . $this->backup_dir;
+                if ($collectionsToExclude->count() === 0) {
+                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --archive > $this->backup_location";
+                } else {
+                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                }
+            }
             $this->backup_output = instant_remote_process($commands, $this->server);
             $this->backup_output = trim($this->backup_output);
             if ($this->backup_output === '') {
@@ -119,9 +344,62 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             $this->add_to_backup_output($e->getMessage());
             ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
+            throw $e;
+        }
+    }
+    private function backup_standalone_postgresql(string $database): void
+    {
+        try {
+            $commands[] = "mkdir -p " . $this->backup_dir;
+            $commands[] = "docker exec $this->container_name pg_dump --format=custom --no-acl --no-owner --username {$this->database->postgres_user} $database > $this->backup_location";
+            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = trim($this->backup_output);
+            if ($this->backup_output === '') {
+                $this->backup_output = null;
+            }
+            ray('Backup done for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location);
+        } catch (\Throwable $e) {
+            $this->add_to_backup_output($e->getMessage());
+            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
+            throw $e;
+        }
+    }
+    private function backup_standalone_mysql(string $database): void
+    {
+        try {
+            $commands[] = "mkdir -p " . $this->backup_dir;
+            $commands[] = "docker exec $this->container_name mysqldump -u root -p{$this->database->mysql_root_password} $database > $this->backup_location";
+            ray($commands);
+            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = trim($this->backup_output);
+            if ($this->backup_output === '') {
+                $this->backup_output = null;
+            }
+            ray('Backup done for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location);
+        } catch (\Throwable $e) {
+            $this->add_to_backup_output($e->getMessage());
+            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
+            throw $e;
+        }
+    }
+    private function backup_standalone_mariadb(string $database): void
+    {
+        try {
+            $commands[] = "mkdir -p " . $this->backup_dir;
+            $commands[] = "docker exec $this->container_name mariadb-dump -u root -p{$this->database->mariadb_root_password} $database > $this->backup_location";
+            ray($commands);
+            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = trim($this->backup_output);
+            if ($this->backup_output === '') {
+                $this->backup_output = null;
+            }
+            ray('Backup done for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location);
+        } catch (\Throwable $e) {
+            $this->add_to_backup_output($e->getMessage());
+            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
+            throw $e;
         }
     }
-
     private function add_to_backup_output($output): void
     {
         if ($this->backup_output) {
@@ -131,9 +409,9 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
         }
     }
 
-    private function calculate_size(): void
+    private function calculate_size()
     {
-        $this->size = instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server);
+        return instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server, false);
     }
 
     private function remove_old_backups(): void
@@ -141,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);
@@ -160,13 +438,13 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
-            $this->s3->testConnection();
-            if (isDev()) {
-                $commands[] = "docker run --pull=always -d --network {$this->database->destination->network} --name backup-of-{$this->backup->uuid} --rm -v coolify_coolify-data-dev:/data/coolify: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 {
-                $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";
+                $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);
@@ -180,13 +458,4 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             instant_remote_process([$command], $this->server);
         }
     }
-
-    private function save_backup_logs(): void
-    {
-        $this->backup_log->update([
-            'status' => $this->backup_status,
-            'message' => $this->backup_output,
-            'size' => $this->size,
-        ]);
-    }
 }

app/Jobs/DeleteResourceJob.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Application\StopApplication;
+use App\Actions\Database\StopDatabase;
+use App\Actions\Service\DeleteService;
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+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 DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource)
+    {
+    }
+
+    public function handle()
+    {
+        try {
+            $server = $this->resource->destination->server;
+            if (!$server->isFunctional()) {
+                $this->resource->delete();
+                return 'Server is not functional';
+            }
+            switch ($this->resource->type()) {
+                case 'application':
+                    StopApplication::run($this->resource);
+                    break;
+                case 'standalone-postgresql':
+                    StopDatabase::run($this->resource);
+                    break;
+                case 'standalone-redis':
+                    StopDatabase::run($this->resource);
+                    break;
+                case 'standalone-mongodb':
+                    StopDatabase::run($this->resource);
+                    break;
+                case 'standalone-mysql':
+                    StopDatabase::run($this->resource);
+                    break;
+                case 'standalone-mariadb':
+                    StopDatabase::run($this->resource);
+                    break;
+            }
+            if ($this->resource->type() === 'service') {
+                $this->resource->delete();
+                DeleteService::dispatch($this->resource);
+            } else {
+                $this->resource->delete();
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
+            throw $e;
+        }
+    }
+}

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,81 +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');
-            return;
-        }
         try {
+            $isInprogress = false;
+            $this->server->applications()->each(function ($application) use (&$isInprogress) {
+                if ($application->isDeploymentInprogress()) {
+                    $isInprogress = true;
+                    return;
+                }
+            });
+            if ($isInprogress) {
+                throw new RuntimeException('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+            }
             if (!$this->server->isFunctional()) {
                 return;
             }
-            if (isDev()) {
-                $this->dockerRootFilesystem = "/";
-            } else {
-                $this->dockerRootFilesystem = instant_remote_process(
-                    [
-                        "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
-                    ],
-                    $this->server,
-                    false
-                );
-            }
-            if (!$this->dockerRootFilesystem) {
-                return;
-            }
-            $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/InstanceAutoUpdateJob.php

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

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,68 @@
+<?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 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 handle(): void
+    {
+        ray("checking server status for {$this->server->id}");
+        try {
+            if ($this->server->isServerReady()) {
+                $this->cleanup(notify: false);
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            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;
         }
@@ -171,7 +173,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $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,22 +211,28 @@ 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,
             ]);
             $this->getProxyType();
         } catch (\Throwable $e) {
-            $this->dockerInstallationStarted = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            // $this->dockerInstallationStarted = false;
+            return handleError(error: $e, livewire: $this);
         }
     }
     public function installDocker()
     {
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->createdServer);
-        $this->emit('newMonitorActivity', $activity->id);
+        try {
+            $this->dockerInstallationStarted = true;
+            $activity = InstallDocker::run($this->createdServer);
+            $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,19 +10,10 @@ class Dashboard extends Component
 {
     public $projects = [];
     public $servers = [];
-    public int $s3s = 0;
-    public int $resources = 0;
-
     public function mount()
     {
         $this->servers = Server::ownedByCurrentTeam()->get();
-        $this->s3s = S3Storage::ownedByCurrentTeam()->get()->count();
-        $projects = Project::ownedByCurrentTeam()->get();
-        foreach ($projects as $project) {
-            $this->resources += $project->applications->count();
-            $this->resources += $project->postgresqls->count();
-        }
-        $this->projects = $projects;
+        $this->projects = Project::ownedByCurrentTeam()->get();
     }
     // public function getIptables()
     // {

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Destination\New;
+namespace App\Livewire\Destination\New;
 
 use App\Models\Server;
 use App\Models\StandaloneDocker as ModelsStandaloneDocker;
@@ -60,7 +60,7 @@ class StandaloneDocker extends Component
             $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
             if ($found) {
                 $this->createNetworkAndAttachToProxy();
-                $this->emit('error', 'Network already added to this server.');
+                $this->dispatch('error', 'Network already added to this server.');
                 return;
             } else {
                 $docker = ModelsStandaloneDocker::create([
@@ -70,7 +70,7 @@ class StandaloneDocker extends Component
                 ]);
             }
             $this->createNetworkAndAttachToProxy();
-            return redirect()->route('destination.show', $docker->uuid);
+            return $this->redirectRoute('destination.show', $docker->uuid, navigate: true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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;
@@ -21,7 +21,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->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,7 +63,7 @@ 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);
         }
@@ -71,7 +71,7 @@ class EmailSettings extends Component
     public function sendTestNotification()
     {
         $this->team->notify(new Test($this->emails));
-        $this->emit('success', 'Test Email sent successfully.');
+        $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->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);
         }