Merge pull request #1516 from coollabsio/next

v4.0.0-beta.152

app/Actions/Application/StopApplication.php

@@ -11,19 +11,34 @@ class StopApplication
     public function handle(Application $application)
     {
         $server = $application->destination->server;
-        $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
-                    );
+        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);
                 }
             }
-            // TODO: make notification for application
-            // $application->environment->project->team->notify(new StatusChanged($application));
         }
+
+
     }
 }

app/Actions/Proxy/CheckProxy.php

@@ -17,35 +17,42 @@ class CheckProxy
                 return false;
             }
         }
-        $status = getContainerStatus($server, 'coolify-proxy');
-        if ($status === 'running') {
-            $server->proxy->set('status', 'running');
+        if ($server->isSwarm()) {
+            $status = getContainerStatus($server, 'coolify-proxy_traefik');
+            $server->proxy->set('status', $status);
             $server->save();
             return false;
-        }
-        $ip = $server->ip;
-        if ($server->id === 0) {
-            $ip = 'host.docker.internal';
-        }
+        } 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;
+            $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;
+            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;
         }
-        return true;
     }
 }

app/Actions/Proxy/StartProxy.php

@@ -13,6 +13,7 @@ class StartProxy
     public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
+
             $proxyType = $server->proxyType();
             $commands = collect([]);
             $proxy_path = get_proxy_path();
@@ -24,18 +25,29 @@ class StartProxy
             $docker_compose_yml_base64 = base64_encode($configuration);
             $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
             $server->save();
-            $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 ($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;
@@ -46,11 +58,9 @@ class StartProxy
                 $server->save();
                 return 'OK';
             }
-        } catch(\Throwable $e) {
+        } catch (\Throwable $e) {
             ray($e);
             throw $e;
         }
-
-
     }
 }

app/Actions/Server/InstallDocker.php

@@ -15,7 +15,7 @@ class InstallDocker
         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: ' . $supported_os_type);
+        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",
@@ -44,24 +44,30 @@ class InstallDocker
                 "ls -l /tmp"
             ]);
         } else {
-            if ($supported_os_type === 'debian') {
+            if ($supported_os_type->contains('debian')) {
                 $command = $command->merge([
                     "echo 'Installing Prerequisites...'",
-                    "command -v jq >/dev/null || apt-get update",
-                    "command -v jq >/dev/null || apt install -y jq",
+                    "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 === 'rhel') {
+            } else if ($supported_os_type->contains('rhel')) {
                 $command = $command->merge([
                     "echo 'Installing Prerequisites...'",
-                    "command -v jq >/dev/null || dnf install -y jq",
+                    "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://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",
@@ -70,10 +76,20 @@ class InstallDocker
                 "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);
         }
     }

app/Actions/Server/InstallLogDrain.php

@@ -16,6 +16,8 @@ class InstallLogDrain
             $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';
         }
@@ -114,15 +116,23 @@ class InstallLogDrain
     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.');
             }
-            $parsers = base64_encode("
+            if ($type !== 'custom') {
+                $parsers = base64_encode("
 [PARSER]
-    Name        empty_line_skipper
-    Format      regex
-    Regex       /^(?!\s*$).+/
+Name        empty_line_skipper
+Format      regex
+Regex       /^(?!\s*$).+/
 ");
+            }
             $compose = base64_encode("
 services:
   coolify-log-drain:
@@ -179,6 +189,12 @@ Files:
                     "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'",

app/Actions/Service/StartService.php

@@ -16,13 +16,13 @@ class StartService
         $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 || true";
+        $commands[] = "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 || true";
+        $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){

app/Console/Commands/Init.php

@@ -30,20 +30,21 @@ class Init extends Command
         $this->alive();
         $cleanup = $this->option('cleanup');
         if ($cleanup) {
+            echo "Running cleanup\n";
             $this->cleanup_stucked_resources();
-            $this->cleanup_ssh();
+            // $this->cleanup_ssh();
         }
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_helper_containers();
     }
-    private function 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()
     {
@@ -62,21 +63,23 @@ class Init extends Command
             echo "Error in alive: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_ssh()
-    {
-        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_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
@@ -98,15 +101,15 @@ class Init extends Command
             $applications = Application::all();
             foreach ($applications as $application) {
                 if (!data_get($application, 'environment')) {
-                    ray('Application without environment', $application->name);
-                    $application->delete();
-                }
-                if (!data_get($application, 'destination.server')) {
-                    ray('Application without server', $application->name);
+                    echo 'Application without environment' . $application->name . 'deleting\n';
                     $application->delete();
                 }
                 if (!$application->destination()) {
-                    ray('Application without destination', $application->name);
+                    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();
                 }
             }
@@ -117,15 +120,15 @@ class Init extends Command
             $postgresqls = StandalonePostgresql::all();
             foreach ($postgresqls as $postgresql) {
                 if (!data_get($postgresql, 'environment')) {
-                    ray('Postgresql without environment', $postgresql->name);
-                    $postgresql->delete();
-                }
-                if (!data_get($postgresql, 'destination.server')) {
-                    ray('Postgresql without server', $postgresql->name);
+                    echo 'Postgresql without environment' . $postgresql->name . 'deleting\n';
                     $postgresql->delete();
                 }
                 if (!$postgresql->destination()) {
-                    ray('Postgresql without destination', $postgresql->name);
+                    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();
                 }
             }
@@ -136,15 +139,15 @@ class Init extends Command
             $redis = StandaloneRedis::all();
             foreach ($redis as $redis) {
                 if (!data_get($redis, 'environment')) {
-                    ray('Redis without environment', $redis->name);
-                    $redis->delete();
-                }
-                if (!data_get($redis, 'destination.server')) {
-                    ray('Redis without server', $redis->name);
+                    echo 'Redis without environment' . $redis->name . 'deleting\n';
                     $redis->delete();
                 }
                 if (!$redis->destination()) {
-                    ray('Redis without destination', $redis->name);
+                    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();
                 }
             }
@@ -156,15 +159,15 @@ class Init extends Command
             $mongodbs = StandaloneMongodb::all();
             foreach ($mongodbs as $mongodb) {
                 if (!data_get($mongodb, 'environment')) {
-                    ray('Mongodb without environment', $mongodb->name);
-                    $mongodb->delete();
-                }
-                if (!data_get($mongodb, 'destination.server')) {
-                    ray('Mongodb without server', $mongodb->name);
+                    echo 'Mongodb without environment' . $mongodb->name . 'deleting\n';
                     $mongodb->delete();
                 }
                 if (!$mongodb->destination()) {
-                    ray('Mongodb without destination', $mongodb->name);
+                    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();
                 }
             }
@@ -176,15 +179,15 @@ class Init extends Command
             $mysqls = StandaloneMysql::all();
             foreach ($mysqls as $mysql) {
                 if (!data_get($mysql, 'environment')) {
-                    ray('Mysql without environment', $mysql->name);
-                    $mysql->delete();
-                }
-                if (!data_get($mysql, 'destination.server')) {
-                    ray('Mysql without server', $mysql->name);
+                    echo 'Mysql without environment' . $mysql->name . 'deleting\n';
                     $mysql->delete();
                 }
                 if (!$mysql->destination()) {
-                    ray('Mysql without destination', $mysql->name);
+                    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();
                 }
             }
@@ -196,15 +199,15 @@ class Init extends Command
             $mariadbs = StandaloneMariadb::all();
             foreach ($mariadbs as $mariadb) {
                 if (!data_get($mariadb, 'environment')) {
-                    ray('Mariadb without environment', $mariadb->name);
-                    $mariadb->delete();
-                }
-                if (!data_get($mariadb, 'destination.server')) {
-                    ray('Mariadb without server', $mariadb->name);
+                    echo 'Mariadb without environment' . $mariadb->name . 'deleting\n';
                     $mariadb->delete();
                 }
                 if (!$mariadb->destination()) {
-                    ray('Mariadb without destination', $mariadb->name);
+                    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();
                 }
             }
@@ -216,15 +219,15 @@ class Init extends Command
             $services = Service::all();
             foreach ($services as $service) {
                 if (!data_get($service, 'environment')) {
-                    ray('Service without environment', $service->name);
-                    $service->delete();
-                }
-                if (!data_get($service, 'server')) {
-                    ray('Service without server', $service->name);
+                    echo 'Service without environment' . $service->name . 'deleting\n';
                     $service->delete();
                 }
                 if (!$service->destination()) {
-                    ray('Service without destination', $service->name);
+                    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();
                 }
             }
@@ -235,7 +238,7 @@ class Init extends Command
             $serviceApplications = ServiceApplication::all();
             foreach ($serviceApplications as $service) {
                 if (!data_get($service, 'service')) {
-                    ray('ServiceApplication without service', $service->name);
+                    echo 'ServiceApplication without service' . $service->name . 'deleting\n';
                     $service->delete();
                 }
             }
@@ -246,7 +249,7 @@ class Init extends Command
             $serviceDatabases = ServiceDatabase::all();
             foreach ($serviceDatabases as $service) {
                 if (!data_get($service, 'service')) {
-                    ray('ServiceDatabase without service', $service->name);
+                    echo 'ServiceDatabase without service' . $service->name . 'deleting\n';
                     $service->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

@@ -12,21 +12,21 @@ use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\multiselect;
 use function Laravel\Prompts\select;
 
-class ResourcesDelete extends Command
+class ServicesDelete extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'resources:delete';
+    protected $signature = 'services:delete';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete a resource from the database';
+    protected $description = 'Delete a service from the database';
 
     /**
      * Execute the console command.
@@ -34,7 +34,7 @@ class ResourcesDelete extends Command
     public function handle()
     {
         $resource = select(
-            'What resource do you want to delete?',
+            'What service do you want to delete?',
             ['Application', 'Database', 'Service', 'Server'],
         );
         if ($resource === 'Application') {

app/Console/Commands/ServicesGenerate.php

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

app/Console/Commands/SyncBunny.php

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

app/Http/Controllers/ProjectController.php

@@ -67,7 +67,7 @@ class ProjectController extends Controller
                 $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') {
+            } else if ($type->value() === 'mariadb') {
                 $database = create_standalone_mariadb($environment->id, $destination_uuid);
             }
             return redirect()->route('project.database.configuration', [
@@ -104,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,
@@ -137,7 +117,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/Boarding/Index.php

@@ -31,6 +31,8 @@ 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 $projects;
@@ -182,7 +184,10 @@ 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()
@@ -197,6 +202,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             ]);
         } catch (\Throwable $e) {
             $this->serverReachable = false;
+            $this->createdServer->delete();
             return handleError(error: $e, livewire: $this);
         }
 

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

@@ -23,7 +23,7 @@ class Advanced extends Component
     ];
     public function instantSave()
     {
-        if ($this->application->settings->is_log_drain_enabled) {
+        if ($this->application->isLogDrainEnabled()) {
             if (!$this->application->destination->server->isLogDrainEnabled()) {
                 $this->application->settings->is_log_drain_enabled = false;
                 $this->emit('error', 'Log drain is not enabled on this server.');

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

@@ -6,6 +6,7 @@ use App\Models\Application;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class General extends Component
 {
@@ -25,8 +26,14 @@ class General extends Component
     public bool $labelsChanged = false;
     public bool $isConfigurationChanged = false;
 
+    public ?string $initialDockerComposeLocation = null;
+    public ?string $initialDockerComposePrLocation = null;
+
     public bool $is_static;
 
+    public $parsedServices = [];
+    public $parsedServiceDomains = [];
+
     protected $listeners = [
         'resetDefaultLabels'
     ];
@@ -50,6 +57,12 @@ class General extends Component
         'application.docker_registry_image_name' => 'nullable',
         'application.docker_registry_image_tag' => 'nullable',
         'application.dockerfile_location' => 'nullable',
+        'application.docker_compose_location' => 'nullable',
+        'application.docker_compose_pr_location' => 'nullable',
+        'application.docker_compose' => 'nullable',
+        'application.docker_compose_pr' => 'nullable',
+        'application.docker_compose_raw' => 'nullable',
+        'application.docker_compose_pr_raw' => 'nullable',
         'application.custom_labels' => 'nullable',
         'application.dockerfile_target_build' => 'nullable',
         'application.settings.is_static' => 'boolean|required',
@@ -74,6 +87,12 @@ class General extends Component
         'application.docker_registry_image_name' => 'Docker registry image name',
         'application.docker_registry_image_tag' => 'Docker registry image tag',
         'application.dockerfile_location' => 'Dockerfile location',
+        'application.docker_compose_location' => 'Docker compose location',
+        'application.docker_compose_pr_location' => 'Docker compose location',
+        'application.docker_compose' => 'Docker compose',
+        'application.docker_compose_pr' => 'Docker compose',
+        'application.docker_compose_raw' => 'Docker compose raw',
+        'application.docker_compose_pr_raw' => 'Docker compose raw',
         'application.custom_labels' => 'Custom labels',
         'application.dockerfile_target_build' => 'Dockerfile target build',
         'application.settings.is_static' => 'Is static',
@@ -81,6 +100,13 @@ class General extends Component
 
     public function mount()
     {
+        try {
+            $this->parsedServices = $this->application->parseCompose();
+        } catch (\Throwable $e) {
+            $this->emit('error', $e->getMessage());
+        }
+        $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
+
         $this->ports_exposes = $this->application->ports_exposes;
         if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {
             $this->application->isConfigurationChanged(true);
@@ -91,6 +117,7 @@ class General extends Component
         } else {
             $this->customLabels = str($this->application->custom_labels)->replace(',', "\n");
         }
+        $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
     }
     public function instantSave()
@@ -98,12 +125,44 @@ class General extends Component
         $this->application->settings->save();
         $this->emit('success', 'Settings saved.');
     }
+    public function loadComposeFile($isInit = false)
+    {
+        try {
+            if ($isInit && $this->application->docker_compose_raw) {
+                return;
+            }
+            ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation, 'initialDockerComposePrLocation' => $this->initialDockerComposePrLocation] = $this->application->loadComposeFile($isInit);
+            $this->emit('success', 'Docker compose file loaded.');
+        } catch (\Throwable $e) {
+            $this->application->docker_compose_location = $this->initialDockerComposeLocation;
+            $this->application->docker_compose_pr_location = $this->initialDockerComposePrLocation;
+            $this->application->save();
+            return handleError($e, $this);
+        }
+    }
+    public function generateDomain(string $serviceName)
+    {
+        $domain = $this->parsedServiceDomains[$serviceName]['domain'] ?? null;
+        if (!$domain) {
+            $uuid = new Cuid2(7);
+            $domain = generateFqdn($this->application->destination->server, $uuid);
+            $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
+            $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
+            $this->application->save();
+            $this->emit('success', 'Domain generated.');
+        }
+        return $domain;
+    }
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
             $this->application->settings->is_static = $this->is_static = false;
             $this->application->settings->save();
         }
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->application->fqdn = null;
+            $this->application->settings->save();
+        }
         $this->submit();
     }
     public function checkLabelUpdates()
@@ -140,6 +199,9 @@ class General extends Component
     public function submit($showToaster = true)
     {
         try {
+            if ($this->application->build_pack === 'dockercompose' && ($this->initialDockerComposeLocation !== $this->application->docker_compose_location || $this->initialDockerComposePrLocation !== $this->application->docker_compose_pr_location)) {
+                $this->loadComposeFile();
+            }
             $this->validate();
             if ($this->ports_exposes !== $this->application->ports_exposes) {
                 $this->resetDefaultLabels(false);
@@ -172,6 +234,10 @@ class General extends Component
                 $this->customLabels = str($this->customLabels)->replace(',', "\n");
             }
             $this->application->custom_labels = $this->customLabels->explode("\n")->implode(',');
+            if ($this->application->build_pack === 'dockercompose') {
+                $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
+                $this->parsedServices = $this->application->parseCompose();
+            }
             $this->application->save();
             $showToaster && $this->emit('success', 'Application settings updated!');
         } catch (\Throwable $e) {

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

@@ -41,6 +41,10 @@ class Heading extends Component
 
     public function deploy(bool $force_rebuild = false)
     {
+        if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
+            $this->emit('error', 'Please load a Compose file first.');
+            return;
+        }
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
@@ -68,7 +72,8 @@ class Heading extends Component
         $this->application->save();
         $this->application->refresh();
     }
-    public function restart() {
+    public function restart()
+    {
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,

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

@@ -72,10 +72,12 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generateApplicationContainerName($this->application, $pull_request_id);
-
-            instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
-            ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();
+            $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id, $pull_request_id);
+            foreach ($containers as $container) {
+                $name = str_replace('/', '', $container['Names']);
+                instant_remote_process(["docker rm -f $name"], $this->application->destination->server, throwError: false);
+            }
+            ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first()->delete();
             $this->application->refresh();
         } catch (\Throwable $e) {
             return handleError($e, $this);

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

@@ -22,79 +22,19 @@ class DockerCompose extends Component
         $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
+            appsmith:
+              build:
+                context: .
+                dockerfile_inline: |
+                  FROM nginx
+                  ARG GIT_COMMIT
+                  ARG GIT_BRANCH
+                  RUN echo "Hello World ${GIT_COMMIT} ${GIT_BRANCH}"
+                args:
+                  - GIT_COMMIT=cdc3b19
+                  - GIT_BRANCH=${GIT_BRANCH}
               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:
+                - APPSMITH_MAIL_ENABLED=${APPSMITH_MAIL_ENABLED}
           ';
         }
     }
@@ -129,7 +69,7 @@ class DockerCompose extends Component
 
             $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/New/Select.php

@@ -47,7 +47,7 @@ class Select extends Component
     }
     public function render()
     {
-        $this->loadServices();
+        if ($this->search) $this->loadServices();
         return view('livewire.project.new.select');
     }
 
@@ -69,10 +69,10 @@ class Select extends Component
     //     }
     // }
 
-    public function loadServices(bool $force = false)
+    public function loadServices()
     {
         try {
-            if (count($this->allServices) > 0 && !$force) {
+            if (count($this->allServices) > 0) {
                 if (!$this->search) {
                     $this->services = $this->allServices;
                     return;

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

@@ -28,7 +28,12 @@ class Application extends Component
     }
     public function instantSaveAdvanced()
     {
-        $this->submit();
+        if (!$this->application->service->destination->server->isLogDrainEnabled()) {
+            $this->application->is_log_drain_enabled = false;
+            $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
+            return;
+        }
+        $this->application->save();
         $this->emit('success', 'You need to restart the service for the changes to take effect.');
     }
     public function delete()
@@ -36,7 +41,7 @@ class Application extends Component
         try {
             $this->application->delete();
             $this->emit('success', 'Application deleted successfully.');
-            return redirect()->route('project.service', $this->parameters);
+            return redirect()->route('project.service.configuration', $this->parameters);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -49,11 +54,6 @@ class Application extends Component
     {
         try {
             $this->validate();
-            if (!$this->application->service->destination->server->isLogDrainEnabled()) {
-                $this->application->is_log_drain_enabled = false;
-                $this->emit('error', 'Log drain is not enabled on the server. Please enable it first.');
-                return;
-            }
             $this->application->save();
             updateCompose($this->application);
             $this->emit('success', 'Application saved successfully.');

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

@@ -28,7 +28,7 @@ class Index extends Component
     }
     public function checkStatus()
     {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
+        dispatch(new ContainerStatusJob($this->service->server));
         $this->refreshStacks();
     }
     public function refreshStacks()

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

@@ -23,7 +23,7 @@ class StackForm extends Component
             foreach ($fields as $fieldKey => $field) {
                 $key = data_get($field, 'key');
                 $value = data_get($field, 'value');
-                $rules = data_get($field, 'rules');
+                $rules = data_get($field, 'rules', 'nullable');
                 $isPassword = data_get($field, 'isPassword');
                 $this->fields[$key] = [
                     "serviceName" => $serviceName,
@@ -31,6 +31,7 @@ class StackForm extends Component
                     "name" => $fieldKey,
                     "value" => $value,
                     "isPassword" => $isPassword,
+                    "rules" => $rules
                 ];
                 $this->rules["fields.$key.value"] = $rules;
                 $this->validationAttributes["fields.$key.value"] = $fieldKey;

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

@@ -2,7 +2,16 @@
 
 namespace App\Http\Livewire\Project\Shared;
 
+use App\Models\Application;
 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\Support\Facades\Process;
 use Livewire\Component;
 
@@ -10,17 +19,44 @@ class GetLogs extends Component
 {
     public string $outputs = '';
     public string $errors = '';
+    public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
+    public ServiceApplication|ServiceDatabase|null $servicesubtype = null;
     public Server $server;
     public ?string $container = null;
     public ?bool $streamLogs = false;
     public ?bool $showTimeStamps = true;
     public int $numberOfLines = 100;
+
+    public function mount()
+    {
+        if ($this->resource->getMorphClass() === 'App\Models\Application') {
+            $this->showTimeStamps = $this->resource->settings->is_include_timestamps;
+        } else {
+            if ($this->servicesubtype) {
+                $this->showTimeStamps = $this->servicesubtype->is_include_timestamps;
+            } else {
+                $this->showTimeStamps = $this->resource->is_include_timestamps;
+            }
+        }
+    }
     public function doSomethingWithThisChunkOfOutput($output)
     {
         $this->outputs .= removeAnsiColors($output);
     }
     public function instantSave()
     {
+        if ($this->resource->getMorphClass() === 'App\Models\Application') {
+            $this->resource->settings->is_include_timestamps = $this->showTimeStamps;
+            $this->resource->settings->save();
+        } else {
+            if ($this->servicesubtype) {
+                $this->servicesubtype->is_include_timestamps = $this->showTimeStamps;
+                $this->servicesubtype->save();
+            } else {
+                $this->resource->is_include_timestamps = $this->showTimeStamps;
+                $this->resource->save();
+            }
+        }
     }
     public function getLogs($refresh = false)
     {

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

@@ -17,13 +17,16 @@ class Logs extends Component
     public ?string $type = null;
     public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
     public Server $server;
-    public ?string $container = null;
+    public $container = [];
+    public $containers;
     public $parameters;
     public $query;
     public $status;
+    public $serviceSubType;
 
     public function mount()
     {
+        $this->containers = collect();
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         if (data_get($this->parameters, 'application_uuid')) {
@@ -33,7 +36,9 @@ class Logs extends Component
             $this->server = $this->resource->destination->server;
             $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
             if ($containers->count() > 0) {
-                $this->container = data_get($containers[0], 'Names');
+                $containers->each(function ($container) {
+                    $this->containers->push(str_replace('/', '', $container['Names']));
+                });
             }
         } else if (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
@@ -60,6 +65,11 @@ class Logs extends Component
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+            $service_name = data_get($this->parameters, 'service_name');
+            $this->serviceSubType = $this->resource->applications()->where('name', $service_name)->first();
+            if (!$this->serviceSubType) {
+                $this->serviceSubType = $this->resource->databases()->where('name', $service_name)->first();
+            }
             $this->status = $this->resource->status;
             $this->server = $this->resource->server;
             $this->container = data_get($this->parameters, 'service_name') . '-' . $this->resource->uuid;

app/Http/Livewire/Server/Form.php

@@ -17,14 +17,15 @@ class Form extends Component
     protected $listeners = ['serverRefresh'];
 
     protected $rules = [
-        'server.name' => 'required|min:6',
+        'server.name' => 'required',
         'server.description' => 'nullable',
         'server.ip' => 'required',
         'server.user' => 'required',
         'server.port' => 'required',
-        'server.settings.is_cloudflare_tunnel' => 'required',
+        'server.settings.is_cloudflare_tunnel' => 'required|boolean',
         'server.settings.is_reachable' => 'required',
-        'server.settings.is_part_of_swarm' => 'required',
+        'server.settings.is_swarm_manager' => 'required|boolean',
+        // 'server.settings.is_swarm_worker' => 'required|boolean',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -34,8 +35,9 @@ class Form extends Component
         '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'
+        'server.settings.is_reachable' => 'Is reachable',
+        'server.settings.is_swarm_manager' => 'Swarm Manager',
+        // 'server.settings.is_swarm_worker' => 'Swarm Worker',
     ];
 
     public function mount()
@@ -49,9 +51,14 @@ class Form extends Component
     }
     public function instantSave()
     {
-        refresh_server_connection($this->server->privateKey);
-        $this->validateServer();
-        $this->server->settings->save();
+        try {
+            refresh_server_connection($this->server->privateKey);
+            $this->validateServer(false);
+            $this->server->settings->save();
+            $this->emit('success', 'Server updated successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
     public function installDocker()
     {
@@ -100,6 +107,12 @@ class Form extends Component
                 $install && $this->installDocker();
                 return;
             }
+            if ($this->server->isSwarm()) {
+                $swarmInstalled = $this->server->validateDockerSwarm();
+                if ($swarmInstalled) {
+                    $install && $this->emit('success', 'Docker Swarm is initiated.');
+                }
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Http/Livewire/Server/LogDrains.php

@@ -19,6 +19,9 @@ class LogDrains extends Component
         'server.settings.is_logdrain_axiom_enabled' => 'required|boolean',
         'server.settings.logdrain_axiom_dataset_name' => 'required|string',
         'server.settings.logdrain_axiom_api_key' => 'required|string',
+        'server.settings.is_logdrain_custom_enabled' => 'required|boolean',
+        'server.settings.logdrain_custom_config' => 'required|string',
+        'server.settings.logdrain_custom_config_parser' => 'nullable',
     ];
     protected $validationAttributes = [
         'server.settings.is_logdrain_newrelic_enabled' => 'New Relic log drain',
@@ -29,6 +32,9 @@ class LogDrains extends Component
         'server.settings.is_logdrain_axiom_enabled' => 'Axiom log drain',
         'server.settings.logdrain_axiom_dataset_name' => 'Axiom dataset name',
         'server.settings.logdrain_axiom_api_key' => 'Axiom API key',
+        'server.settings.is_logdrain_custom_enabled' => 'Custom log drain',
+        'server.settings.logdrain_custom_config' => 'Custom log drain configuration',
+        'server.settings.logdrain_custom_config_parser' => 'Custom log drain configuration parser',
     ];
 
     public function mount()
@@ -84,6 +90,7 @@ class LogDrains extends Component
                 $this->server->settings->update([
                     'is_logdrain_highlight_enabled' => false,
                     'is_logdrain_axiom_enabled' => false,
+                    'is_logdrain_custom_enabled' => false,
                 ]);
             } else if ($type === 'highlight') {
                 $this->validate([
@@ -93,6 +100,7 @@ class LogDrains extends Component
                 $this->server->settings->update([
                     'is_logdrain_newrelic_enabled' => false,
                     'is_logdrain_axiom_enabled' => false,
+                    'is_logdrain_custom_enabled' => false,
                 ]);
             } else if ($type === 'axiom') {
                 $this->validate([
@@ -103,6 +111,18 @@ class LogDrains extends Component
                 $this->server->settings->update([
                     'is_logdrain_newrelic_enabled' => false,
                     'is_logdrain_highlight_enabled' => false,
+                    'is_logdrain_custom_enabled' => false,
+                ]);
+            } else if ($type === 'custom') {
+                $this->validate([
+                    'server.settings.is_logdrain_custom_enabled' => 'required|boolean',
+                    'server.settings.logdrain_custom_config' => 'required|string',
+                    'server.settings.logdrain_custom_config_parser' => 'nullable',
+                ]);
+                $this->server->settings->update([
+                    'is_logdrain_newrelic_enabled' => false,
+                    'is_logdrain_highlight_enabled' => false,
+                    'is_logdrain_axiom_enabled' => false,
                 ]);
             }
             $this->server->settings->save();
@@ -121,6 +141,10 @@ class LogDrains extends Component
                 $this->server->settings->update([
                     'is_logdrain_axiom_enabled' => false,
                 ]);
+            } else if ($type === 'custom') {
+                $this->server->settings->update([
+                    'is_logdrain_custom_enabled' => false,
+                ]);
             }
             handleError($e, $this);
             return false;

app/Http/Livewire/Server/New/ByIp.php

@@ -21,7 +21,7 @@ class ByIp extends Component
     public string $ip;
     public string $user = 'root';
     public int $port = 22;
-    public bool $is_part_of_swarm = false;
+    public bool $is_swarm_manager = false;
 
     protected $rules = [
         'name' => 'required|string',
@@ -29,6 +29,7 @@ class ByIp extends Component
         'ip' => 'required',
         'user' => 'required|string',
         'port' => 'required|integer',
+        'is_swarm_manager' => 'required|boolean',
     ];
     protected $validationAttributes = [
         'name' => 'Name',
@@ -36,6 +37,7 @@ class ByIp extends Component
         'ip' => 'IP Address/Domain',
         'user' => 'User',
         'port' => 'Port',
+        'is_swarm_manager' => 'Swarm Manager',
     ];
 
     public function mount()
@@ -72,11 +74,11 @@ class ByIp extends Component
                 'proxy' => [
                     "type" => ProxyTypes::TRAEFIK_V2->value,
                     "status" => ProxyStatus::EXITED->value,
-                ]
-
+                ],
             ]);
-            $server->settings->is_part_of_swarm = $this->is_part_of_swarm;
+            $server->settings->is_swarm_manager = $this->is_swarm_manager;
             $server->settings->save();
+            $server->addInitialNetwork();
             return redirect()->route('server.show', $server->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);

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

@@ -58,11 +58,25 @@ class Deploy extends Component
 
     public function stop()
     {
-        instant_remote_process([
-            "docker rm -f coolify-proxy",
-        ], $this->server);
-        $this->server->proxy->status = 'exited';
-        $this->server->save();
-        $this->emit('proxyStatusUpdated');
+        try {
+            if ($this->server->isSwarm()) {
+                instant_remote_process([
+                    "docker service rm coolify-proxy_traefik",
+                ], $this->server);
+                $this->server->proxy->status = 'exited';
+                $this->server->save();
+                $this->emit('proxyStatusUpdated');
+            } else {
+                instant_remote_process([
+                    "docker rm -f coolify-proxy",
+                ], $this->server);
+                $this->server->proxy->status = 'exited';
+                $this->server->save();
+                $this->emit('proxyStatusUpdated');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+
     }
 }

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

@@ -14,9 +14,12 @@ class Status extends Component
     public int $numberOfPolls = 0;
 
     protected $listeners = ['proxyStatusUpdated', 'startProxyPolling'];
+    public function mount() {
+        $this->checkProxy();
+    }
     public function startProxyPolling()
     {
-        $this->polling = true;
+        $this->checkProxy();
     }
     public function proxyStatusUpdated()
     {

app/Http/Livewire/Server/Show.php

@@ -19,6 +19,7 @@ class Show extends Component
             if (is_null($this->server)) {
                 return redirect()->route('server.all');
             }
+
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Http/Livewire/Subscription/PricingPlans.php

@@ -11,6 +11,9 @@ class PricingPlans extends Component
     public bool $isTrial = false;
     public function mount() {
         $this->isTrial = !data_get(currentTeam(),'subscription.stripe_trial_already_ended');
+        if (config('constants.limits.trial_period') == 0) {
+            $this->isTrial = false;
+        }
     }
     public function subscribeStripe($type)
     {
@@ -63,6 +66,7 @@ class PricingPlans extends Component
         ];
 
         if (!data_get($team,'subscription.stripe_trial_already_ended')) {
+            if (config('constants.limits.trial_period') > 0) {
             $payload['subscription_data'] = [
                 'trial_period_days' => config('constants.limits.trial_period'),
                 'trial_settings' => [
@@ -71,6 +75,7 @@ class PricingPlans extends Component
                     ]
                 ],
             ];
+        }
             $payload['payment_method_collection'] = 'if_required';
         }
         $customer = currentTeam()->subscription?->stripe_customer_id ?? null;

app/Jobs/ApplicationDeployDockerImageJob.php

@@ -1,111 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Enums\ApplicationDeploymentStatus;
-use App\Models\Application;
-use App\Models\ApplicationDeploymentQueue;
-use App\Traits\ExecuteRemoteCommandNew;
-use Exception;
-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 Throwable;
-
-class ApplicationDeployDockerImageJob implements ShouldQueue, ShouldBeEncrypted
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommandNew;
-
-    public $timeout = 3600;
-    public $tries = 1;
-    public string $applicationDeploymentQueueId;
-
-    public function __construct(string $applicationDeploymentQueueId)
-    {
-        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
-    }
-    public function handle()
-    {
-        ray()->clearAll();
-        ray('Deploying Docker Image');
-        try {
-            $applicationDeploymentQueue = ApplicationDeploymentQueue::find($this->applicationDeploymentQueueId);
-            $application = Application::find($applicationDeploymentQueue->application_id);
-
-            $deploymentUuid = data_get($applicationDeploymentQueue, 'deployment_uuid');
-            $dockerImage = data_get($application, 'docker_registry_image_name');
-            $dockerImageTag = data_get($application, 'docker_registry_image_tag');
-            $productionImageName = str("{$dockerImage}:{$dockerImageTag}");
-            $destination = $application->destination->getMorphClass()::where('id', $application->destination->id)->first();
-            $pullRequestId = data_get($applicationDeploymentQueue, 'pull_request_id');
-
-            $server = data_get($destination, 'server');
-            $network = data_get($destination, 'network');
-
-            $containerName = generateApplicationContainerName($application, $pullRequestId);
-            savePrivateKeyToFs($server);
-
-            ray("echo 'Starting deployment of {$productionImageName}.'");
-
-            $applicationDeploymentQueue->update([
-                'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-            ]);
-            $this->executeRemoteCommand(
-                server: $server,
-                logModel: $applicationDeploymentQueue,
-                commands: prepareHelperContainer($server, $network, $deploymentUuid)
-            );
-
-            $this->executeRemoteCommand(
-                server: $server,
-                logModel: $applicationDeploymentQueue,
-                commands: generateComposeFile(
-                    deploymentUuid: $deploymentUuid,
-                    server: $server,
-                    network: $network,
-                    application: $application,
-                    containerName: $containerName,
-                    imageName: $productionImageName,
-                    pullRequestId: $pullRequestId
-                )
-            );
-            $this->executeRemoteCommand(
-                server: $server,
-                logModel: $applicationDeploymentQueue,
-                commands: rollingUpdate(application: $application, deploymentUuid: $deploymentUuid)
-            );
-        } catch (Throwable $e) {
-            $this->executeRemoteCommand(
-                server: $server,
-                logModel: $applicationDeploymentQueue,
-                commands: [
-                    "echo 'Oops something is not okay, are you okay? 😢'",
-                    "echo '{$e->getMessage()}'",
-                    "echo -n 'Deployment failed. Removing the new version of your application.'",
-                    executeInDocker($deploymentUuid, "docker rm -f $containerName >/dev/null 2>&1"),
-                ]
-            );
-            // $this->next(ApplicationDeploymentStatus::FAILED->value);
-            throw $e;
-        }
-    }
-    // private function next(string $status)
-    // {
-    //     // If the deployment is cancelled by the user, don't update the status
-    //     if ($this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
-    //         $this->application_deployment_queue->update([
-    //             'status' => $status,
-    //         ]);
-    //     }
-    //     queue_next_deployment($this->application);
-    //     if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-    //         $this->application->environment->project->team->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
-    //     }
-    //     if ($status === ApplicationDeploymentStatus::FAILED->value) {
-    //         $this->application->environment->project->team->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
-    //     }
-    // }
-}

app/Jobs/ApplicationDeploySimpleDockerfileJob.php

@@ -1,29 +0,0 @@
-<?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 ApplicationDeploySimpleDockerfileJob 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('Deploying Simple Dockerfile');
-    }
-}

app/Jobs/ApplicationDeploymentJob.php

@@ -73,9 +73,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $docker_compose;
     private $docker_compose_base64;
     private string $dockerfile_location = '/Dockerfile';
+    private string $docker_compose_location = '/docker-compose.yml';
     private ?string $addHosts = null;
     private ?string $buildTarget = null;
-    private $log_model;
     private Collection $saved_outputs;
     private ?string $full_healthcheck_url = null;
 
@@ -92,9 +92,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
-        // ray()->clearScreen();
         $this->application_deployment_queue = ApplicationDeploymentQueue::find($application_deployment_queue_id);
-        $this->log_model = $this->application_deployment_queue;
         $this->application = Application::find($this->application_deployment_queue->application_id);
         $this->build_pack = data_get($this->application, 'build_pack');
 
@@ -114,7 +112,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
         $this->server = $this->mainServer = $this->destination->server;
         $this->serverUser = $this->server->user;
-        $this->basedir = "/artifacts/{$this->deployment_uuid}";
+        $this->basedir = $this->application->generateBaseDir($this->deployment_uuid);
         $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
         $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
@@ -158,40 +156,35 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         // Generate custom host<->ip mapping
         $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
-        $allContainers = format_docker_command_output_to_json($allContainers);
-        $ips = collect([]);
-        if (count($allContainers) > 0) {
-            $allContainers = $allContainers[0];
-            foreach ($allContainers as $container) {
-                $containerName = data_get($container, 'Name');
-                if ($containerName === 'coolify-proxy') {
-                    continue;
-                }
-                $containerIp = data_get($container, 'IPv4Address');
-                if ($containerName && $containerIp) {
-                    $containerIp = str($containerIp)->before('/');
-                    $ips->put($containerName, $containerIp->value());
+        if (!is_null($allContainers)) {
+            $allContainers = format_docker_command_output_to_json($allContainers);
+            $ips = collect([]);
+            if (count($allContainers) > 0) {
+                $allContainers = $allContainers[0];
+                foreach ($allContainers as $container) {
+                    $containerName = data_get($container, 'Name');
+                    if ($containerName === 'coolify-proxy') {
+                        continue;
+                    }
+                    $containerIp = data_get($container, 'IPv4Address');
+                    if ($containerName && $containerIp) {
+                        $containerIp = str($containerIp)->before('/');
+                        $ips->put($containerName, $containerIp->value());
+                    }
                 }
             }
+            $this->addHosts = $ips->map(function ($ip, $name) {
+                return "--add-host $name:$ip";
+            })->implode(' ');
         }
-        $this->addHosts = $ips->map(function ($ip, $name) {
-            return "--add-host $name:$ip";
-        })->implode(' ');
 
         if ($this->application->dockerfile_target_build) {
             $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
         }
 
         // Check custom port
-        preg_match('/(?<=:)\d+(?=\/)/', $this->application->git_repository, $matches);
-        if (count($matches) === 1) {
-            $this->customPort = $matches[0];
-            $gitHost = str($this->application->git_repository)->before(':');
-            $gitRepo = str($this->application->git_repository)->after('/');
-            $this->customRepository = "$gitHost:$gitRepo";
-        } else {
-            $this->customRepository = $this->application->git_repository;
-        }
+        ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
+
         try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
@@ -203,6 +196,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 return;
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
+            } else if ($this->application->build_pack === 'dockercompose') {
+                $this->deploy_docker_compose_buildpack();
             } else if ($this->application->build_pack === 'dockerimage') {
                 $this->deploy_dockerimage_buildpack();
             } else if ($this->application->build_pack === 'dockerfile') {
@@ -219,8 +214,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->server->isProxyShouldRun()) {
                 dispatch(new ContainerStatusJob($this->server));
             }
-            if ($this->application->docker_registry_image_name) {
+            if ($this->application->docker_registry_image_name && $this->application->build_pack !== 'dockerimage') {
                 $this->push_to_docker_registry();
+                if ($this->server->isSwarm()) {
+                    $this->application_deployment_queue->addLogEntry("Creating / updating stack.");
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "cd {$this->workdir} && docker stack deploy --with-registry-auth -c docker-compose.yml {$this->application->uuid}")
+                        ],
+                        [
+                            "echo 'Stack deployed. It may take a few minutes to fully available in your swarm.'"
+                        ]
+                    );
+                }
             }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
             $this->application->isConfigurationChanged(true);
@@ -297,42 +303,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ray($e);
         }
     }
-    // private function deploy_docker_compose()
-    // {
-    //     $dockercompose_base64 = base64_encode($this->application->dockercompose);
-    //     $this->execute_remote_command(
-    //         [
-    //             "echo 'Starting deployment of {$this->application->name}.'"
-    //         ],
-    //     );
-    //     $this->prepare_builder_image();
-    //     $this->execute_remote_command(
-    //         [
-    //             executeInDocker($this->deployment_uuid, "echo '$dockercompose_base64' | base64 -d > $this->workdir/docker-compose.yaml")
-    //         ],
-    //     );
-    //     $this->build_image_name = Str::lower("{$this->customRepository}:build");
-    //     $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
-    //     $this->save_environment_variables();
-    //     $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
-    //     ray($containers);
-    //     if ($containers->count() > 0) {
-    //         foreach ($containers as $container) {
-    //             $containerName = data_get($container, 'Names');
-    //             if ($containerName) {
-    //                 instant_remote_process(
-    //                     ["docker rm -f {$containerName}"],
-    //                     $this->application->destination->server
-    //                 );
-    //             }
-    //         }
-    //     }
-
-    //     $this->execute_remote_command(
-    //         ["echo -n 'Starting services (could take a while)...'"],
-    //         [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
-    //     );
-    // }
     private function generate_image_names()
     {
         if ($this->application->dockerfile) {
@@ -377,6 +347,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_image_names();
         $this->check_image_locally_or_remotely();
         if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
+            $this->create_workdir();
             $this->generate_compose_file();
             $this->rolling_update();
             return;
@@ -397,19 +368,26 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ]);
         }
     }
-    // private function save_environment_variables()
-    // {
-    //     $envs = collect([]);
-    //     foreach ($this->application->environment_variables as $env) {
-    //         $envs->push($env->key . '=' . $env->value);
-    //     }
-    //     $envs_base64 = base64_encode($envs->implode("\n"));
-    //     $this->execute_remote_command(
-    //         [
-    //             executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
-    //         ],
-    //     );
-    // }
+    private function save_environment_variables()
+    {
+        $envs = collect([]);
+        if ($this->pull_request_id !== 0) {
+            foreach ($this->application->environment_variables_preview as $env) {
+                $envs->push($env->key . '=' . $env->value);
+            }
+        } else {
+            foreach ($this->application->environment_variables as $env) {
+                $envs->push($env->key . '=' . $env->value);
+            }
+        }
+        $envs_base64 = base64_encode($envs->implode("\n"));
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
+            ],
+        );
+    }
+
     private function deploy_simple_dockerfile()
     {
         $dockerfile_base64 = base64_encode($this->application->dockerfile);
@@ -447,7 +425,67 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_compose_file();
         $this->rolling_update();
     }
+    private function deploy_docker_compose_buildpack()
+    {
+        if (data_get($this->application, 'docker_compose_location')) {
+            $this->docker_compose_location = $this->application->docker_compose_location;
+        }
+        if ($this->pull_request_id === 0) {
+            $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
+        } else {
+            $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
+        }
+        $this->server->executeRemoteCommand(
+            commands: $this->application->prepareHelperImage($this->deployment_uuid),
+            loggingModel: $this->application_deployment_queue
+        );
+        $this->check_git_if_build_needed();
+        $this->clone_repository();
+        $this->generate_image_names();
+        $this->cleanup_git();
+        $this->application->loadComposeFile(isInit: false);
+        $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
+        $yaml = Yaml::dump($composeFile->toArray(), 10);
+        $this->docker_compose_base64 = base64_encode($yaml);
+        $this->execute_remote_command([
+            executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}{$this->docker_compose_location}"), "hidden" => true
+        ]);
+        $this->save_environment_variables();
+        $this->stop_running_container(force: true);
 
+        $networkId = $this->application->uuid;
+        if ($this->pull_request_id !== 0) {
+            $networkId = "{$this->application->uuid}-{$this->pull_request_id}";
+        }
+        if ($this->server->isSwarm()) {
+            // TODO
+        } else {
+            $this->execute_remote_command([
+                "docker network create --attachable '{$networkId}' >/dev/null || true", "hidden" => true, "ignore_errors" => true
+            ], [
+                "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
+            ]);
+        }
+        if (isset($this->docker_compose_base64)) {
+            $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
+            $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            if ($this->pull_request_id !== 0) {
+                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+            }
+            $this->execute_remote_command(
+                [
+                    "mkdir -p $this->configuration_dir"
+                ],
+                [
+                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
+                ],
+                [
+                    "echo '{$readme}' > $this->configuration_dir/README.md",
+                ]
+            );
+        }
+        $this->start_by_compose_file();
+    }
     private function deploy_dockerfile_buildpack()
     {
         if (data_get($this->application, 'dockerfile_location')) {
@@ -472,7 +510,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         //     $this->push_to_docker_registry();
         //     $this->deploy_to_additional_destinations();
         // } else {
-            $this->rolling_update();
+        $this->rolling_update();
         // }
     }
     private function deploy_nixpacks_buildpack()
@@ -489,6 +527,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (!$this->force_rebuild) {
             $this->check_image_locally_or_remotely();
             if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+                $this->create_workdir();
                 $this->execute_remote_command([
                     "echo 'No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.'",
                 ]);
@@ -531,74 +570,83 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function rolling_update()
     {
-        if (count($this->application->ports_mappings_array) > 0) {
-            $this->execute_remote_command(
-                [
-                    "echo '\n----------------------------------------'",
-                ],
-                ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
-            );
-            $this->stop_running_container(force: true);
-            $this->start_by_compose_file();
+        if ($this->server->isSwarm()) {
+            // Skip this.
         } else {
-            $this->execute_remote_command(
-                [
-                    "echo '\n----------------------------------------'",
-                ],
-                ["echo -n 'Rolling update started.'"],
-            );
-            $this->start_by_compose_file();
-            $this->health_check();
-            $this->stop_running_container();
+            if (count($this->application->ports_mappings_array) > 0) {
+                $this->execute_remote_command(
+                    [
+                        "echo '\n----------------------------------------'",
+                    ],
+                    ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
+                );
+                $this->stop_running_container(force: true);
+                $this->start_by_compose_file();
+            } else {
+                $this->execute_remote_command(
+                    [
+                        "echo '\n----------------------------------------'",
+                    ],
+                    ["echo -n 'Rolling update started.'"],
+                );
+                $this->start_by_compose_file();
+                $this->health_check();
+                $this->stop_running_container();
+                $this->application_deployment_queue->addLogEntry("Rolling update completed.");
+            }
         }
     }
     private function health_check()
     {
-        if ($this->application->isHealthcheckDisabled()) {
-            $this->newVersionIsHealthy = true;
-            return;
-        }
-        // ray('New container name: ', $this->container_name);
-        if ($this->container_name) {
-            $counter = 1;
-            $this->execute_remote_command(
-                [
-                    "echo 'Waiting for healthcheck to pass on the new container.'"
-                ]
-            );
-            if ($this->full_healthcheck_url) {
+        if ($this->server->isSwarm()) {
+            // Implement healthcheck for swarm
+        } else {
+            if ($this->application->isHealthcheckDisabled()) {
+                $this->newVersionIsHealthy = true;
+                return;
+            }
+            // ray('New container name: ', $this->container_name);
+            if ($this->container_name) {
+                $counter = 1;
                 $this->execute_remote_command(
                     [
-                        "echo 'Healthcheck URL (inside the container): {$this->full_healthcheck_url}'"
+                        "echo 'Waiting for healthcheck to pass on the new container.'"
                     ]
                 );
-            }
-            while ($counter < $this->application->health_check_retries) {
-                $this->execute_remote_command(
-                    [
-                        "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
-                        "hidden" => true,
-                        "save" => "health_check"
-                    ],
-
-                );
-                $this->execute_remote_command(
-                    [
-                        "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
-                    ],
-                );
-                if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
-                    $this->newVersionIsHealthy = true;
-                    $this->application->update(['status' => 'running']);
+                if ($this->full_healthcheck_url) {
                     $this->execute_remote_command(
                         [
-                            "echo 'New container is healthy.'"
+                            "echo 'Healthcheck URL (inside the container): {$this->full_healthcheck_url}'"
+                        ]
+                    );
+                }
+                while ($counter < $this->application->health_check_retries) {
+                    $this->execute_remote_command(
+                        [
+                            "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
+                            "hidden" => true,
+                            "save" => "health_check"
+                        ],
+
+                    );
+                    $this->execute_remote_command(
+                        [
+                            "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
                         ],
                     );
-                    break;
+                    if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
+                        $this->newVersionIsHealthy = true;
+                        $this->application->update(['status' => 'running']);
+                        $this->execute_remote_command(
+                            [
+                                "echo 'New container is healthy.'"
+                            ],
+                        );
+                        break;
+                    }
+                    $counter++;
+                    sleep($this->application->health_check_interval);
                 }
-                $counter++;
-                sleep($this->application->health_check_interval);
             }
         }
     }
@@ -618,8 +666,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         $this->generate_compose_file();
         // Needs separate preview variables
-        // $this->generate_build_env_variables();
-        // $this->add_build_env_variables_to_dockerfile();
+        $this->generate_build_env_variables();
+        $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
         $this->stop_running_container();
         $this->execute_remote_command(
@@ -627,7 +675,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
         );
     }
-
+    private function create_workdir()
+    {
+        $this->execute_remote_command(
+            [
+                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->workdir}")
+            ],
+        );
+    }
     private function prepare_builder_image()
     {
         $helperImage = config('coolify.helper_image');
@@ -636,9 +691,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
 
         if ($this->dockerConfigFileExists === 'OK') {
-            $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         } else {
-            $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         }
         $this->execute_remote_command(
             [
@@ -651,6 +706,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [
                 "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
             ],
+
         );
     }
     private function deploy_to_additional_destinations()
@@ -725,13 +781,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function clone_repository()
     {
         $importCommands = $this->generate_git_import_commands();
+        $this->application_deployment_queue->addLogEntry("\n----------------------------------------");
+        $this->application_deployment_queue->addLogEntry("Importing {$this->customRepository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}.");
+        if ($this->pull_request_id !== 0) {
+            $this->application_deployment_queue->addLogEntry("Checking out tag pull/{$this->pull_request_id}/head.");
+        }
         $this->execute_remote_command(
-            [
-                "echo '\n----------------------------------------'",
-            ],
-            [
-                "echo -n 'Importing {$this->customRepository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
-            ],
             [
                 $importCommands, "hidden" => true
             ]
@@ -740,90 +795,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function generate_git_import_commands()
     {
-        $this->branch = $this->application->git_branch;
-        $commands = collect([]);
-        $git_clone_command = "git clone -q -b {$this->application->git_branch}";
-        if ($this->pull_request_id !== 0) {
-            $pr_branch_name = "pr-{$this->pull_request_id}-coolify";
-        }
-
-        if ($this->application->deploymentType() === 'source') {
-            $source_html_url = data_get($this->application, 'source.html_url');
-            $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL));
-            $source_html_url_host = $url['host'];
-            $source_html_url_scheme = $url['scheme'];
-
-            if ($this->source->getMorphClass() == 'App\Models\GithubApp') {
-                if ($this->source->is_public) {
-                    $this->fullRepoUrl = "{$this->source->html_url}/{$this->customRepository}";
-                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->customRepository} {$this->basedir}";
-                    $git_clone_command = $this->set_git_import_settings($git_clone_command);
-
-                    $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
-                } else {
-                    $github_access_token = generate_github_installation_token($this->source);
-                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git {$this->basedir}"));
-                    $this->fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git";
-                }
-                if ($this->pull_request_id !== 0) {
-                    $this->branch = "pull/{$this->pull_request_id}/head:$pr_branch_name";
-                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git fetch origin $this->branch && git checkout $pr_branch_name"));
-                }
-                return $commands->implode(' && ');
-            }
-        }
-        if ($this->application->deploymentType() === 'deploy_key') {
-            $this->fullRepoUrl = $this->customRepository;
-            $private_key = data_get($this->application, 'private_key.private_key');
-            if (is_null($private_key)) {
-                throw new RuntimeException('Private key not found. Please add a private key to the application and try again.');
-            }
-            $private_key = base64_encode($private_key);
-            $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->customRepository} {$this->basedir}";
-            $git_clone_command = $this->set_git_import_settings($git_clone_command_base);
-            $commands = collect([
-                executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
-                executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa"),
-                executeInDocker($this->deployment_uuid, "chmod 600 /root/.ssh/id_rsa"),
-            ]);
-            if ($this->pull_request_id !== 0) {
-                ray($this->git_type);
-                if ($this->git_type === 'gitlab') {
-                    $this->branch = "merge-requests/{$this->pull_request_id}/head:$pr_branch_name";
-                    $commands->push(executeInDocker($this->deployment_uuid, "echo 'Checking out $this->branch'"));
-                    $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $this->branch && git checkout $pr_branch_name";
-                }
-                if ($this->git_type === 'github') {
-                    $this->branch = "pull/{$this->pull_request_id}/head:$pr_branch_name";
-                    $commands->push(executeInDocker($this->deployment_uuid, "echo 'Checking out $this->branch'"));
-                    $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $this->branch && git checkout $pr_branch_name";
-                }
-            }
-
-            $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
-            return $commands->implode(' && ');
-        }
-        if ($this->application->deploymentType() === 'other') {
-            $this->fullRepoUrl = $this->customRepository;
-            $git_clone_command = "{$git_clone_command} {$this->customRepository} {$this->basedir}";
-            $git_clone_command = $this->set_git_import_settings($git_clone_command);
-            $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
-            return $commands->implode(' && ');
-        }
+        ['commands' => $commands, 'branch' => $this->branch, 'fullRepoUrl' => $this->fullRepoUrl] = $this->application->generateGitImportCommands($this->deployment_uuid, $this->pull_request_id, $this->git_type);
+        return $commands;
     }
 
     private function set_git_import_settings($git_clone_command)
     {
-        if ($this->application->git_commit_sha !== 'HEAD') {
-            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git -c advice.detachedHead=false checkout {$this->application->git_commit_sha} >/dev/null 2>&1";
-        }
-        if ($this->application->settings->is_git_submodules_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git submodule update --init --recursive";
-        }
-        if ($this->application->settings->is_git_lfs_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git lfs pull";
-        }
-        return $git_clone_command;
+        return $this->application->setGitImportSettings($this->deployment_uuid, $git_clone_command);
     }
 
     private function cleanup_git()
@@ -849,7 +827,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function nixpacks_build_cmd()
     {
         $this->generate_env_variables();
-        $nixpacks_command = "nixpacks build --cache-key '{$this->application->uuid}' -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        $cacheKey = $this->application->uuid;
+        if ($this->pull_request_id !== 0) {
+            $cacheKey = "{$this->application->uuid}-pr-{$this->pull_request_id}";
+        }
+        $nixpacks_command = "nixpacks build --cache-key '{$cacheKey}' -o {$this->workdir} {$this->env_args} --no-error-without-start";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -899,21 +881,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         if ($this->pull_request_id !== 0) {
             $labels = collect(generateLabelsApplication($this->application, $this->preview));
-
-            // $newHostLabel = $newLabels->filter(function ($label) {
-            //     return str($label)->contains('Host');
-            // });
-            // $labels = $labels->reject(function ($label) {
-            //     return str($label)->contains('Host');
-            // });
-            // ray($labels,$newLabels);
-            // $labels = $labels->map(function ($label) {
-            //     $pattern = '/([a-zA-Z0-9]+)-(\d+)-(http|https)/';
-            //     $replacement = "$1-pr-{$this->pull_request_id}-$2-$3";
-            //     $newLabel = preg_replace($pattern, $replacement, $label);
-            //     return $newLabel;
-            // });
-            // $labels = $labels->merge($newHostLabel);
         }
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
         $docker_compose = [
@@ -924,7 +891,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'container_name' => $this->container_name,
                     'restart' => RESTART_MODE,
                     'environment' => $environment_variables,
-                    'labels' => $labels,
                     'expose' => $ports,
                     'networks' => [
                         $this->destination->network,
@@ -956,6 +922,48 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if ($this->server->isSwarm()) {
+            data_forget($docker_compose, 'services.' . $this->container_name . '.container_name');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.expose');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.restart');
+
+            data_forget($docker_compose, 'services.' . $this->container_name . '.mem_limit');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.memswap_limit');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.mem_swappiness');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.mem_reservation');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.cpus');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.cpuset');
+            data_forget($docker_compose, 'services.' . $this->container_name . '.cpu_shares');
+
+            $docker_compose['services'][$this->container_name]['deploy'] = [
+                'placement' => [
+                    'constraints' => [
+                        'node.role == worker'
+                    ]
+                ],
+                'mode' => 'replicated',
+                'replicas' => 1,
+                'update_config' => [
+                    'order' => 'start-first'
+                ],
+                'rollback_config' => [
+                    'order' => 'start-first'
+                ],
+                'labels' => $labels,
+                'resources' => [
+                    'limits' => [
+                        'cpus' => $this->application->limits_cpus,
+                        'memory' => $this->application->limits_memory,
+                    ],
+                    'reservations' => [
+                        'cpus' => $this->application->limits_cpus,
+                        'memory' => $this->application->limits_memory,
+                    ]
+                ]
+            ];
+        } else {
+            $docker_compose['services'][$this->container_name]['labels'] = $labels;
+        }
         if ($this->server->isLogDrainEnabled() && $this->application->isLogDrainEnabled()) {
             $docker_compose['services'][$this->container_name]['logging'] = [
                 'driver' => 'fluentd',
@@ -967,7 +975,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ];
         }
         if ($this->application->settings->is_gpu_enabled) {
-            ray('asd');
             $docker_compose['services'][$this->container_name]['deploy']['resources']['reservations']['devices'] = [
                 [
                     'driver' => data_get($this->application, 'settings.gpu_driver', 'nvidia'),
@@ -1004,6 +1011,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         //         'dockerfile' => $this->workdir . $this->dockerfile_location,
         //     ];
         // }
+
+        $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
+
+        data_forget($docker_compose, 'services.' . $this->container_name);
+
         $this->docker_compose = Yaml::dump($docker_compose, 10);
         $this->docker_compose_base64 = base64_encode($this->docker_compose);
         $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}/docker-compose.yml"), "hidden" => true]);
@@ -1206,14 +1218,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function stop_running_container(bool $force = false)
     {
-        $this->execute_remote_command(["echo -n 'Removing old container.'"]);
+        $this->application_deployment_queue->addLogEntry("Removing old containers.");
         if ($this->newVersionIsHealthy || $force) {
             $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
-            if ($this->pull_request_id !== 0) {
-                $containers = $containers->filter(function ($container) {
-                    return data_get($container, 'Names') === $this->container_name;
-                });
-            } else {
+            if ($this->pull_request_id === 0) {
                 $containers = $containers->filter(function ($container) {
                     return data_get($container, 'Names') !== $this->container_name;
                 });
@@ -1224,14 +1232,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
                 );
             });
-            $this->execute_remote_command(
-                [
-                    "echo 'Rolling update completed.'"
-                ],
-            );
         } else {
+            $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
             $this->execute_remote_command(
-                ["echo -n 'New container is not healthy, rolling back to the old container.'"],
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
             );
         }
@@ -1240,8 +1243,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     private function start_by_compose_file()
     {
         if ($this->application->build_pack === 'dockerimage') {
+            $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
-                ["echo -n 'Pulling latest images from the registry.'"],
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
@@ -1250,6 +1253,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         }
+        $this->application_deployment_queue->addLogEntry("New container started.");
     }
 
     private function generate_build_env_variables()
@@ -1274,9 +1278,14 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile'
         ]);
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
-
-        foreach ($this->application->build_environment_variables as $env) {
-            $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+        if ($this->pull_request_id === 0) {
+            foreach ($this->application->build_environment_variables as $env) {
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+            }
+        } else {
+            foreach ($this->application->build_environment_variables_preview as $env) {
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+            }
         }
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
         $this->execute_remote_command([
@@ -1307,9 +1316,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $this->execute_remote_command(
             ["echo 'Oops something is not okay, are you okay? 😢'", 'type' => 'err'],
             ["echo '{$exception->getMessage()}'", 'type' => 'err'],
-            ["echo -n 'Deployment failed. Removing the new version of your application.'", 'type' => 'err'],
-            [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
         );
+        if ($this->application->build_pack !== 'dockercompose') {
+            $this->execute_remote_command(
+                ["echo -n 'Deployment failed. Removing the new version of your application.'", 'type' => 'err'],
+                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
+            );
+        }
 
         $this->next(ApplicationDeploymentStatus::FAILED->value);
     }

app/Jobs/CheckLogDrainContainerJob.php

@@ -47,7 +47,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
             if (!$this->server->isServerReady()) {
                 return;
             };
-            $containers = instant_remote_process(["docker container ls -q"], $this->server);
+            $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
             if (!$containers) {
                 return;
             }

app/Jobs/ContainerStatusJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Models\ApplicationPreview;
@@ -21,10 +22,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public function __construct(public Server $server)
-    {
-        $this->handle();
-    }
     public function middleware(): array
     {
         return [(new WithoutOverlapping($this->server->id))->dontRelease()];
@@ -35,34 +32,75 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         return $this->server->id;
     }
 
-    public function handle(): void
+    public function __construct(public Server $server)
+    {
+        if (isDev()) $this->handle();
+    }
+
+
+    public function handle()
     {
         // ray("checking container statuses for {$this->server->id}");
         try {
             if (!$this->server->isServerReady()) {
                 return;
             };
-            $containers = instant_remote_process(["docker container ls -q"], $this->server);
-            if (!$containers) {
+            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 {
+                // 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;
             }
-            $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();
-
             $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));
                 $applicationId = data_get($labels, 'coolify.applicationId');
                 if ($applicationId) {
@@ -98,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.
                         }
@@ -167,7 +219,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 } else {
                     $url = null;
                 }
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
                 $exitedService->update(['status' => 'exited']);
             }
 
@@ -194,7 +246,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     $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) {
@@ -219,7 +271,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     $url = null;
                 }
 
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
             foreach ($notRunningDatabases as $database) {
@@ -243,22 +295,24 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 } else {
                     $url = null;
                 }
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
 
             // Check if proxy is running
             $this->server->proxyType();
             $foundProxyContainer = $containers->filter(function ($value, $key) {
-                return data_get($value, 'Name') === '/coolify-proxy';
+                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));
-                    } else {
-                        ray('Proxy could not be started.');
+                        $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
                     }
                 } catch (\Throwable $e) {
                     ray($e);
@@ -272,7 +326,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
-            handleError($e);
+            return handleError($e);
         }
     }
 }

app/Jobs/DockerCleanupJob.php

@@ -3,8 +3,6 @@
 namespace App\Jobs;
 
 use App\Models\Server;
-use App\Notifications\Server\HighDiskUsage;
-use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -13,6 +11,7 @@ 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
 {
@@ -35,7 +34,7 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
                 }
             });
             if ($isInprogress) {
-                throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+                throw new RuntimeException('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
             }
             if (!$this->server->isFunctional()) {
                 return;

app/Models/Application.php

@@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
+use RuntimeException;
+use Symfony\Component\Yaml\Yaml;
+use Visus\Cuid2\Cuid2;
 
 class Application extends BaseModel
 {
@@ -45,7 +48,17 @@ class Application extends BaseModel
             $application->environment_variables_preview()->delete();
         });
     }
-
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.application.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'application_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function settings()
     {
         return $this->hasOne(ApplicationSetting::class);
@@ -123,6 +136,36 @@ class Application extends BaseModel
             }
         );
     }
+    public function dockerComposeLocation(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (is_null($value) || $value === '') {
+                    return '/docker-compose.yaml';
+                } else {
+                    if ($value !== '/') {
+                        return Str::start(Str::replaceEnd('/', '', $value), '/');
+                    }
+                    return Str::start($value, '/');
+                }
+            }
+        );
+    }
+    public function dockerComposePrLocation(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (is_null($value) || $value === '') {
+                    return '/docker-compose.yaml';
+                } else {
+                    if ($value !== '/') {
+                        return Str::start(Str::replaceEnd('/', '', $value), '/');
+                    }
+                    return Str::start($value, '/');
+                }
+            }
+        );
+    }
     public function baseDirectory(): Attribute
     {
         return Attribute::make(
@@ -157,7 +200,16 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
-
+    public function serviceType()
+    {
+        $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {
+            return str($this->image)->before(':')->value() === $service;
+        })->first());
+        if ($found->isNotEmpty()) {
+            return $found;
+        }
+        return null;
+    }
     public function environment_variables(): HasMany
     {
         return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->orderBy('key', 'asc');
@@ -224,7 +276,6 @@ class Application extends BaseModel
     {
         return $this->morphTo();
     }
-
     public function isDeploymentInprogress()
     {
         $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'in_progress')->count();
@@ -342,4 +393,289 @@ class Application extends BaseModel
         }
         return false;
     }
+    public function healthCheckUrl()
+    {
+        if ($this->dockerfile || $this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
+            return null;
+        }
+        if (!$this->health_check_port) {
+            $health_check_port = $this->ports_exposes_array[0];
+        } else {
+            $health_check_port = $this->health_check_port;
+        }
+        if ($this->health_check_path) {
+            $full_healthcheck_url = "{$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}{$this->health_check_path}";
+        } else {
+            $full_healthcheck_url = "{$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}/";
+        }
+        return $full_healthcheck_url;
+    }
+    function customRepository()
+    {
+        preg_match('/(?<=:)\d+(?=\/)/', $this->git_repository, $matches);
+        $port = 22;
+        if (count($matches) === 1) {
+            $port = $matches[0];
+            $gitHost = str($this->git_repository)->before(':');
+            $gitRepo = str($this->git_repository)->after('/');
+            $repository = "$gitHost:$gitRepo";
+        } else {
+            $repository = $this->git_repository;
+        }
+        return [
+            'repository' => $repository,
+            'port' => $port
+        ];
+    }
+    function generateBaseDir(string $uuid)
+    {
+        return "/artifacts/{$uuid}";
+    }
+    function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
+    {
+        $baseDir = $this->generateBaseDir($deployment_uuid);
+        if ($this->git_commit_sha !== 'HEAD') {
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git -c advice.detachedHead=false checkout {$this->git_commit_sha} >/dev/null 2>&1";
+        }
+        if ($this->settings->is_git_submodules_enabled) {
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git submodule update --init --recursive";
+        }
+        if ($this->settings->is_git_lfs_enabled) {
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git lfs pull";
+        }
+        return $git_clone_command;
+    }
+    function generateGitImportCommands(string $deployment_uuid, int $pull_request_id = 0, ?string $git_type = null, bool $exec_in_docker = true, bool $only_checkout = false, ?string $custom_base_dir = null)
+    {
+        $branch = $this->git_branch;
+        ['repository' => $customRepository, 'port' => $customPort] = $this->customRepository();
+        $baseDir = $custom_base_dir ?? $this->generateBaseDir($deployment_uuid);
+        $commands = collect([]);
+        $git_clone_command = "git clone -b {$this->git_branch}";
+        if ($only_checkout) {
+            $git_clone_command = "git clone --no-checkout -b {$this->git_branch}";
+        }
+        if ($pull_request_id !== 0) {
+            $pr_branch_name = "pr-{$pull_request_id}-coolify";
+        }
+
+        if ($this->deploymentType() === 'source') {
+            $source_html_url = data_get($this, 'source.html_url');
+            $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL));
+            $source_html_url_host = $url['host'];
+            $source_html_url_scheme = $url['scheme'];
+
+            if ($this->source->getMorphClass() == 'App\Models\GithubApp') {
+                if ($this->source->is_public) {
+                    $fullRepoUrl = "{$this->source->html_url}/{$customRepository}";
+                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$customRepository} {$baseDir}";
+                    if (!$only_checkout) {
+                        $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command);
+                    }
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
+                    } else {
+                        $commands->push($git_clone_command);
+                    }
+                } else {
+                    $github_access_token = generate_github_installation_token($this->source);
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git {$baseDir}"));
+                        $fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git";
+                    } else {
+                        $commands->push("{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository} {$baseDir}");
+                        $fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}";
+                    }
+                }
+                if ($pull_request_id !== 0) {
+                    $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "cd {$baseDir} && git fetch origin {$branch} && git checkout $pr_branch_name"));
+                    } else {
+                        $commands->push("cd {$baseDir} && git fetch origin {$branch} && git checkout $pr_branch_name");
+                    }
+                }
+                return [
+                    'commands' => $commands->implode(' && '),
+                    'branch' => $branch,
+                    'fullRepoUrl' => $fullRepoUrl
+                ];
+            }
+        }
+        if ($this->deploymentType() === 'deploy_key') {
+            $fullRepoUrl = $customRepository;
+            $private_key = data_get($this, 'private_key.private_key');
+            if (is_null($private_key)) {
+                throw new RuntimeException('Private key not found. Please add a private key to the application and try again.');
+            }
+            $private_key = base64_encode($private_key);
+            $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$customRepository} {$baseDir}";
+            if (!$only_checkout) {
+                $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
+            }
+            if ($exec_in_docker) {
+                $commands = collect([
+                    executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),
+                    executeInDocker($deployment_uuid, "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa"),
+                    executeInDocker($deployment_uuid, "chmod 600 /root/.ssh/id_rsa"),
+                ]);
+            } else {
+                $commands = collect([
+                    "mkdir -p /root/.ssh",
+                    "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa",
+                    "chmod 600 /root/.ssh/id_rsa",
+                ]);
+            }
+            if ($pull_request_id !== 0) {
+                if ($git_type === 'gitlab') {
+                    $branch = "merge-requests/{$pull_request_id}/head:$pr_branch_name";
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                }
+                if ($git_type === 'github') {
+                    $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                }
+            }
+
+            if ($exec_in_docker) {
+                $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
+            } else {
+                $commands->push($git_clone_command);
+            }
+            return [
+                'commands' => $commands->implode(' && '),
+                'branch' => $branch,
+                'fullRepoUrl' => $fullRepoUrl
+            ];
+        }
+        if ($this->deploymentType() === 'other') {
+            $fullRepoUrl = $customRepository;
+            $git_clone_command = "{$git_clone_command} {$customRepository} {$baseDir}";
+            $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command);
+            if ($exec_in_docker) {
+                $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
+            } else {
+                $commands->push($git_clone_command);
+            }
+            return [
+                'commands' => $commands->implode(' && '),
+                'branch' => $branch,
+                'fullRepoUrl' => $fullRepoUrl
+            ];
+        }
+    }
+    public function prepareHelperImage(string $deploymentUuid)
+    {
+        $basedir = $this->generateBaseDir($deploymentUuid);
+        $helperImage = config('coolify.helper_image');
+        $server = data_get($this, 'destination.server');
+        $network = data_get($this, 'destination.network');
+
+        $serverUserHomeDir = instant_remote_process(["echo \$HOME"], $server);
+        $dockerConfigFileExists = instant_remote_process(["test -f {$serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $server);
+
+        $commands = collect([]);
+        if ($dockerConfigFileExists === 'OK') {
+            $commands->push([
+                "command" => "docker run -d --network $network --name $deploymentUuid --rm -v {$serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock $helperImage",
+                "hidden" => true,
+            ]);
+        } else {
+            $commands->push([
+                "command" => "docker run -d --network {$network} --name {$deploymentUuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}",
+                "hidden" => true,
+            ]);
+        }
+        $commands->push([
+            "command" => executeInDocker($deploymentUuid, "mkdir -p {$basedir}"),
+            "hidden" => true,
+        ]);
+        return $commands;
+    }
+    function parseCompose(int $pull_request_id = 0)
+    {
+        if ($this->docker_compose_raw) {
+            $mainCompose = parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id);
+            if ($this->getMorphClass() === 'App\Models\Application' && $this->docker_compose_pr_raw) {
+                parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id, is_pr: true);
+            }
+            return $mainCompose;
+        } else {
+            return collect([]);
+        }
+    }
+    function loadComposeFile($isInit = false)
+    {
+        $initialDockerComposeLocation = $this->docker_compose_location;
+        // $initialDockerComposePrLocation = $this->docker_compose_pr_location;
+        if ($this->build_pack === 'dockercompose') {
+            if ($isInit && $this->docker_compose_raw) {
+                return;
+            }
+            $uuid = new Cuid2();
+            ['commands' => $cloneCommand] = $this->generateGitImportCommands(deployment_uuid: $uuid, only_checkout: true, exec_in_docker: false, custom_base_dir: '.');
+            $workdir = rtrim($this->base_directory, '/');
+            $composeFile = $this->docker_compose_location;
+            // $prComposeFile = $this->docker_compose_pr_location;
+            $fileList = collect([".$workdir$composeFile"]);
+            // if ($composeFile !== $prComposeFile) {
+            //     $fileList->push(".$prComposeFile");
+            // }
+            $commands = collect([
+                "mkdir -p /tmp/{$uuid} && cd /tmp/{$uuid}",
+                $cloneCommand,
+                "git sparse-checkout init --cone",
+                "git sparse-checkout set {$fileList->implode(' ')}",
+                "git read-tree -mu HEAD",
+                "cat .$workdir$composeFile",
+            ]);
+            $composeFileContent = instant_remote_process($commands, $this->destination->server, false);
+            if (!$composeFileContent) {
+                $this->docker_compose_location = $initialDockerComposeLocation;
+                $this->save();
+                throw new \Exception("Could not load base compose file from $workdir$composeFile");
+            } else {
+                $this->docker_compose_raw = $composeFileContent;
+                $this->save();
+            }
+            // if ($composeFile === $prComposeFile) {
+            //     $this->docker_compose_pr_raw = $composeFileContent;
+            //     $this->save();
+            // } else {
+            //     $commands = collect([
+            //         "cd /tmp/{$uuid}",
+            //         "cat .$workdir$prComposeFile",
+            //     ]);
+            //     $composePrFileContent = instant_remote_process($commands, $this->destination->server, false);
+            //     if (!$composePrFileContent) {
+            //         $this->docker_compose_pr_location = $initialDockerComposePrLocation;
+            //         $this->save();
+            //         throw new \Exception("Could not load compose file from $workdir$prComposeFile");
+            //     } else {
+            //         $this->docker_compose_pr_raw = $composePrFileContent;
+            //         $this->save();
+            //     }
+            // }
+
+            $commands = collect([
+                "rm -rf /tmp/{$uuid}",
+            ]);
+            instant_remote_process($commands, $this->destination->server, false);
+            return [
+                'parsedServices' => $this->parseCompose(),
+                'initialDockerComposeLocation' => $this->docker_compose_location,
+                'initialDockerComposePrLocation' => $this->docker_compose_pr_location,
+            ];
+        }
+    }
 }

app/Models/ApplicationDeploymentQueue.php

@@ -3,8 +3,48 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 
 class ApplicationDeploymentQueue extends Model
 {
     protected $guarded = [];
+
+    public function getOutput($name)
+    {
+        if (!$this->logs) {
+            return null;
+        }
+        return collect(json_decode($this->logs))->where('name', $name)->first()?->output ?? null;
+    }
+
+    public function addLogEntry(string $message, string $type = 'stdout', bool $hidden = false)
+    {
+        if ($type === 'error') {
+            $type = 'stderr';
+        }
+        $message = str($message)->trim();
+        if ($message->startsWith('╔')) {
+            $message = "\n" . $message;
+        }
+        $newLogEntry = [
+            'command' => null,
+            'output' => remove_iip($message),
+            'type' => $type,
+            'timestamp' => Carbon::now('UTC'),
+            'hidden' => $hidden,
+            'batch' => 1,
+        ];
+        if ($this->logs) {
+            $previousLogs = json_decode($this->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+            $newLogEntry['order'] = count($previousLogs) + 1;
+            $previousLogs[] = $newLogEntry;
+            $this->update([
+                'logs' => json_encode($previousLogs, flags: JSON_THROW_ON_ERROR),
+            ]);
+        } else {
+            $this->update([
+                'logs' => json_encode([$newLogEntry], flags: JSON_THROW_ON_ERROR),
+            ]);
+        }
+    }
 }

app/Models/ApplicationPreview.php

@@ -5,7 +5,26 @@ namespace App\Models;
 class ApplicationPreview extends BaseModel
 {
     protected $guarded = [];
-
+    protected static function booted()
+    {
+        static::deleting(function ($preview) {
+            if ($preview->application->build_pack === 'dockercompose') {
+                $server = $preview->application->destination->server;
+                $composeFile = $preview->application->parseCompose(pull_request_id: $preview->pull_request_id);
+                $volumes = data_get($composeFile, 'volumes');
+                $networks = data_get($composeFile, 'networks');
+                $networkKeys = collect($networks)->keys();
+                $volumeKeys = collect($volumes)->keys();
+                $volumeKeys->each(function ($key) use ($server) {
+                    instant_remote_process(["docker volume rm -f $key"], $server, false);
+                });
+                $networkKeys->each(function ($key) use ($server) {
+                    instant_remote_process(["docker network disconnect $key coolify-proxy"], $server, false);
+                    instant_remote_process(["docker network rm $key"], $server, false);
+                });
+            }
+        });
+    }
     static function findPreviewByApplicationAndPullId(int $application_id, int $pull_request_id)
     {
         return self::where('application_id', $application_id)->where('pull_request_id', $pull_request_id)->firstOrFail();

app/Models/InstanceSettings.php

@@ -3,8 +3,10 @@
 namespace App\Models;
 
 use App\Notifications\Channels\SendsEmail;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Url\Url;
 
 class InstanceSettings extends Model implements SendsEmail
 {
@@ -16,6 +18,18 @@ class InstanceSettings extends Model implements SendsEmail
         'smtp_password' => 'encrypted',
     ];
 
+    public function fqdn(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if ($value) {
+                    $url = Url::fromString($value);
+                    $host = $url->getHost();
+                    return $url->getScheme() . '://' . $host;
+                }
+            }
+        );
+    }
     public static function get()
     {
         return InstanceSettings::findOrFail(0);

app/Models/Server.php

@@ -2,22 +2,26 @@
 
 namespace App\Models;
 
-use App\Actions\Server\InstallLogDrain;
-use App\Actions\Server\InstallNewRelic;
+use App\Enums\ApplicationDeploymentStatus;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Notifications\Server\Revived;
 use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Sleep;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
+use Illuminate\Support\Stringable;
 
 class Server extends BaseModel
 {
     use SchemalessAttributesTrait;
+    public static $batch_counter = 0;
 
     protected static function booted()
     {
@@ -31,25 +35,10 @@ class Server extends BaseModel
             }
             $server->forceFill($payload);
         });
-
         static::created(function ($server) {
             ServerSetting::create([
                 'server_id' => $server->id,
             ]);
-            if ($server->id === 0) {
-                StandaloneDocker::create([
-                    'id' => 0,
-                    'name' => 'coolify',
-                    'network' => 'coolify',
-                    'server_id' => $server->id,
-                ]);
-            } else {
-                StandaloneDocker::create([
-                    'name' => 'coolify',
-                    'network' => 'coolify',
-                    'server_id' => $server->id,
-                ]);
-            }
         });
         static::deleting(function ($server) {
             $server->destinations()->each(function ($destination) {
@@ -78,7 +67,7 @@ class Server extends BaseModel
     {
         $teamId = currentTeam()->id;
         $selectArray = collect($select)->concat(['id']);
-        return Server::whereTeamId($teamId)->with('settings')->select($selectArray->all())->orderBy('name');
+        return Server::whereTeamId($teamId)->with('settings','swarmDockers','standaloneDockers')->select($selectArray->all())->orderBy('name');
     }
 
     static public function isUsable()
@@ -97,7 +86,39 @@ class Server extends BaseModel
     {
         return $this->hasOne(ServerSetting::class);
     }
-
+    public function addInitialNetwork() {
+        if ($this->id === 0) {
+            if ($this->isSwarm()) {
+                SwarmDocker::create([
+                    'id' => 0,
+                    'name' => 'coolify',
+                    'network' => 'coolify-overlay',
+                    'server_id' => $this->id,
+                ]);
+            } else {
+                StandaloneDocker::create([
+                    'id' => 0,
+                    'name' => 'coolify',
+                    'network' => 'coolify',
+                    'server_id' => $this->id,
+                ]);
+            }
+        } else {
+            if ($this->isSwarm()) {
+                SwarmDocker::create([
+                    'name' => 'coolify-overlay',
+                    'network' => 'coolify-overlay',
+                    'server_id' => $this->id,
+                ]);
+            } else {
+                StandaloneDocker::create([
+                    'name' => 'coolify-overlay',
+                    'network' => 'coolify',
+                    'server_id' => $this->id,
+                ]);
+            }
+        }
+    }
     public function proxyType()
     {
         $proxyType = $this->proxy->get('type');
@@ -189,6 +210,13 @@ class Server extends BaseModel
     {
         return instant_remote_process(["df /| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this, false);
     }
+    public function definedResources()
+    {
+        $applications = $this->applications();
+        $databases = $this->databases();
+        $services = $this->services();
+        return $applications->concat($databases)->concat($services->get());
+    }
     public function hasDefinedResources()
     {
         $applications = $this->applications()->count() > 0;
@@ -217,6 +245,23 @@ class Server extends BaseModel
             return $standaloneDocker->applications;
         })->flatten();
     }
+    public function dockerComposeBasedApplications()
+    {
+        return $this->applications()->filter(function ($application) {
+            return data_get($application, 'build_pack') === 'dockercompose';
+        });
+    }
+    public function dockerComposeBasedPreviewDeployments()
+    {
+        return $this->previews()->filter(function ($preview) {
+            $applicationId = data_get($preview, 'application_id');
+            $application = Application::find($applicationId);
+            if (!$application) {
+                return false;
+            }
+            return data_get($application, 'build_pack') === 'dockercompose';
+        });
+    }
     public function services()
     {
         return $this->hasMany(Service::class);
@@ -302,9 +347,9 @@ class Server extends BaseModel
     }
     public function isLogDrainEnabled()
     {
-        return $this->settings->is_logdrain_newrelic_enabled || $this->settings->is_logdrain_highlight_enabled || $this->settings->is_logdrain_axiom_enabled;
+        return $this->settings->is_logdrain_newrelic_enabled || $this->settings->is_logdrain_highlight_enabled || $this->settings->is_logdrain_axiom_enabled || $this->settings->is_logdrain_custom_enabled;
     }
-    public function validateOS()
+    public function validateOS(): bool | Stringable
     {
         $os_release = instant_remote_process(['cat /etc/os-release'], $this);
         $datas = collect(explode("\n", $os_release));
@@ -314,23 +359,31 @@ class Server extends BaseModel
             $collectedData->put($item->before('=')->value(), $item->after('=')->lower()->replace('"', '')->value());
         }
         $ID = data_get($collectedData, 'ID');
-        $ID_LIKE = data_get($collectedData, 'ID_LIKE');
-        $VERSION_ID = data_get($collectedData, 'VERSION_ID');
-        // ray($ID, $ID_LIKE, $VERSION_ID);
-        if (collect(SUPPORTED_OS)->contains($ID_LIKE)) {
+        // $ID_LIKE = data_get($collectedData, 'ID_LIKE');
+        // $VERSION_ID = data_get($collectedData, 'VERSION_ID');
+        $supported = collect(SUPPORTED_OS)->filter(function ($supportedOs) use ($ID) {
+            if (str($supportedOs)->contains($ID)) {
+                return str($ID);
+            }
+        });
+        if ($supported->count() === 1) {
             ray('supported');
-            return str($ID_LIKE)->explode(' ')->first();
+            return str($supported->first());
         } else {
             ray('not supported');
             return false;
         }
     }
+    public function isSwarm()
+    {
+        return data_get($this, 'settings.is_swarm_manager') || data_get($this, 'settings.is_swarm_worker');
+    }
     public function validateConnection()
     {
+        $server = Server::find($this->id);
         if ($this->skipServer()) {
             return false;
         }
-
         $uptime = instant_remote_process(['uptime'], $this, false);
         if (!$uptime) {
             $this->settings()->update([
@@ -341,14 +394,14 @@ class Server extends BaseModel
             $this->settings()->update([
                 'is_reachable' => true,
             ]);
-            $this->update([
+            $server->update([
                 'unreachable_count' => 0,
             ]);
         }
 
         if (data_get($this, 'unreachable_notification_sent') === true) {
             $this->team->notify(new Revived($this));
-            $this->update(['unreachable_notification_sent' => false]);
+            $server->update(['unreachable_notification_sent' => false]);
         }
 
         return true;
@@ -366,7 +419,20 @@ class Server extends BaseModel
         }
         $this->settings->is_usable = true;
         $this->settings->save();
-        $this->validateCoolifyNetwork();
+        $this->validateCoolifyNetwork(isSwarm: false);
+        return true;
+    }
+    public function validateDockerSwarm()
+    {
+        $swarmStatus = instant_remote_process(["docker info|grep -i swarm"], $this, false);
+        $swarmStatus = str($swarmStatus)->trim()->after(':')->trim();
+        if ($swarmStatus === 'inactive') {
+            throw new \Exception('Docker Swarm is not initiated. Please join the server to a swarm before continuing.');
+            return false;
+        }
+        $this->settings->is_usable = true;
+        $this->settings->save();
+        $this->validateCoolifyNetwork(isSwarm: true);
         return true;
     }
     public function validateDockerEngineVersion()
@@ -383,8 +449,91 @@ class Server extends BaseModel
         $this->settings->save();
         return true;
     }
-    public function validateCoolifyNetwork()
+    public function validateCoolifyNetwork($isSwarm = false)
     {
-        return instant_remote_process(["docker network create coolify --attachable >/dev/null 2>&1 || true"], $this, false);
+        if ($isSwarm) {
+            return instant_remote_process(["docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true"], $this, false);
+        } else {
+            return instant_remote_process(["docker network create coolify --attachable >/dev/null 2>&1 || true"], $this, false);
+        }
+    }
+    public function executeRemoteCommand(Collection $commands, ?ApplicationDeploymentQueue $loggingModel = null)
+    {
+        static::$batch_counter++;
+        foreach ($commands as $command) {
+            $realCommand = data_get($command, 'command');
+            if (is_null($realCommand)) {
+                throw new \RuntimeException('Command is not set');
+            }
+            $hidden = data_get($command, 'hidden', false);
+            $ignoreErrors = data_get($command, 'ignoreErrors', false);
+            $customOutputType = data_get($command, 'customOutputType');
+            $name = data_get($command, 'name');
+            $remoteCommand = generateSshCommand($this, $realCommand);
+
+            $process = Process::timeout(3600)->idleTimeout(3600)->start($remoteCommand, function (string $type, string $output) use ($realCommand, $hidden, $customOutputType, $loggingModel, $name) {
+                $output = str($output)->trim();
+                if ($output->startsWith('╔')) {
+                    $output = "\n" . $output;
+                }
+                $newLogEntry = [
+                    'command' => remove_iip($realCommand),
+                    'output' => remove_iip($output),
+                    'type' => $customOutputType ?? $type === 'err' ? 'stderr' : 'stdout',
+                    'timestamp' => Carbon::now('UTC'),
+                    'hidden' => $hidden,
+                    'batch' => static::$batch_counter,
+                ];
+                if ($loggingModel) {
+                    if (!$loggingModel->logs) {
+                        $newLogEntry['order'] = 1;
+                    } else {
+                        $previousLogs = json_decode($loggingModel->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+                        $newLogEntry['order'] = count($previousLogs) + 1;
+                    }
+                    if ($name) {
+                        $newLogEntry['name'] = $name;
+                    }
+
+                    $previousLogs[] = $newLogEntry;
+                    $loggingModel->logs = json_encode($previousLogs, flags: JSON_THROW_ON_ERROR);
+                    $loggingModel->save();
+                }
+            });
+            if ($loggingModel) {
+                $loggingModel->update([
+                    'current_process_id' => $process->id(),
+                ]);
+            }
+            $processResult = $process->wait();
+            if ($processResult->exitCode() !== 0) {
+                if (!$ignoreErrors) {
+                    if ($loggingModel) {
+                        $status = ApplicationDeploymentStatus::FAILED->value;
+                        $loggingModel->status = $status;
+                        $loggingModel->save();
+                    }
+                    throw new \RuntimeException($processResult->errorOutput());
+                }
+            }
+        }
+    }
+    public function stopApplicationRelatedRunningContainers(string $applicationId, string $containerName)
+    {
+        $containers = getCurrentApplicationContainerStatus($this, $applicationId, 0);
+        $containers = $containers->filter(function ($container) use ($containerName) {
+            return data_get($container, 'Names') !== $containerName;
+        });
+        $containers->each(function ($container) {
+            $removableContainer = data_get($container, 'Names');
+            $this->server->executeRemoteCommand(
+                commands: collect([
+                    'command' => "docker rm -f $removableContainer >/dev/null 2>&1",
+                    'hidden' => true,
+                    'ignoreErrors' => true
+                ]),
+                loggingModel: $this->deploymentQueueEntry
+            );
+        });
     }
 }

app/Models/Service.php

@@ -52,7 +52,7 @@ class Service extends BaseModel
         foreach ($applications as $application) {
             $image = str($application->image)->before(':')->value();
             switch ($image) {
-                case str($image)->contains('minio'):
+                case str($image)?->contains('minio'):
                     $data = collect([]);
                     $console_url = $this->environment_variables()->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
                     $s3_api_url = $this->environment_variables()->where('key', 'MINIO_SERVER_URL')->first();
@@ -105,7 +105,7 @@ class Service extends BaseModel
 
                     $fields->put('MinIO', $data->toArray());
                     break;
-                case str($image)->contains('weblate'):
+                case str($image)?->contains('weblate'):
                     $data = collect([]);
                     $admin_email = $this->environment_variables()->where('key', 'WEBLATE_ADMIN_EMAIL')->first();
                     $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_WEBLATE')->first();
@@ -130,8 +130,84 @@ class Service extends BaseModel
                         ]);
                     }
                     $fields->put('Weblate', $data);
+                    break;
+                case str($image)?->contains('meilisearch'):
+                    $data = collect([]);
+                    $SERVICE_PASSWORD_MEILISEARCH = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_MEILISEARCH')->first();
+                    if ($SERVICE_PASSWORD_MEILISEARCH) {
+                        $data = $data->merge([
+                            'API Key' => [
+                                'key' => data_get($SERVICE_PASSWORD_MEILISEARCH, 'key'),
+                                'value' => data_get($SERVICE_PASSWORD_MEILISEARCH, 'value'),
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    $fields->put('Meilisearch', $data);
+                    break;
+                case str($image)?->contains('ghost'):
+                    $data = collect([]);
+                    $MAIL_OPTIONS_AUTH_PASS = $this->environment_variables()->where('key', 'MAIL_OPTIONS_AUTH_PASS')->first();
+                    $MAIL_OPTIONS_AUTH_USER = $this->environment_variables()->where('key', 'MAIL_OPTIONS_AUTH_USER')->first();
+                    $MAIL_OPTIONS_SECURE = $this->environment_variables()->where('key', 'MAIL_OPTIONS_SECURE')->first();
+                    $MAIL_OPTIONS_PORT = $this->environment_variables()->where('key', 'MAIL_OPTIONS_PORT')->first();
+                    $MAIL_OPTIONS_SERVICE = $this->environment_variables()->where('key', 'MAIL_OPTIONS_SERVICE')->first();
+                    $MAIL_OPTIONS_HOST = $this->environment_variables()->where('key', 'MAIL_OPTIONS_HOST')->first();
+                    if ($MAIL_OPTIONS_AUTH_PASS) {
+                        $data = $data->merge([
+                            'Mail Password' => [
+                                'key' => data_get($MAIL_OPTIONS_AUTH_PASS, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_AUTH_PASS, 'value'),
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($MAIL_OPTIONS_AUTH_USER) {
+                        $data = $data->merge([
+                            'Mail User' => [
+                                'key' => data_get($MAIL_OPTIONS_AUTH_USER, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_AUTH_USER, 'value'),
+                            ],
+                        ]);
+                    }
+                    if ($MAIL_OPTIONS_SECURE) {
+                        $data = $data->merge([
+                            'Mail Secure' => [
+                                'key' => data_get($MAIL_OPTIONS_SECURE, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_SECURE, 'value'),
+                            ],
+                        ]);
+                    }
+                    if ($MAIL_OPTIONS_PORT) {
+                        $data = $data->merge([
+                            'Mail Port' => [
+                                'key' => data_get($MAIL_OPTIONS_PORT, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_PORT, 'value'),
+                            ],
+                        ]);
+                    }
+                    if ($MAIL_OPTIONS_SERVICE) {
+                        $data = $data->merge([
+                            'Mail Service' => [
+                                'key' => data_get($MAIL_OPTIONS_SERVICE, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_SERVICE, 'value'),
+                            ],
+                        ]);
+                    }
+                    if ($MAIL_OPTIONS_HOST) {
+                        $data = $data->merge([
+                            'Mail Host' => [
+                                'key' => data_get($MAIL_OPTIONS_HOST, 'key'),
+                                'value' => data_get($MAIL_OPTIONS_HOST, 'value'),
+                            ],
+                        ]);
+                    }
+
+                    $fields->put('Ghost', $data);
+                    break;
             }
         }
+        ray($fields);
         $databases = $this->databases()->get();
 
         foreach ($databases as $database) {
@@ -300,6 +376,17 @@ class Service extends BaseModel
             }
         }
     }
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.service.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'service_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function documentation()
     {
         $services = getServiceTemplates();
@@ -371,521 +458,12 @@ class Service extends BaseModel
 
     public function parse(bool $isNew = false): Collection
     {
-        // ray()->clearAll();
-        if ($this->docker_compose_raw) {
-            try {
-                $yaml = Yaml::parse($this->docker_compose_raw);
-            } catch (\Exception $e) {
-                throw new \Exception($e->getMessage());
-            }
-
-            $topLevelVolumes = collect(data_get($yaml, 'volumes', []));
-            $topLevelNetworks = collect(data_get($yaml, 'networks', []));
-            $dockerComposeVersion = data_get($yaml, 'version') ?? '3.8';
-            $services = data_get($yaml, 'services');
-
-            $generatedServiceFQDNS = collect([]);
-            if (is_null($this->destination)) {
-                $destination = $this->server->destinations()->first();
-                if ($destination) {
-                    $this->destination()->associate($destination);
-                    $this->save();
-                }
-            }
-            $definedNetwork = collect([$this->uuid]);
-
-            $services = collect($services)->map(function ($service, $serviceName) use ($topLevelVolumes, $topLevelNetworks, $definedNetwork, $isNew, $generatedServiceFQDNS) {
-                $serviceVolumes = collect(data_get($service, 'volumes', []));
-                $servicePorts = collect(data_get($service, 'ports', []));
-                $serviceNetworks = collect(data_get($service, 'networks', []));
-                $serviceVariables = collect(data_get($service, 'environment', []));
-                $serviceLabels = collect(data_get($service, 'labels', []));
-                if ($serviceLabels->count() > 0) {
-                    $removedLabels = collect([]);
-                    $serviceLabels = $serviceLabels->filter(function ($serviceLabel, $serviceLabelName) use ($removedLabels) {
-                        if (!str($serviceLabel)->contains('=')) {
-                            $removedLabels->put($serviceLabelName, $serviceLabel);
-                            return false;
-                        }
-                        return $serviceLabel;
-                    });
-                    foreach($removedLabels as $removedLabelName =>$removedLabel) {
-                        $serviceLabels->push("$removedLabelName=$removedLabel");
-                    }
-                }
-
-                $containerName = "$serviceName-{$this->uuid}";
-
-                // Decide if the service is a database
-                $isDatabase = false;
-                $image = data_get_str($service, 'image');
-                if ($image->contains(':')) {
-                    $image = Str::of($image);
-                } else {
-                    $image = Str::of($image)->append(':latest');
-                }
-                $imageName = $image->before(':');
-
-                if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
-                    $isDatabase = true;
-                }
-                data_set($service, 'is_database', $isDatabase);
-
-                // Create new serviceApplication or serviceDatabase
-                if ($isDatabase) {
-                    if ($isNew) {
-                        $savedService = ServiceDatabase::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $this->id
-                        ]);
-                    } else {
-                        $savedService = ServiceDatabase::where([
-                            'name' => $serviceName,
-                            'service_id' => $this->id
-                        ])->first();
-                    }
-                } else {
-                    if ($isNew) {
-                        $savedService = ServiceApplication::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $this->id
-                        ]);
-                    } else {
-                        $savedService = ServiceApplication::where([
-                            'name' => $serviceName,
-                            'service_id' => $this->id
-                        ])->first();
-                    }
-                }
-                if (is_null($savedService)) {
-                    if ($isDatabase) {
-                        $savedService = ServiceDatabase::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $this->id
-                        ]);
-                    } else {
-                        $savedService = ServiceApplication::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $this->id
-                        ]);
-                    }
-                }
-
-                // Check if image changed
-                if ($savedService->image !== $image) {
-                    $savedService->image = $image;
-                    $savedService->save();
-                }
-
-                // Collect/create/update networks
-                if ($serviceNetworks->count() > 0) {
-                    foreach ($serviceNetworks as $networkName => $networkDetails) {
-                        $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
-                            return $value == $networkName || $key == $networkName;
-                        });
-                        if (!$networkExists) {
-                            $topLevelNetworks->put($networkDetails, null);
-                        }
-                    }
-                }
-
-                // Collect/create/update ports
-                $collectedPorts = collect([]);
-                if ($servicePorts->count() > 0) {
-                    foreach ($servicePorts as $sport) {
-                        if (is_string($sport) || is_numeric($sport)) {
-                            $collectedPorts->push($sport);
-                        }
-                        if (is_array($sport)) {
-                            $target = data_get($sport, 'target');
-                            $published = data_get($sport, 'published');
-                            $protocol = data_get($sport, 'protocol');
-                            $collectedPorts->push("$target:$published/$protocol");
-                        }
-                    }
-                }
-                $savedService->ports = $collectedPorts->implode(',');
-                $savedService->save();
-
-                // Add Coolify specific networks
-                $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
-                    return $value == $definedNetwork;
-                });
-                if (!$definedNetworkExists) {
-                    foreach ($definedNetwork as $network) {
-                        $topLevelNetworks->put($network,  [
-                            'name' => $network,
-                            'external' => true
-                        ]);
-                    }
-                }
-                $networks = collect();
-                foreach ($serviceNetworks as $key => $serviceNetwork) {
-                    if (gettype($serviceNetwork) === 'string') {
-                        // networks:
-                        //  - appwrite
-                        $networks->put($serviceNetwork, null);
-                    } else if (gettype($serviceNetwork) === 'array') {
-                        // networks:
-                        //   default:
-                        //     ipv4_address: 192.168.203.254
-                        // $networks->put($serviceNetwork, null);
-                        ray($key);
-                        $networks->put($key, $serviceNetwork);
-                    }
-                }
-                foreach ($definedNetwork as $key => $network) {
-                    $networks->put($network, null);
-                }
-                data_set($service, 'networks', $networks->toArray());
-
-                // Collect/create/update volumes
-                if ($serviceVolumes->count() > 0) {
-                    $serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes) {
-                        $type = null;
-                        $source = null;
-                        $target = null;
-                        $content = null;
-                        $isDirectory = false;
-                        if (is_string($volume)) {
-                            $source = Str::of($volume)->before(':');
-                            $target = Str::of($volume)->after(':')->beforeLast(':');
-                            if ($source->startsWith('./') || $source->startsWith('/') || $source->startsWith('~')) {
-                                $type = Str::of('bind');
-                            } else {
-                                $type = Str::of('volume');
-                            }
-                        } else if (is_array($volume)) {
-                            $type = data_get_str($volume, 'type');
-                            $source = data_get_str($volume, 'source');
-                            $target = data_get_str($volume, 'target');
-                            $content = data_get($volume, 'content');
-                            $isDirectory = (bool) data_get($volume, 'isDirectory', false);
-                            $foundConfig = $savedService->fileStorages()->whereMountPath($target)->first();
-                            if ($foundConfig) {
-                                $contentNotNull = data_get($foundConfig, 'content');
-                                if ($contentNotNull) {
-                                    $content = $contentNotNull;
-                                }
-                                $isDirectory = (bool) data_get($foundConfig, 'is_directory');
-                            }
-                        }
-                        if ($type->value() === 'bind') {
-                            if ($source->value() === "/var/run/docker.sock") {
-                                return $volume;
-                            }
-                            if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
-                                return $volume;
-                            }
-                            LocalFileVolume::updateOrCreate(
-                                [
-                                    'mount_path' => $target,
-                                    'resource_id' => $savedService->id,
-                                    'resource_type' => get_class($savedService)
-                                ],
-                                [
-                                    'fs_path' => $source,
-                                    'mount_path' => $target,
-                                    'content' => $content,
-                                    'is_directory' => $isDirectory,
-                                    'resource_id' => $savedService->id,
-                                    'resource_type' => get_class($savedService)
-                                ]
-                            );
-                        } else if ($type->value() === 'volume') {
-                            $slugWithoutUuid = Str::slug($source, '-');
-                            $name = "{$savedService->service->uuid}_{$slugWithoutUuid}";
-                            if (is_string($volume)) {
-                                $source = Str::of($volume)->before(':');
-                                $target = Str::of($volume)->after(':')->beforeLast(':');
-                                $source = $name;
-                                $volume = "$source:$target";
-                            } else if (is_array($volume)) {
-                                data_set($volume, 'source', $name);
-                            }
-                            $topLevelVolumes->put($name, [
-                                'name' => $name,
-                            ]);
-                            LocalPersistentVolume::updateOrCreate(
-                                [
-                                    'mount_path' => $target,
-                                    'resource_id' => $savedService->id,
-                                    'resource_type' => get_class($savedService)
-                                ],
-                                [
-                                    'name' => $name,
-                                    'mount_path' => $target,
-                                    'resource_id' => $savedService->id,
-                                    'resource_type' => get_class($savedService)
-                                ]
-                            );
-                        }
-                        $savedService->getFilesFromServer(isInit: true);
-                        return $volume;
-                    });
-                    data_set($service, 'volumes', $serviceVolumes->toArray());
-                }
-
-                // Add env_file with at least .env to the service
-                // $envFile = collect(data_get($service, 'env_file', []));
-                // if ($envFile->count() > 0) {
-                //     if (!$envFile->contains('.env')) {
-                //         $envFile->push('.env');
-                //     }
-                // } else {
-                //     $envFile = collect(['.env']);
-                // }
-                // data_set($service, 'env_file', $envFile->toArray());
-
-
-                // Get variables from the service
-                foreach ($serviceVariables as $variableName => $variable) {
-                    if (is_numeric($variableName)) {
-                        $variable = Str::of($variable);
-                        if ($variable->contains('=')) {
-                            // - SESSION_SECRET=123
-                            // - SESSION_SECRET=
-                            $key = $variable->before('=');
-                            $value = $variable->after('=');
-                        } else {
-                            // - SESSION_SECRET
-                            $key = $variable;
-                            $value = null;
-                        }
-                    } else {
-                        // SESSION_SECRET: 123
-                        // SESSION_SECRET:
-                        $key = Str::of($variableName);
-                        $value = Str::of($variable);
-                    }
-                    // TODO: here is the problem
-                    if ($key->startsWith('SERVICE_FQDN')) {
-                        if ($isNew || $savedService->fqdn === null) {
-                            $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
-                            $fqdn = generateFqdn($this->server, "{$name->value()}-{$this->uuid}");
-                            if (substr_count($key->value(), '_') === 3) {
-                                // SERVICE_FQDN_UMAMI_1000
-                                $port = $key->afterLast('_');
-                            } else {
-                                // SERVICE_FQDN_UMAMI
-                                $port = null;
-                            }
-                            if ($port) {
-                                $fqdn = "$fqdn:$port";
-                            }
-                            if (substr_count($key->value(), '_') >= 2) {
-                                if (is_null($value)) {
-                                    $value = Str::of('/');
-                                }
-                                $path = $value->value();
-                                if ($generatedServiceFQDNS->count() > 0) {
-                                    $alreadyGenerated = $generatedServiceFQDNS->has($key->value());
-                                    if ($alreadyGenerated) {
-                                        $fqdn = $generatedServiceFQDNS->get($key->value());
-                                    } else {
-                                        $generatedServiceFQDNS->put($key->value(), $fqdn);
-                                    }
-                                } else {
-                                    $generatedServiceFQDNS->put($key->value(), $fqdn);
-                                }
-                                $fqdn = "$fqdn$path";
-                            }
-
-                            if (!$isDatabase) {
-                                if ($savedService->fqdn) {
-                                    $fqdn = $savedService->fqdn . ',' . $fqdn;
-                                } else {
-                                    $fqdn = $fqdn;
-                                }
-                                $savedService->fqdn = $fqdn;
-                                $savedService->save();
-                            }
-                        }
-                        // data_forget($service, "environment.$variableName");
-                        // $yaml = data_forget($yaml, "services.$serviceName.environment.$variableName");
-                        // if (count(data_get($yaml, 'services.' . $serviceName . '.environment')) === 0) {
-                        //     $yaml = data_forget($yaml, "services.$serviceName.environment");
-                        // }
-                        continue;
-                    }
-                    if ($value?->startsWith('$')) {
-                        $value = Str::of(replaceVariables($value));
-                        $key = $value;
-                        $foundEnv = EnvironmentVariable::where([
-                            'key' => $key,
-                            'service_id' => $this->id,
-                        ])->first();
-                        if ($value->startsWith('SERVICE_')) {
-                            // Count _ in $value
-                            $count = substr_count($value->value(), '_');
-                            if ($count === 2) {
-                                // SERVICE_FQDN_UMAMI
-                                $command = $value->after('SERVICE_')->beforeLast('_');
-                                $forService = $value->afterLast('_');
-                                $generatedValue = null;
-                                $port = null;
-                            }
-                            if ($count === 3) {
-                                // SERVICE_FQDN_UMAMI_1000
-                                $command = $value->after('SERVICE_')->before('_');
-                                $forService = $value->after('SERVICE_')->after('_')->before('_');
-                                $generatedValue = null;
-                                $port = $value->afterLast('_');
-                            }
-                            if ($command->value() === 'FQDN' || $command->value() === 'URL') {
-                                if (Str::lower($forService) === $serviceName) {
-                                    $fqdn = generateFqdn($this->server, $containerName);
-                                } else {
-                                    $fqdn = generateFqdn($this->server, Str::lower($forService) . '-' . $this->uuid);
-                                }
-                                if ($port) {
-                                    $fqdn = "$fqdn:$port";
-                                }
-                                if ($foundEnv) {
-                                    $fqdn = data_get($foundEnv, 'value');
-                                } else {
-                                    if ($command->value() === 'URL') {
-                                        $fqdn = Str::of($fqdn)->after('://')->value();
-                                    }
-                                    EnvironmentVariable::create([
-                                        'key' => $key,
-                                        'value' => $fqdn,
-                                        'is_build_time' => false,
-                                        'service_id' => $this->id,
-                                        'is_preview' => false,
-                                    ]);
-                                }
-                                if (!$isDatabase) {
-                                    if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
-                                        $savedService->fqdn = $fqdn;
-                                        $savedService->save();
-                                    }
-                                }
-                            } else {
-                                switch ($command) {
-                                    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;
-                                }
-
-                                if (!$foundEnv) {
-                                    EnvironmentVariable::create([
-                                        'key' => $key,
-                                        'value' => $generatedValue,
-                                        'is_build_time' => false,
-                                        'service_id' => $this->id,
-                                        'is_preview' => false,
-                                    ]);
-                                }
-                            }
-                        } else {
-                            if ($value->contains(':-')) {
-                                $key = $value->before(':');
-                                $defaultValue = $value->after(':-');
-                            } else if ($value->contains('-')) {
-                                $key = $value->before('-');
-                                $defaultValue = $value->after('-');
-                            } else if ($value->contains(':?')) {
-                                $key = $value->before(':');
-                                $defaultValue = $value->after(':?');
-                            } else if ($value->contains('?')) {
-                                $key = $value->before('?');
-                                $defaultValue = $value->after('?');
-                            } else {
-                                $key = $value;
-                                $defaultValue = null;
-                            }
-                            if ($foundEnv) {
-                                $defaultValue = data_get($foundEnv, 'value');
-                            }
-                            EnvironmentVariable::updateOrCreate([
-                                'key' => $key,
-                                'service_id' => $this->id,
-                            ], [
-                                'value' => $defaultValue,
-                                'is_build_time' => false,
-                                'service_id' => $this->id,
-                                'is_preview' => false,
-                            ]);
-                        }
-                    }
-                }
-
-                // Add labels to the service
-                if ($savedService->serviceType()) {
-                    $fqdns = generateServiceSpecificFqdns($savedService, forTraefik: true);
-                } else {
-                    $fqdns = collect(data_get($savedService, 'fqdns'));
-                }
-                $defaultLabels = defaultLabels($this->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
-                $serviceLabels = $serviceLabels->merge($defaultLabels);
-                if (!$isDatabase && $fqdns->count() > 0) {
-                    if ($fqdns) {
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
-                    }
-                }
-                if ($this->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
-                    data_set($service, 'logging', [
-                        'driver' => 'fluentd',
-                        'options' => [
-                            'fluentd-address' => "tcp://127.0.0.1:24224",
-                            'fluentd-async' => "true",
-                            'fluentd-sub-second-precision' => "true",
-                        ]
-                    ]);
-                }
-                data_set($service, 'labels', $serviceLabels->toArray());
-                data_forget($service, 'is_database');
-                data_set($service, 'restart', RESTART_MODE);
-                data_set($service, 'container_name', $containerName);
-                data_forget($service, 'volumes.*.content');
-                data_forget($service, 'volumes.*.isDirectory');
-                // Remove unnecessary variables from service.environment
-                // $withoutServiceEnvs = collect([]);
-                // collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
-                //     ray($key, $value);
-                //     if (!Str::of($key)->startsWith('$SERVICE_') && !Str::of($value)->startsWith('SERVICE_')) {
-                //         $k = Str::of($value)->before("=");
-                //         $v = Str::of($value)->after("=");
-                //         $withoutServiceEnvs->put($k->value(), $v->value());
-                //     }
-                // });
-                // ray($withoutServiceEnvs);
-                // data_set($service, 'environment', $withoutServiceEnvs->toArray());
-                return $service;
-            });
-            $finalServices = [
-                'version' => $dockerComposeVersion,
-                'services' => $services->toArray(),
-                'volumes' => $topLevelVolumes->toArray(),
-                'networks' => $topLevelNetworks->toArray(),
-            ];
-            $this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
-            $this->docker_compose = Yaml::dump($finalServices, 10, 2);
-            $this->save();
-            $this->saveComposeConfigs();
-            return collect([]);
-        } else {
-            return collect([]);
-        }
+        return parseDockerComposeFile($this, $isNew);
+    }
+    public function networks()
+    {
+        $networks = getTopLevelNetworks($this);
+        // ray($networks);
+        return $networks;
     }
 }

app/Models/StandaloneMariadb.php

@@ -41,6 +41,17 @@ class StandaloneMariadb extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.database.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'database_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/StandaloneMongodb.php

@@ -48,6 +48,17 @@ class StandaloneMongodb extends BaseModel
     {
         return data_get($this, 'is_log_drain_enabled', false);
     }
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.database.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'database_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function mongoInitdbRootPassword(): Attribute
     {
         return Attribute::make(

app/Models/StandaloneMysql.php

@@ -41,6 +41,17 @@ class StandaloneMysql extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.database.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'database_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function type(): string
     {
         return 'standalone-mysql';

app/Models/StandalonePostgresql.php

@@ -41,7 +41,17 @@ class StandalonePostgresql extends BaseModel
             $database->environment_variables()->delete();
         });
     }
-
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.database.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'database_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/StandaloneRedis.php

@@ -36,7 +36,17 @@ class StandaloneRedis extends BaseModel
             $database->environment_variables()->delete();
         });
     }
-
+    public function link()
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.database.configuration', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'database_uuid' => data_get($this, 'uuid')
+            ]);
+        }
+        return null;
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/SwarmDocker.php

@@ -4,13 +4,57 @@ namespace App\Models;
 
 class SwarmDocker extends BaseModel
 {
+    protected $guarded = [];
+
     public function applications()
     {
         return $this->morphMany(Application::class, 'destination');
     }
 
+    public function postgresqls()
+    {
+        return $this->morphMany(StandalonePostgresql::class, 'destination');
+    }
+
+    public function redis()
+    {
+        return $this->morphMany(StandaloneRedis::class, 'destination');
+    }
+    public function mongodbs()
+    {
+        return $this->morphMany(StandaloneMongodb::class, 'destination');
+    }
+    public function mysqls()
+    {
+        return $this->morphMany(StandaloneMysql::class, 'destination');
+    }
+    public function mariadbs()
+    {
+        return $this->morphMany(StandaloneMariadb::class, 'destination');
+    }
+
     public function server()
     {
         return $this->belongsTo(Server::class);
     }
+
+    public function services()
+    {
+        return $this->morphMany(Service::class, 'destination');
+    }
+
+    public function databases()
+    {
+        $postgresqls = $this->postgresqls;
+        $redis = $this->redis;
+        $mongodbs = $this->mongodbs;
+        $mysqls = $this->mysqls;
+        $mariadbs = $this->mariadbs;
+        return $postgresqls->concat($redis)->concat($mongodbs)->concat($mysqls)->concat($mariadbs);
+    }
+
+    public function attachedTo()
+    {
+        return $this->applications?->count() > 0 || $this->databases()->count() > 0;
+    }
 }

app/Traits/ExecuteRemoteCommand.php

@@ -12,6 +12,7 @@ use Illuminate\Support\Str;
 trait ExecuteRemoteCommand
 {
     public ?string $save = null;
+    public static int $batch_counter = 0;
     public function execute_remote_command(...$commands)
     {
         static::$batch_counter++;
@@ -23,8 +24,6 @@ trait ExecuteRemoteCommand
         if ($this->server instanceof Server === false) {
             throw new \RuntimeException('Server is not set or is not an instance of Server model');
         }
-
-
         $commandsText->each(function ($single_command) {
             $command = data_get($single_command, 'command') ?? $single_command[0] ?? null;
             if ($command === null) {
@@ -49,32 +48,29 @@ trait ExecuteRemoteCommand
                     'hidden' => $hidden,
                     'batch' => static::$batch_counter,
                 ];
-
-                if (!$this->log_model->logs) {
+                if (!$this->application_deployment_queue->logs) {
                     $new_log_entry['order'] = 1;
                 } else {
-                    $previous_logs = json_decode($this->log_model->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+                    $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
                     $new_log_entry['order'] = count($previous_logs) + 1;
                 }
-
                 $previous_logs[] = $new_log_entry;
-                $this->log_model->logs = json_encode($previous_logs, flags: JSON_THROW_ON_ERROR);
-                $this->log_model->save();
+                $this->application_deployment_queue->logs = json_encode($previous_logs, flags: JSON_THROW_ON_ERROR);
+                $this->application_deployment_queue->save();
 
                 if ($this->save) {
                     $this->saved_outputs[$this->save] = Str::of($output)->trim();
                 }
             });
-            $this->log_model->update([
+            $this->application_deployment_queue->update([
                 'current_process_id' => $process->id(),
             ]);
 
             $process_result = $process->wait();
             if ($process_result->exitCode() !== 0) {
                 if (!$ignore_errors) {
-                    $status = ApplicationDeploymentStatus::FAILED->value;
-                    $this->log_model->status = $status;
-                    $this->log_model->save();
+                    $this->application_deployment_queue->status = ApplicationDeploymentStatus::FAILED->value;
+                    $this->application_deployment_queue->save();
                     throw new \RuntimeException($process_result->errorOutput());
                 }
             }

bootstrap/helpers/applications.php

@@ -36,8 +36,6 @@ function queue_application_deployment(int $application_id, string $deployment_uu
     if ($running_deployments->count() > 0) {
         return;
     }
-    // New deployment
-    // dispatchDeploymentJob($deployment->id);
     dispatch(new ApplicationDeploymentJob(
         application_deployment_queue_id: $deployment->id,
     ))->onConnection('long-running')->onQueue('long-running');
@@ -48,34 +46,11 @@ function queue_next_deployment(Application $application)
 {
     $next_found = ApplicationDeploymentQueue::where('application_id', $application->id)->where('status', 'queued')->first();
     if ($next_found) {
-         // New deployment
-        // dispatchDeploymentJob($next_found->id);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $next_found->id,
         ))->onConnection('long-running')->onQueue('long-running');
-
     }
 }
-function dispatchDeploymentJob($id)
-{
-    $applicationQueue = ApplicationDeploymentQueue::find($id);
-    $application = Application::find($applicationQueue->application_id);
-
-    $isRestartOnly = data_get($applicationQueue, 'restart_only');
-    $isSimpleDockerFile = data_get($application, 'dockerfile');
-    $isDockerImage = data_get($application, 'build_pack') === 'dockerimage';
-
-    if ($isRestartOnly) {
-        ApplicationRestartJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
-    } else if ($isSimpleDockerFile) {
-        ApplicationDeploySimpleDockerfileJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
-    } else if ($isDockerImage) {
-        ApplicationDeployDockerImageJob::dispatch(applicationDeploymentQueueId: $id)->onConnection('long-running')->onQueue('long-running');
-    } else {
-        throw new Exception('Unknown build pack');
-    }
-}
-
 // Deployment things
 function generateHostIpMapping(Server $server, string $network)
 {
@@ -122,12 +97,12 @@ function prepareHelperContainer(Server $server, string $network, string $deploym
     $commands = collect([]);
     if ($dockerConfigFileExists === 'OK') {
         $commands->push([
-            "command" => "docker run -d --network $network -v /:/host --name $deploymentUuid --rm -v {$serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock $helperImage",
+            "command" => "docker run -d --network $network --name $deploymentUuid --rm -v {$serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock $helperImage",
             "hidden" => true,
         ]);
     } else {
         $commands->push([
-            "command" => "docker run -d --network {$network} -v /:/host --name {$deploymentUuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}",
+            "command" => "docker run -d --network {$network} --name {$deploymentUuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}",
             "hidden" => true,
         ]);
     }
@@ -201,7 +176,6 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
         ];
     }
     if ($application->settings->is_gpu_enabled) {
-        ray('asd');
         $docker_compose['services'][$containerName]['deploy']['resources']['reservations']['devices'] = [
             [
                 'driver' => data_get($application, 'settings.gpu_driver', 'nvidia'),
@@ -302,39 +276,37 @@ function generateEnvironmentVariables(Application $application, $ports, int $pul
     return $environment_variables->all();
 }
 
-function rollingUpdate(Application $application, string $deploymentUuid)
+function startNewApplication(Application $application, string $deploymentUuid, ApplicationDeploymentQueue $loggingModel)
 {
     $commands = collect([]);
     $workDir = generateWorkdir($deploymentUuid, $application);
-    if (count($application->ports_mappings_array) > 0) {
-        // $this->execute_remote_command(
-        //     [
-        //         "echo '\n----------------------------------------'",
-        //     ],
-        //     ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
-        // );
-        // $this->stop_running_container(force: true);
-        // $this->start_by_compose_file();
+    if ($application->build_pack === 'dockerimage') {
+        $loggingModel->addLogEntry('Pulling latest images from the registry.');
+        $commands->push(
+            [
+                "command" => executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} pull"),
+                "hidden" => true
+            ],
+            [
+                "command" => executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"),
+                "hidden" => true
+            ],
+        );
     } else {
         $commands->push(
             [
-                "command" =>  "echo '\n----------------------------------------'"
+                "command" => executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"),
+                "hidden" => true
             ],
-            [
-                "command" =>  "echo -n 'Rolling update started.'"
-            ]
         );
-        if ($application->build_pack === 'dockerimage') {
-            $commands->push(
-                ["echo -n 'Pulling latest images from the registry.'"],
-                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} pull"), "hidden" => true],
-                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"), "hidden" => true],
-            );
-        } else {
-            $commands->push(
-                [executeInDocker($deploymentUuid, "docker compose --project-directory {$workDir} up --build -d"), "hidden" => true],
-            );
-        }
-        return $commands;
     }
+    return $commands;
+}
+function removeOldDeployment(string $containerName)
+{
+    $commands = collect([]);
+    $commands->push(
+        ["docker rm -f $containerName >/dev/null 2>&1"],
+    );
+    return $commands;
 }

bootstrap/helpers/constants.php

@@ -28,7 +28,9 @@ const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',
 ];
 
+// Based on /etc/os-release
 const SUPPORTED_OS = [
-    'debian',
-    'rhel centos fedora'
+    'ubuntu debian raspbian',
+    'centos fedora rhel ol rocky',
+    'sles opensuse-leap opensuse-tumbleweed'
 ];

bootstrap/helpers/databases.php

@@ -24,7 +24,7 @@ function create_standalone_postgresql($environment_id, $destination_uuid): Stand
     }
     return StandalonePostgresql::create([
         'name' => generate_database_name('postgresql'),
-        'postgres_password' => \Illuminate\Support\Str::password(symbols: false),
+        'postgres_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
         'environment_id' => $environment_id,
         'destination_id' => $destination->id,
         'destination_type' => $destination->getMorphClass(),
@@ -39,7 +39,7 @@ function create_standalone_redis($environment_id, $destination_uuid): Standalone
     }
     return StandaloneRedis::create([
         'name' => generate_database_name('redis'),
-        'redis_password' => \Illuminate\Support\Str::password(symbols: false),
+        'redis_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
         'environment_id' => $environment_id,
         'destination_id' => $destination->id,
         'destination_type' => $destination->getMorphClass(),
@@ -54,7 +54,7 @@ function create_standalone_mongodb($environment_id, $destination_uuid): Standalo
     }
     return StandaloneMongodb::create([
         'name' => generate_database_name('mongodb'),
-        'mongo_initdb_root_password' => \Illuminate\Support\Str::password(symbols: false),
+        'mongo_initdb_root_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
         'environment_id' => $environment_id,
         'destination_id' => $destination->id,
         'destination_type' => $destination->getMorphClass(),
@@ -68,8 +68,8 @@ function create_standalone_mysql($environment_id, $destination_uuid): Standalone
     }
     return StandaloneMysql::create([
         'name' => generate_database_name('mysql'),
-        'mysql_root_password' => \Illuminate\Support\Str::password(symbols: false),
-        'mysql_password' => \Illuminate\Support\Str::password(symbols: false),
+        'mysql_root_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
+        'mysql_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
         'environment_id' => $environment_id,
         'destination_id' => $destination->id,
         'destination_type' => $destination->getMorphClass(),
@@ -83,8 +83,8 @@ function create_standalone_mariadb($environment_id, $destination_uuid): Standalo
     }
     return StandaloneMariadb::create([
         'name' => generate_database_name('mariadb'),
-        'mariadb_root_password' => \Illuminate\Support\Str::password(symbols: false),
-        'mariadb_password' => \Illuminate\Support\Str::password(symbols: false),
+        'mariadb_root_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
+        'mariadb_password' => \Illuminate\Support\Str::password(length: 64, symbols: false),
         'environment_id' => $environment_id,
         'destination_id' => $destination->id,
         'destination_type' => $destination->getMorphClass(),

bootstrap/helpers/docker.php

@@ -3,6 +3,9 @@
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
@@ -90,7 +93,11 @@ function executeInDocker(string $containerId, string $command)
 
 function getContainerStatus(Server $server, string $container_id, bool $all_data = false, bool $throwError = false)
 {
-    $container = instant_remote_process(["docker inspect --format '{{json .}}' {$container_id}"], $server, $throwError);
+    if ($server->isSwarm()) {
+        $container = instant_remote_process(["docker service ls --filter 'name={$container_id}' --format '{{json .}}' "], $server, $throwError);
+    } else {
+        $container = instant_remote_process(["docker inspect --format '{{json .}}' {$container_id}"], $server, $throwError);
+    }
     if (!$container) {
         return 'exited';
     }
@@ -98,7 +105,19 @@ function getContainerStatus(Server $server, string $container_id, bool $all_data
     if ($all_data) {
         return $container[0];
     }
-    return data_get($container[0], 'State.Status', 'exited');
+    if ($server->isSwarm()) {
+        $replicas = data_get($container[0], 'Replicas');
+        $replicas = explode('/', $replicas);
+        $active = (int)$replicas[0];
+        $total = (int)$replicas[1];
+        if ($active === $total) {
+            return 'running';
+        } else {
+            return 'starting';
+        }
+    } else {
+        return data_get($container[0], 'State.Status', 'exited');
+    }
 }
 
 function generateApplicationContainerName(Application $application, $pull_request_id = 0)
@@ -137,18 +156,28 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     $labels->push('coolify.name=' . $name);
     $labels->push('coolify.pullRequestId=' . $pull_request_id);
     if ($type === 'service') {
-        $labels->push('coolify.service.subId=' . $subId);
-        $labels->push('coolify.service.subType=' . $subType);
+        $subId && $labels->push('coolify.service.subId=' . $subId);
+        $subType && $labels->push('coolify.service.subType=' . $subType);
     }
     return $labels;
 }
-function generateServiceSpecificFqdns($service, $forTraefik = false)
+function generateServiceSpecificFqdns(ServiceApplication|Application $resource, $forTraefik = false)
 {
-    $variables = collect($service->service->environment_variables);
-    $type = $service->serviceType();
+    if ($resource->getMorphClass() === 'App\Models\ServiceApplication') {
+        $uuid = $resource->uuid;
+        $server = $resource->service->server;
+        $environment_variables = $resource->service->environment_variables;
+        $type = $resource->serviceType();
+    } else if ($resource->getMorphClass() === 'App\Models\Application') {
+        $uuid = $resource->uuid;
+        $server = $resource->destination->server;
+        $environment_variables = $resource->environment_variables;
+        $type = $resource->serviceType();
+    }
+    $variables = collect($environment_variables);
     $payload = collect([]);
     switch ($type) {
-        case $type->contains('minio'):
+        case $type?->contains('minio'):
             $MINIO_BROWSER_REDIRECT_URL = $variables->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
             $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first();
             if (is_null($MINIO_BROWSER_REDIRECT_URL) || is_null($MINIO_SERVER_URL)) {
@@ -156,12 +185,12 @@ function generateServiceSpecificFqdns($service, $forTraefik = false)
             }
             if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
                 $MINIO_BROWSER_REDIRECT_URL?->update([
-                    "value" => generateFqdn($service->service->server, 'console-' . $service->uuid)
+                    "value" => generateFqdn($server, 'console-' . $uuid)
                 ]);
             }
             if (is_null($MINIO_SERVER_URL?->value)) {
                 $MINIO_SERVER_URL?->update([
-                    "value" => generateFqdn($service->service->server, 'minio-' . $service->uuid)
+                    "value" => generateFqdn($server, 'minio-' . $uuid)
                 ]);
             }
             if ($forTraefik) {
@@ -175,10 +204,11 @@ function generateServiceSpecificFqdns($service, $forTraefik = false)
                     $MINIO_SERVER_URL->value,
                 ]);
             }
+            break;
     }
     return $payload;
 }
-function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -260,3 +290,21 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
     }
     return $labels->all();
 }
+
+function isDatabaseImage(?string $image = null)
+{
+    if (is_null($image)) {
+        return false;
+    }
+    $image = str($image);
+    if ($image->contains(':')) {
+        $image = str($image);
+    } else {
+        $image = str($image)->append(':latest');
+    }
+    $imageName = $image->before(':');
+    if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
+        return true;
+    }
+    return false;
+}

bootstrap/helpers/proxy.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Actions\Proxy\SaveConfiguration;
+use App\Models\Application;
 use App\Models\Server;
 use Symfony\Component\Yaml\Yaml;
 
@@ -12,9 +13,32 @@ function get_proxy_path()
 }
 function connectProxyToNetworks(Server $server)
 {
+    // Standalone networks
     $networks = collect($server->standaloneDockers)->map(function ($docker) {
         return $docker['network'];
-    })->unique();
+    });
+    // Service networks
+    foreach ($server->services()->get() as $service) {
+        $networks->push($service->networks());
+    }
+    // Docker compose based apps
+    $docker_compose_apps = $server->dockerComposeBasedApplications();
+    foreach ($docker_compose_apps as $app) {
+        $networks->push($app->uuid);
+    }
+    // Docker compose based preview deployments
+    $docker_compose_previews = $server->dockerComposeBasedPreviewDeployments();
+    foreach ($docker_compose_previews as $preview) {
+        $pullRequestId = $preview->pull_request_id;
+        $applicationId = $preview->application_id;
+        $application = Application::find($applicationId);
+        if (!$application) {
+            continue;
+        }
+        $network = "{$application->uuid}-{$pullRequestId}";
+        $networks->push($network);
+    }
+    $networks = collect($networks)->flatten()->unique();
     if ($networks->count() === 0) {
         $networks = collect(['coolify']);
     }
@@ -30,9 +54,15 @@ function connectProxyToNetworks(Server $server)
 function generate_default_proxy_configuration(Server $server)
 {
     $proxy_path = get_proxy_path();
-    $networks = collect($server->standaloneDockers)->map(function ($docker) {
-        return $docker['network'];
-    })->unique();
+    if ($server->isSwarm()) {
+        $networks = collect($server->swarmDockers)->map(function ($docker) {
+            return $docker['network'];
+        })->unique();
+    } else {
+        $networks = collect($server->standaloneDockers)->map(function ($docker) {
+            return $docker['network'];
+        })->unique();
+    }
     if ($networks->count() === 0) {
         $networks = collect(['coolify']);
     }
@@ -42,6 +72,16 @@ function generate_default_proxy_configuration(Server $server)
             "external" => true,
         ];
     });
+    $labels = [
+        "traefik.enable=true",
+        "traefik.http.routers.traefik.entrypoints=http",
+        "traefik.http.routers.traefik.middlewares=traefik-basic-auth@file",
+        "traefik.http.routers.traefik.service=api@internal",
+        "traefik.http.services.traefik.loadbalancer.server.port=8080",
+        // Global Middlewares
+        "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https",
+        "traefik.http.middlewares.gzip.compress=true",
+    ];
     $config = [
         "version" => "3.8",
         "networks" => $array_of_networks->toArray(),
@@ -78,7 +118,6 @@ function generate_default_proxy_configuration(Server $server)
                     "--entrypoints.https.address=:443",
                     "--entrypoints.http.http.encodequerysemicolons=true",
                     "--entrypoints.https.http.encodequerysemicolons=true",
-                    "--providers.docker=true",
                     "--providers.docker.exposedbydefault=false",
                     "--providers.file.directory=/traefik/dynamic/",
                     "--providers.file.watch=true",
@@ -86,16 +125,7 @@ function generate_default_proxy_configuration(Server $server)
                     "--certificatesresolvers.letsencrypt.acme.storage=/traefik/acme.json",
                     "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=http",
                 ],
-                "labels" => [
-                    "traefik.enable=true",
-                    "traefik.http.routers.traefik.entrypoints=http",
-                    "traefik.http.routers.traefik.middlewares=traefik-basic-auth@file",
-                    "traefik.http.routers.traefik.service=api@internal",
-                    "traefik.http.services.traefik.loadbalancer.server.port=8080",
-                    // Global Middlewares
-                    "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https",
-                    "traefik.http.middlewares.gzip.compress=true",
-                ],
+                "labels" => $labels,
             ],
         ],
     ];
@@ -104,7 +134,24 @@ function generate_default_proxy_configuration(Server $server)
         $config['services']['traefik']['command'][] = "--accesslog.filepath=/traefik/access.log";
         $config['services']['traefik']['command'][] = "--accesslog.bufferingsize=100";
     }
-    $config = Yaml::dump($config, 4, 2);
+    if ($server->isSwarm()) {
+        data_forget($config, 'services.traefik.container_name');
+        data_forget($config, 'services.traefik.restart');
+        data_forget($config, 'services.traefik.labels');
+
+        $config['services']['traefik']['command'][] = "--providers.docker.swarmMode=true";
+        $config['services']['traefik']['deploy'] = [
+            "labels" => $labels,
+            "placement" => [
+                "constraints" => [
+                    "node.role==manager",
+                ],
+            ],
+        ];
+    } else {
+        $config['services']['traefik']['command'][] = "--providers.docker=true";
+    }
+    $config = Yaml::dump($config, 12, 2);
     SaveConfiguration::run($server, $config);
     return $config;
 }

bootstrap/helpers/remoteProcess.php

@@ -123,6 +123,9 @@ function instant_remote_process(Collection|array $command, Server $server, $thro
         }
         return excludeCertainErrors($process->errorOutput(), $exitCode);
     }
+    if ($output === 'null') {
+        $output = null;
+    }
     return $output;
 }
 function excludeCertainErrors(string $errorOutput, ?int $exitCode = null)
@@ -151,6 +154,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
     if (is_null($application_deployment_queue)) {
         return collect([]);
     }
+    // ray(data_get($application_deployment_queue, 'logs'));
     try {
         $decoded = json_decode(
             data_get($application_deployment_queue, 'logs'),
@@ -160,14 +164,15 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
     } catch (\JsonException $exception) {
         return collect([]);
     }
+    // ray($decoded );
     $formatted = collect($decoded);
     if (!$is_debug_enabled) {
         $formatted = $formatted->filter(fn ($i) => $i['hidden'] === false ?? false);
     }
     $formatted = $formatted
-        ->sortBy(fn ($i) => $i['order'])
+        ->sortBy(fn ($i) => data_get($i, 'order'))
         ->map(function ($i) {
-            $i['timestamp'] = Carbon::parse($i['timestamp'])->format('Y-M-d H:i:s.u');
+            data_set($i, 'timestamp', Carbon::parse(data_get($i, 'timestamp'))->format('Y-M-d H:i:s.u'));
             return $i;
         });
     return $formatted;

config/constants.php

@@ -22,13 +22,13 @@ return [
         'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
     ],
     'limits' => [
-        'trial_period' => 7,
+        'trial_period' => 0,
         'server' => [
             'zero' => 0,
             'self-hosted' => 999999999999,
-            'basic' => 1,
-            'pro' => 10,
-            'ultimate' => 25,
+            'basic' => env('LIMIT_SERVER_BASIC', 2),
+            'pro' => env('LIMIT_SERVER_PRO', 10),
+            'ultimate' => env('LIMIT_SERVER_ULTIMATE', 25),
         ],
         'email' => [
             'zero' => true,

config/sentry.php

@@ -3,11 +3,11 @@
 return [
 
     // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/
-    'dsn' => 'https://396748153b19c469f5ceff50f1664323@o1082494.ingest.sentry.io/4505347448045568',
+    'dsn' => 'https://bea22abf110618b07252032aa2e07859@o1082494.ingest.sentry.io/4505347448045568',
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.145',
+    'release' => '4.0.0-beta.152',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.145';
+return '4.0.0-beta.152';

database/migrations/2023_11_24_080341_add_docker_compose_location.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('docker_compose_location')->nullable()->default('/docker-compose.yaml')->after('dockerfile_location');
+            $table->string('docker_compose_pr_location')->nullable()->default('/docker-compose.yaml')->after('docker_compose_location');
+
+            $table->longText('docker_compose')->nullable()->after('docker_compose_location');
+            $table->longText('docker_compose_pr')->nullable()->after('docker_compose_location');
+            $table->longText('docker_compose_raw')->nullable()->after('docker_compose');
+            $table->longText('docker_compose_pr_raw')->nullable()->after('docker_compose');
+
+            $table->text('docker_compose_domains')->nullable()->after('docker_compose_raw');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('docker_compose_location');
+            $table->dropColumn('docker_compose_pr_location');
+            $table->dropColumn('docker_compose');
+            $table->dropColumn('docker_compose_pr');
+            $table->dropColumn('docker_compose_raw');
+            $table->dropColumn('docker_compose_pr_raw');
+            $table->dropColumn('docker_compose_domains');
+        });
+    }
+};

database/migrations/2023_11_28_143533_add_fields_to_swarm_dockers.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('swarm_dockers', function (Blueprint $table) {
+            $table->string('network');
+
+            $table->unique(['server_id', 'network']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('swarm_dockers', function (Blueprint $table) {
+            $table->dropColumn('network');
+        });
+    }
+};

database/migrations/2023_11_29_075937_change_swarm_properties.php

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

database/migrations/2023_12_01_091723_save_logs_view_settings.php

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

database/migrations/2023_12_01_095356_add_custom_fluentd_config_for_logdrains.php

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

database/seeders/SwarmDockerSeeder.php

@@ -13,9 +13,9 @@ class SwarmDockerSeeder extends Seeder
      */
     public function run(): void
     {
-        SwarmDocker::create([
-            'name' => 'Swarm Docker 1',
-            'server_id' => 1,
-        ]);
+        // SwarmDocker::create([
+        //     'name' => 'Swarm Docker 1',
+        //     'server_id' => 1,
+        // ]);
     }
 }

docker-compose.prod.yml

@@ -28,6 +28,8 @@ services:
       - REDIS_HOST
       - REDIS_PASSWORD
       - HORIZON_MAX_PROCESSES
+      - HORIZON_BALANCE_MAX_SHIFT
+      - HORIZON_BALANCE_COOLDOWN
       - SSL_MODE=off
       - PHP_PM_CONTROL=dynamic
       - PHP_PM_START_SERVERS=1

docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up

@@ -1,2 +1,2 @@
 #!/command/execlineb -P
-php /var/www/html/artisan app:init
+php /var/www/html/artisan app:init --cleanup

resources/views/components/applications/links.blade.php

@@ -1,44 +1,50 @@
 <div class="group">
-    <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Open Application
-        <x-chevron-down />
-    </label>
+    @if (data_get($application, 'fqdn') ||
+    collect(json_decode($this->application->docker_compose_domains))->count() > 0 ||
+            data_get($application, 'previews', collect([]))->count() > 0 ||
+            data_get($application, 'ports_mappings_array'))
+        <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Open Application
+            <x-chevron-down />
+        </label>
 
-    <div class="absolute z-50 hidden group-hover:block">
-        <ul tabindex="0" class="relative -ml-24 text-xs text-white normal-case rounded min-w-max menu bg-coolgray-200">
-            @if (data_get($application, 'gitBrancLocation'))
-                <li>
-                    <a target="_blank"
-                        class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                        href="{{ $application->gitBranchLocation }}">
-                        <x-git-icon git="{{ $application->source?->getMorphClass() }}" />
-                        Git Repository
-                    </a>
-                </li>
-            @endif
-            @if (data_get($application, 'fqdn'))
-                @foreach (Str::of(data_get($application, 'fqdn'))->explode(',') as $fqdn)
+        <div class="absolute z-50 hidden group-hover:block">
+            <ul tabindex="0"
+                class="relative -ml-24 text-xs text-white normal-case rounded min-w-max menu bg-coolgray-200">
+                @if (data_get($application, 'gitBrancLocation'))
                     <li>
-                        <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                            target="_blank" href="{{ getFqdnWithoutPort($fqdn) }}">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
-                                stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                                stroke-linejoin="round">
-                                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                <path d="M9 15l6 -6" />
-                                <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
-                                <path
-                                    d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
-                            </svg>{{ getFqdnWithoutPort($fqdn) }}
+                        <a target="_blank"
+                            class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                            href="{{ $application->gitBranchLocation }}">
+                            <x-git-icon git="{{ $application->source?->getMorphClass() }}" />
+                            Git Repository
                         </a>
                     </li>
-                @endforeach
-            @endif
-            @if (data_get($application, 'previews', collect([]))->count() > 0)
-                @foreach (data_get($application, 'previews') as $preview)
-                    @if (data_get($preview, 'fqdn'))
+                @endif
+                @if (data_get($application, 'build_pack') === 'dockercompose')
+                    @foreach (collect(json_decode($this->application->docker_compose_domains)) as $fqdn)
+                        @if (data_get($fqdn, 'domain'))
+                            <li>
+                                <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                                    target="_blank" href="{{ getFqdnWithoutPort(data_get($fqdn, 'domain')) }}">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                        stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                        <path d="M9 15l6 -6" />
+                                        <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
+                                        <path
+                                            d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
+                                    </svg>{{ getFqdnWithoutPort(data_get($fqdn, 'domain')) }}
+                                </a>
+                            </li>
+                        @endif
+                    @endforeach
+                @endif
+                @if (data_get($application, 'fqdn'))
+                    @foreach (str(data_get($application, 'fqdn'))->explode(',') as $fqdn)
                         <li>
                             <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                                target="_blank" href="{{ getFqdnWithoutPort(data_get($preview, 'fqdn')) }}">
+                                target="_blank" href="{{ getFqdnWithoutPort($fqdn) }}">
                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
                                     stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                     stroke-linejoin="round">
@@ -47,52 +53,72 @@
                                     <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
                                     <path
                                         d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
-                                </svg>
-                                PR{{ data_get($preview, 'pull_request_id') }} |
-                                {{ data_get($preview, 'fqdn') }}
+                                </svg>{{ getFqdnWithoutPort($fqdn) }}
                             </a>
                         </li>
-                    @endif
-                @endforeach
-            @endif
-            @if (data_get($application, 'ports_mappings_array'))
-                @foreach ($application->ports_mappings_array as $port)
-                    @if (isDev())
-                        <li>
-                            <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                                target="_blank" href="http://localhost:{{ explode(':', $port)[0] }}">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                                    stroke-linejoin="round">
-                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                    <path d="M9 15l6 -6" />
-                                    <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
-                                    <path
-                                        d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
-                                </svg>
-                                Port {{ $port }}
-                            </a>
-                        </li>
-                    @else
-                        <li>
-                            <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                                target="_blank"
-                                href="http://{{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                                    stroke-linejoin="round">
-                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                    <path d="M9 15l6 -6" />
-                                    <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
-                                    <path
-                                        d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
-                                </svg>
-                                Port {{ $port }}
-                            </a>
-                        </li>
-                    @endif
-                @endforeach
-            @endif
-        </ul>
-    </div>
+                    @endforeach
+                @endif
+                @if (data_get($application, 'previews', collect([]))->count() > 0)
+                    @foreach (data_get($application, 'previews') as $preview)
+                        @if (data_get($preview, 'fqdn'))
+                            <li>
+                                <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                                    target="_blank" href="{{ getFqdnWithoutPort(data_get($preview, 'fqdn')) }}">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                        stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                        <path d="M9 15l6 -6" />
+                                        <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
+                                        <path
+                                            d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
+                                    </svg>
+                                    PR{{ data_get($preview, 'pull_request_id') }} |
+                                    {{ data_get($preview, 'fqdn') }}
+                                </a>
+                            </li>
+                        @endif
+                    @endforeach
+                @endif
+                @if (data_get($application, 'ports_mappings_array'))
+                    @foreach ($application->ports_mappings_array as $port)
+                        @if (isDev())
+                            <li>
+                                <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                                    target="_blank" href="http://localhost:{{ explode(':', $port)[0] }}">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                        stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                        <path d="M9 15l6 -6" />
+                                        <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
+                                        <path
+                                            d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
+                                    </svg>
+                                    Port {{ $port }}
+                                </a>
+                            </li>
+                        @else
+                            <li>
+                                <a class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
+                                    target="_blank"
+                                    href="http://{{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                        stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                        <path d="M9 15l6 -6" />
+                                        <path d="M11 6l.463 -.536a5 5 0 0 1 7.071 7.072l-.534 .464" />
+                                        <path
+                                            d="M13 18l-.397 .534a5.068 5.068 0 0 1 -7.127 0a4.972 4.972 0 0 1 0 -7.071l.524 -.463" />
+                                    </svg>
+                                    Port {{ $port }}
+                                </a>
+                            </li>
+                        @endif
+                    @endforeach
+                @endif
+            </ul>
+        </div>
+    @endif
 </div>

resources/views/components/applications/navbar.blade.php

@@ -13,46 +13,59 @@
     </a>
     <x-applications.links :application="$application" />
     <div class="flex-1"></div>
-    <x-applications.advanced :application="$application" />
-
-    @if ($application->status !== 'exited')
-        <button title="With rolling update if possible" wire:click='deploy' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-orange-400" viewBox="0 0 24 24" stroke-width="2"
-                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                <path
-                    d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
-                </path>
-                <path d="M7.05 11.038v-3.988"></path>
-            </svg>
-            Redeploy
-        </button>
-        <button title="Restart without rebuilding" wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747"/>
-                    <path d="M20 4v5h-5"/>
-                </g>
-            </svg>
-            Restart
-        </button>
-        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
-                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-            </svg>
-            Stop
-        </button>
+    @if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))
+        <div>Please load a Compose file.</div>
+    @elseif ($application->destination->server->isSwarm() && str($application->docker_registry_image_name)->isEmpty())
+        Swarm Deployments requires a Docker Image in a Registry.
     @else
-        <button wire:click='deploy' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-warning" viewBox="0 0 24 24" stroke-width="1.5"
-                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                <path d="M7 4v16l13 -8z" />
-            </svg>
-            Deploy
-        </button>
+        <x-applications.advanced :application="$application" />
+        @if ($application->status !== 'exited')
+            <button title="With rolling update if possible" wire:click='deploy'
+                class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-orange-400" viewBox="0 0 24 24"
+                    stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                    stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                    <path
+                        d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
+                    </path>
+                    <path d="M7.05 11.038v-3.988"></path>
+                </svg>
+                Redeploy
+            </button>
+            @if ($application->build_pack !== 'dockercompose')
+                <button title="Restart without rebuilding" wire:click='restart'
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                            <path d="M20 4v5h-5" />
+                        </g>
+                    </svg>
+                    Restart
+                </button>
+            @endif
+            <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
+                    stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                    <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                    <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                </svg>
+                Stop
+            </button>
+        @else
+            <button wire:click='deploy'
+                class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-warning" viewBox="0 0 24 24"
+                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                    stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path d="M7 4v16l13 -8z" />
+                </svg>
+                Deploy
+            </button>
+        @endif
     @endif
 </div>

resources/views/components/pricing-plans.blade.php

@@ -21,8 +21,11 @@
                 </label>
             </fieldset>
         </div>
-        <div class="py-2 text-center"><span class="font-bold text-warning">{{ config('constants.limits.trial_period') }}
-                days trial</span> included on all plans, without credit card details.</div>
+        @if (config('constants.limits.trial_period') > 0)
+            <div class="py-2 text-center"><span
+                    class="font-bold text-warning">{{ config('constants.limits.trial_period') }}
+                    days trial</span> included on all plans, without credit card details.</div>
+        @endif
         <div x-show="selected === 'monthly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
             <div>Save <span class="font-bold text-warning">10%</span> annually with the yearly plans.
             </div>
@@ -81,7 +84,7 @@
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            1 server <x-helper helper="Bring Your Own Server." />
+                            2 servers <x-helper helper="Bring Your Own Server." />
                         </li>
                         <li class="flex gap-x-3">
                             <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
@@ -255,8 +258,8 @@
                 <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
                     your self-hosted instance?
                     <x-forms.button>
-                        <a class="font-bold text-white hover:no-underline"
-                            href="{{ config('coolify.docs') }}">Contact Us</a>
+                        <a class="font-bold text-white hover:no-underline" href="{{ config('coolify.docs') }}">Contact
+                            Us</a>
                     </x-forms.button>
                 </div>
             </div>

resources/views/components/services/navbar.blade.php

@@ -1,6 +1,6 @@
 <div class="navbar-main">
-    <a class="{{ request()->routeIs('project.service') ? 'text-white' : '' }}"
-        href="{{ route('project.service', $parameters) }}">
+    <a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
+        href="{{ route('project.service.configuration', $parameters) }}">
         <button>Configuration</button>
     </a>
     <x-services.links />

resources/views/livewire/boarding/index.blade.php

@@ -131,16 +131,16 @@
                         </form>
                     </div>
                     @if (!$serverReachable)
-                    This server is not reachable with the following public key.
-                    <br /> <br />
-                    Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
-                    'root' or skip the boarding process and add a new private key manually to Coolify and to the
-                    server.
-                    <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                    <x-forms.button class="box" wire:target="validateServer"
-                        wire:click="validateServer">Check again
-                    </x-forms.button>
-                @endif
+                        This server is not reachable with the following public key.
+                        <br /> <br />
+                        Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
+                        'root' or skip the boarding process and add a new private key manually to Coolify and to the
+                        server.
+                        <x-forms.input readonly id="serverPublicKey"></x-forms.input>
+                        <x-forms.button class="box" wire:target="validateServer" wire:click="validateServer">Check
+                            again
+                        </x-forms.button>
+                    @endif
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>Private Keys are used to connect to a remote server through a secure shell, called SSH.</p>
@@ -200,14 +200,18 @@
                                 label="Description" id="remoteServerDescription" />
                         </div>
                         <div class="flex gap-2">
-                            <x-forms.input required placeholder="127.0.0.1" label="IP Address"
-                                id="remoteServerHost" />
+                            <x-forms.input required placeholder="127.0.0.1" label="IP Address" id="remoteServerHost" />
                             <x-forms.input required placeholder="Port number of your server. Default is 22."
                                 label="Port" id="remoteServerPort" />
                             <x-forms.input required readonly
                                 placeholder="Username to connect to your server. Default is root." label="Username"
                                 id="remoteServerUser" />
                         </div>
+                        <div class="w-64">
+                            <x-forms.checkbox
+                                helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<br><span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
+                                id="isCloudflareTunnel" label="Cloudflare Tunnel" />
+                        </div>
                         <x-forms.button type="submit">Check Connection</x-forms.button>
                     </form>
                 </x-slot:actions>
@@ -226,7 +230,7 @@
                 </x-slot:question>
                 <x-slot:actions>
                     <x-forms.button class="justify-center box" wire:click="installDocker">
-                    Let's do it!</x-forms.button>
+                        Let's do it!</x-forms.button>
                     @if ($dockerInstallationStarted)
                         <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
                             Validate Server & Continue</x-forms.button>
@@ -234,7 +238,10 @@
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able
-                        to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install Docker Engine, check <a target="_blank" class="underline text-warning" href="https://coolify.io/docs/servers#install-docker-engine-manually">this documentation</a>.</p>
+                        to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install Docker
+                        Engine, check <a target="_blank" class="underline text-warning"
+                            href="https://coolify.io/docs/servers#install-docker-engine-manually">this
+                            documentation</a>.</p>
                 </x-slot:explanation>
             </x-boarding-step>
 

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

@@ -24,13 +24,16 @@
                     helper="Allow Git LFS during build process." />
             @endif
             <form wire:submit.prevent="submit">
-                <div class="flex gap-2">
-                    <x-forms.checkbox helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>." instantSave
-                        id="application.settings.is_gpu_enabled" label="GPU Enabled Application" />
-                    @if ($application->settings->is_gpu_enabled)
-                        <x-forms.button type="submiot">Save</x-forms.button>
-                    @endif
-                </div>
+                @if ($application->build_pack !== 'dockercompose')
+                    <div class="flex gap-2">
+                        <x-forms.checkbox
+                            helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>."
+                            instantSave id="application.settings.is_gpu_enabled" label="GPU Enabled Application" />
+                        @if ($application->settings->is_gpu_enabled)
+                            <x-forms.button type="submiot">Save</x-forms.button>
+                        @endif
+                    </div>
+                @endif
                 @if ($application->settings->is_gpu_enabled)
                     <div class="flex flex-col w-full gap-2 p-2 xl:flex-row">
                         <x-forms.input label="GPU Driver" id="application.settings.gpu_driver"> </x-forms.input>

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

@@ -20,7 +20,7 @@
             <a :class="activeTab === 'server' && 'text-white'"
                 @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
             </a>
-            @if ($application->build_pack !== 'static')
+            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
                 <a :class="activeTab === 'storages' && 'text-white'"
                     @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
                 </a>
@@ -34,7 +34,7 @@
                     Deployments
                 </a>
             @endif
-            @if ($application->build_pack !== 'static')
+            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
                 <a :class="activeTab === 'health' && 'text-white'"
                     @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Healthchecks
                 </a>
@@ -42,10 +42,12 @@
             <a :class="activeTab === 'rollback' && 'text-white'"
                 @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
             </a>
-            <a :class="activeTab === 'resource-limits' && 'text-white'"
-                @click.prevent="activeTab = 'resource-limits'; window.location.hash = 'resource-limits'"
-                href="#">Resource Limits
-            </a>
+            @if ($application->build_pack !== 'dockercompose')
+                <a :class="activeTab === 'resource-limits' && 'text-white'"
+                    @click.prevent="activeTab = 'resource-limits'; window.location.hash = 'resource-limits'"
+                    href="#">Resource Limits
+                </a>
+            @endif
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>

resources/views/livewire/project/application/deployment-logs.blade.php

@@ -49,7 +49,7 @@
                         <div @class([
                             'font-mono whitespace-pre-line',
                             'text-warning' => $line['hidden'],
-                            'text-error' => $line['type'] == 'stderr',
+                            'text-red-500' => $line['type'] == 'stderr',
                         ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
                                 <br>COMMAND: <br>{{ $line['command'] }} <br><br>OUTPUT:
                                 @endif{{ $line['output'] }}@if ($line['hidden'])

resources/views/livewire/project/application/deployment-navbar.blade.php

@@ -1,5 +1,5 @@
 <div class="flex items-center gap-2 pb-4">
-    <h2>Logs</h2>
+    <h2>Deployment Log</h2>
     @if ($is_debug_enabled)
         <x-forms.button wire:click.prevent="show_debug">Hide Debug Logs</x-forms.button>
     @else

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

@@ -16,20 +16,22 @@
                 <x-forms.input id="application.name" label="Name" required />
                 <x-forms.input id="application.description" label="Description" />
             </div>
-            <div class="flex items-end gap-2">
-                <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
-                    helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
-                <x-forms.button wire:click="getWildcardDomain">Generate Domain
-                </x-forms.button>
-            </div>
-            @if (!$application->dockerfile)
+            @if ($application->build_pack !== 'dockercompose')
+                <div class="flex items-end gap-2">
+                    <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
+                        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
+                    <x-forms.button wire:click="getWildcardDomain">Generate Domain
+                    </x-forms.button>
+                </div>
+            @endif
+            @if (!$application->dockerfile && $application->build_pack !== 'dockerimage')
                 <div class="flex flex-col gap-2">
                     <div class="flex gap-2">
                         <x-forms.select wire:model="application.build_pack" label="Build Pack" required>
                             <option value="nixpacks">Nixpacks</option>
                             <option value="static">Static</option>
                             <option value="dockerfile">Dockerfile</option>
-                            <option value="dockerimage">Docker Image</option>
+                            <option value="dockercompose">Docker Compose</option>
                         </x-forms.select>
                         @if ($application->settings->is_static || $application->build_pack === 'static')
                             <x-forms.select id="application.static_image" label="Static Image" required>
@@ -45,28 +47,65 @@
                                 helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
                         </div>
                     @endif
+                    @if ($application->build_pack === 'dockercompose')
+                        @if (count($parsedServices) > 0)
+                            @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
+                                @if (!isDatabaseImage(data_get($service, 'image')))
+                                    <div class="flex items-end gap-2">
+                                        <x-forms.input
+                                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
+                                            label="Domains for {{ str($serviceName)->headline() }}"
+                                            id="parsedServiceDomains.{{ $serviceName }}.domain"></x-forms.input>
+                                        @if (!data_get($parsedServiceDomains, "$serviceName.domain"))
+                                            <x-forms.button wire:click="generateDomain('{{ $serviceName }}')">Generate
+                                                Domain</x-forms.button>
+                                        @endif
+                                    </div>
+                                @endif
+                            @endforeach
+                        @endif
+                    @endif
                 </div>
             @endif
-            <h3>Docker Registry</h3>
-            @if ($application->build_pack !== 'dockerimage')
-                <div>Push the built image to a docker registry. More info <a class="underline"
-                        href="https://coolify.io/docs/docker-registries" target="_blank">here</a>.</div>
-            @endif
-            <div class="flex flex-col gap-2 xl:flex-row">
-                @if ($application->build_pack === 'dockerimage')
-                    <x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
-                    <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
-                @else
-                    <x-forms.input id="application.docker_registry_image_name"
-                        helper="Empty means it won't push the image to a docker registry."
-                        placeholder="Empty means it won't push the image to a docker registry." label="Docker Image" />
-                    <x-forms.input id="application.docker_registry_image_tag"
-                        placeholder="Empty means only push commit sha tag."
-                        helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
-                        label="Docker Image Tag" />
+            @if ($application->build_pack !== 'dockerimage' && $application->build_pack !== 'dockercompose')
+                <h3>Docker Registry</h3>
+                @if ($application->destination->server->isSwarm())
+                <div>Docker Swarm requires the image to be available in a registry. More info <a class="underline"
+                    href="https://coolify.io/docs/docker-registries" target="_blank">here</a>.</div>
+                            @else
+                            <div>Push the built image to a docker registry. More info <a class="underline"
+                                href="https://coolify.io/docs/docker-registries" target="_blank">here</a>.</div>
                 @endif
+                <div class="flex flex-col gap-2 xl:flex-row">
+                    @if ($application->build_pack === 'dockerimage')
+                        @if ($application->destination->server->isSwarm())
+                            <x-forms.input required id="application.docker_registry_image_name" label="Docker Image" />
+                            <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
+                        @else
+                            <x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
+                            <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
+                        @endif
+                    @else
+                        @if ($application->destination->server->isSwarm())
+                            <x-forms.input id="application.docker_registry_image_name" required label="Docker Image" />
+                            <x-forms.input id="application.docker_registry_image_tag"
+                                helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
+                                label="Docker Image Tag" />
+                        @else
+                            <x-forms.input id="application.docker_registry_image_name"
+                                helper="Empty means it won't push the image to a docker registry."
+                                placeholder="Empty means it won't push the image to a docker registry."
+                                label="Docker Image" />
+                            <x-forms.input id="application.docker_registry_image_tag"
+                                placeholder="Empty means only push commit sha tag."
+                                helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
+                                label="Docker Image Tag" />
+                        @endif
 
-            </div>
+                    @endif
+
+                </div>
+            @endif
 
             @if ($application->build_pack !== 'dockerimage')
                 <h3>Build</h3>
@@ -91,7 +130,16 @@
                     @if ($application->build_pack === 'dockerfile' && !$application->dockerfile)
                         <x-forms.input placeholder="/Dockerfile" id="application.dockerfile_location"
                             label="Dockerfile Location"
-                            helper="It is calculated together with the Base Directory: {{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}" />
+                            helper="It is calculated together with the Base Directory:<br><span class='text-warning'>{{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}</span>" />
+                    @endif
+                    @if ($application->build_pack === 'dockercompose')
+                        <span wire:init='loadComposeFile(true)'></span>
+                        <x-forms.input placeholder="/docker-compose.yaml" id="application.docker_compose_location"
+                            label="Docker Compose Location"
+                            helper="It is calculated together with the Base Directory:<br><span class='text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }}</span>" />
+                        {{-- <x-forms.input placeholder="/docker-compose.yaml" id="application.docker_compose_pr_location"
+                            label="Docker Compose Location For Pull Requests"
+                            helper="It is calculated together with the Base Directory:<br><span class='text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_pr_location, '/') }}</span>" /> --}}
                     @endif
                     @if ($application->build_pack === 'dockerfile')
                         <x-forms.input id="application.dockerfile_target_build" label="Docker Build Stage Target"
@@ -108,23 +156,33 @@
                     @endif
                 </div>
             @endif
+            @if ($application->build_pack === 'dockercompose')
+                <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>
+                <x-forms.textarea rows="10" readonly id="application.docker_compose"
+                    label="Docker Compose Content" helper="You need to modify the docker compose file." />
+                {{-- <x-forms.textarea rows="10" readonly id="application.docker_compose_pr"
+                    label="Docker PR Compose Content" helper="You need to modify the docker compose file." /> --}}
+            @endif
 
             @if ($application->dockerfile)
                 <x-forms.textarea label="Dockerfile" id="application.dockerfile" rows="6"> </x-forms.textarea>
             @endif
-            <h3>Network</h3>
-            <div class="flex flex-col gap-2 xl:flex-row">
-                @if ($application->settings->is_static || $application->build_pack === 'static')
-                    <x-forms.input id="application.ports_exposes" label="Ports Exposes" readonly />
-                @else
-                    <x-forms.input placeholder="3000,3001" id="application.ports_exposes" label="Ports Exposes" required
-                        helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly." />
-                @endif
-                <x-forms.input placeholder="3000:3000" id="application.ports_mappings" label="Ports Mappings"
-                    helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host." />
-            </div>
-            <x-forms.textarea label="Container Labels" rows="15" id="customLabels"></x-forms.textarea>
-            <x-forms.button wire:click="resetDefaultLabels">Reset to Coolify Generated Labels</x-forms.button>
+            @if ($application->build_pack !== 'dockercompose')
+                <h3>Network</h3>
+                <div class="flex flex-col gap-2 xl:flex-row">
+                    @if ($application->settings->is_static || $application->build_pack === 'static')
+                        <x-forms.input id="application.ports_exposes" label="Ports Exposes" readonly />
+                    @else
+                        <x-forms.input placeholder="3000,3001" id="application.ports_exposes" label="Ports Exposes"
+                            required
+                            helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly." />
+                    @endif
+                    <x-forms.input placeholder="3000:3000" id="application.ports_mappings" label="Ports Mappings"
+                        helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host." />
+                </div>
+                <x-forms.textarea label="Container Labels" rows="15" id="customLabels"></x-forms.textarea>
+                <x-forms.button wire:click="resetDefaultLabels">Reset to Coolify Generated Labels</x-forms.button>
+            @endif
         </div>
     </form>
 </div>

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

@@ -71,15 +71,16 @@
                         </a>
                     </div>
                     <div class="flex items-center gap-2 pt-6">
-                        <x-forms.button class="bg-coolgray-500" wire:click="deploy({{ data_get($preview, 'pull_request_id') }})">
+                        <x-forms.button class="bg-coolgray-500"
+                            wire:click="deploy({{ data_get($preview, 'pull_request_id') }})">
                             @if (data_get($preview, 'status') === 'exited')
                                 Deploy
                             @else
                                 Redeploy
                             @endif
                         </x-forms.button>
-                        <x-forms.button class="bg-coolgray-500" wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Remove
-                            Preview
+                        <x-forms.button class="bg-coolgray-500"
+                            wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Remove Preview
                         </x-forms.button>
                         <a
                             href="{{ route('project.application.deployments', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">

resources/views/livewire/project/new/select.blade.php

@@ -67,7 +67,7 @@
                             Based on a Docker Compose
                         </div>
                         <div class="description">
-                            You can deploy complex application easily with Docker Compose.
+                            You can deploy complex application easily with Docker Compose, without Git.
                         </div>
                     </div>
                 </div>
@@ -77,7 +77,7 @@
                             Based on an existing Docker Image
                         </div>
                         <div class="description">
-                            You can deploy an existing Docker Image form any Registry.
+                            You can deploy an existing Docker Image form any Registry, without Git.
                         </div>
                     </div>
                 </div>
@@ -145,9 +145,9 @@
                     </div>
                 </div> --}}
             </div>
-            <div class="flex items-center gap-2">
+            <div class="flex items-center gap-2" wire:init='loadServices'>
                 <h2 class="py-4">Services</h2>
-                <x-forms.button wire:click='loadServices(true)'>Reload Services List</x-forms.button>
+                <x-forms.button wire:click='loadServices'>Reload Services List</x-forms.button>
                 <input
                     class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
                     wire:model.debounce.200ms="search" placeholder="Search..."></input>

resources/views/livewire/project/service/compose-modal.blade.php

@@ -1,4 +1,4 @@
-<dialog id="composeModal" class="modal" x-data="{ raw: true }">
+<dialog id="composeModal" class="modal" x-data="{ raw: true }" wire:ignore.self>
     <form method="dialog" class="flex flex-col gap-2 rounded max-w-7xl modal-box" wire:submit.prevent='submit'>
         <div class="flex items-end gap-2">
         <h1>Docker Compose</h1>

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

@@ -2,8 +2,8 @@
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col gap-4 min-w-fit">
-            <a class="{{ request()->routeIs('project.service') ? 'text-white' : '' }}"
-                href="{{ route('project.service', [...$parameters, 'service_name' => null]) }}">
+            <a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
+                href="{{ route('project.service.configuration', [...$parameters, 'service_name' => null]) }}">
                 <button><- Back</button>
             </a>
             <a :class="activeTab === 'general' && 'text-white'"

resources/views/livewire/project/service/stack-form.blade.php

@@ -18,7 +18,8 @@
         </div>
         <div class="grid grid-cols-2 gap-2">
             @foreach ($fields as $serviceName => $field)
-                <x-forms.input type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}" required
+                <x-forms.input type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}"
+                    required="{{ str(data_get($field, 'rules'))?->contains('required') }}"
                     helper="Variable name: {{ $serviceName }}"
                     label="{{ data_get($field, 'serviceName') }} {{ data_get($field, 'name') }}"
                     id="fields.{{ $serviceName }}.value"></x-forms.input>

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

@@ -1,6 +1,6 @@
 <div x-init="$wire.getLogs">
     <div class="flex gap-2">
-        <h2>Logs</h2>
+        <h4>Container: {{$container}}</h4>
         @if ($streamLogs)
             <span wire:poll.2000ms='getLogs(true)' class="loading loading-xs text-warning loading-spinner"></span>
         @endif
@@ -13,7 +13,7 @@
         <x-forms.input label="Only Show Number of Lines" placeholder="1000" required id="numberOfLines"></x-forms.input>
         <x-forms.button type="submit">Refresh</x-forms.button>
     </form>
-    <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'container w-full pt-4 mx-auto'">
+    <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'container w-full py-4 mx-auto'">
         <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-solid rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg

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

@@ -3,13 +3,20 @@
         <h1>Logs</h1>
         <livewire:project.application.heading :application="$resource" />
         <div class="pt-4">
-            <livewire:project.shared.get-logs :server="$server" :container="$container" />
+            @forelse ($containers as $container)
+                @if ($loop->first)
+                    <h2 class="pb-4">Logs</h2>
+                @endif
+                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="$container" />
+            @empty
+                <div>No containers are not running.</div>
+            @endforelse
         </div>
     @elseif ($type === 'database')
         <h1>Logs</h1>
         <livewire:project.database.heading :database="$resource" />
         <div class="pt-4">
-            <livewire:project.shared.get-logs :server="$server" :container="$container" />
+            <livewire:project.shared.get-logs :resource="$resource" :server="$server" :container="$container" />
         </div>
     @elseif ($type === 'service')
         <livewire:project.service.navbar :service="$resource" :parameters="$parameters" :query="$query" />
@@ -21,7 +28,7 @@
                 </a>
             </div>
             <div class="flex-1 pl-8">
-                <livewire:project.shared.get-logs :server="$server" :container="$container" />
+                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :servicesubtype="$serviceSubType" :container="$container" />
             </div>
         </div>
     @endif

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

@@ -9,33 +9,36 @@
             helper="See details in our <a target='_blank' class='text-white underline' href='https://coolify.io/docs/api-authentication'>documentation</a>."
             label="Deploy Webhook (auth required)" id="deploywebhook"></x-forms.input>
     </div>
-    <div>
-        <h3>Manual Git Webhooks</h3>
-        @if ($githubManualWebhook && $gitlabManualWebhook)
-            <form wire:submit.prevent='saveSecret' class="flex flex-col gap-2">
-                <div class="flex items-end gap-2">
-                    <x-forms.input helper="Content Type in GitHub configuration could be json or form-urlencoded."
-                        readonly label="GitHub" id="githubManualWebhook"></x-forms.input>
-                    <x-forms.input type="password"
-                        helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitHub."
-                        label="GitHub Webhook Secret" id="resource.manual_webhook_secret_github"></x-forms.input>
+    @if ($resource->type() !== 'service')
+        <div>
+            <h3>Manual Git Webhooks</h3>
+            @if ($githubManualWebhook && $gitlabManualWebhook)
+                <form wire:submit.prevent='saveSecret' class="flex flex-col gap-2">
+                    <div class="flex items-end gap-2">
+                        <x-forms.input helper="Content Type in GitHub configuration could be json or form-urlencoded."
+                            readonly label="GitHub" id="githubManualWebhook"></x-forms.input>
+                        <x-forms.input type="password"
+                            helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitHub."
+                            label="GitHub Webhook Secret" id="resource.manual_webhook_secret_github"></x-forms.input>
+
+                    </div>
+                    <a target="_blank" class="flex hover:no-underline" href="{{ $resource?->gitWebhook }}">
+                        <x-forms.button>Webhook Configuration on GitHub
+                            <x-external-link />
+                        </x-forms.button>
+                    </a>
+                    <div class="flex gap-2">
+                        <x-forms.input readonly label="GitLab" id="gitlabManualWebhook"></x-forms.input>
+                        <x-forms.input type="password"
+                            helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitLab."
+                            label="GitLab Webhook Secret" id="resource.manual_webhook_secret_gitlab"></x-forms.input>
+                    </div>
+                    <x-forms.button type="submit">Save</x-forms.button>
+                </form>
+            @else
+                You are using an official Git App. You do not need manual webhooks.
+            @endif
+        </div>
+    @endif
 
-                </div>
-                <a target="_blank" class="flex hover:no-underline" href="{{ $resource?->gitWebhook }}">
-                    <x-forms.button>Webhook Configuration on GitHub
-                        <x-external-link />
-                    </x-forms.button>
-                </a>
-                <div class="flex gap-2">
-                    <x-forms.input readonly label="GitLab" id="gitlabManualWebhook"></x-forms.input>
-                    <x-forms.input type="password"
-                        helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitLab."
-                        label="GitLab Webhook Secret" id="resource.manual_webhook_secret_gitlab"></x-forms.input>
-                </div>
-                <x-forms.button type="submit">Save</x-forms.button>
-            </form>
-        @else
-            You are using an official Git App. You do not need manual webhooks.
-        @endif
-    </div>
 </div>

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

@@ -11,12 +11,53 @@
         <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming
             back!
         </div>
-        @if ($server->hasDefinedResources())
-            <div class="text-warning">Please delete all resources before deleting this server.</div>
+        @if ($server->definedResources()->count() > 0)
+            <x-forms.button disabled isError isModal modalId="deleteServer">
+                Delete
+            </x-forms.button>
         @else
             <x-forms.button isError isModal modalId="deleteServer">
                 Delete
             </x-forms.button>
         @endif
+        <div class="flex flex-col">
+            @forelse ($server->definedResources() as $resource)
+                @if ($loop->first)
+                    <h3 class="pt-4">Defined resources</h3>
+                @endif
+                @if ($resource->link())
+                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
+                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
+                        <div>{{ $resource->name }}</div>
+                    </a>
+                @else
+                    <div class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline">
+                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
+                        <div>{{ $resource->name }}</div>
+                    </div>
+                @endif
+            @empty
+            @endforelse
+        </div>
+    @else
+        <div class="flex flex-col">
+            @forelse ($server->definedResources() as $resource)
+                @if ($loop->first)
+                    <h3 class="pt-4">Defined resources</h3>
+                @endif
+                @if ($resource->link())
+                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
+                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
+                        <div>{{ $resource->name }}</div>
+                    </a>
+                @else
+                    <div class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline">
+                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
+                        <div>{{ $resource->name }}</div>
+                    </div>
+                @endif
+            @empty
+            @endforelse
+        </div>
     @endif
 </div>

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

@@ -38,8 +38,7 @@
                 <x-forms.input id="server.description" label="Description" />
                 <x-forms.input placeholder="https://example.com" id="wildcard_domain" label="Wildcard Domain"
                     helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example:</span><br>In case you set:<span class='text-helper'>https://example.com</span> your applications will get:<br> <span class='text-helper'>https://randomId.example.com</span>" />
-                {{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
-                    label="Is it part of a Swarm cluster?" /> --}}
+
             </div>
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 <x-forms.input id="server.ip" label="IP Address/Domain"
@@ -49,13 +48,17 @@
                     <x-forms.input type="number" id="server.port" label="Port" required />
                 </div>
             </div>
-            @if (!$server->isLocalhost())
-                <div class="w-64">
+            <div class="w-64">
+                @if (!$server->isLocalhost())
                     <x-forms.checkbox instantSave
                         helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
                         id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
-                </div>
-            @endif
+                @endif
+                {{-- <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_manager"
+                    label="Is it a Swarm Manager?" /> --}}
+                    {{-- <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_worker"
+                    label="Is it a Swarm Worker?" /> --}}
+            </div>
         </div>
 
         @if ($server->isFunctional())

resources/views/livewire/server/log-drains.blade.php

@@ -24,24 +24,7 @@
                     </x-forms.button>
                 </div>
             </form>
-            {{-- <h3>Highlight.io</h3>
-            <div class="w-32">
-                <x-forms.checkbox instantSave='instantSave("highlight")'
-                    id="server.settings.is_logdrain_highlight_enabled" label="Enabled" />
-            </div>
-            <form wire:submit.prevent='submit("highlight")' class="flex flex-col">
-                <div class="flex flex-col gap-4">
-                    <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input type="password" required id="server.settings.logdrain_highlight_project_id"
-                            label="Project Id" />
-                    </div>
-                </div>
-                <div class="flex justify-end gap-4 pt-6">
-                    <x-forms.button type="submit">
-                        Save
-                    </x-forms.button>
-                </div>
-            </form> --}}
+
             <h3>Axiom</h3>
             <div class="w-32">
                 <x-forms.checkbox instantSave='instantSave("axiom")' id="server.settings.is_logdrain_axiom_enabled"
@@ -61,6 +44,43 @@
                     </x-forms.button>
                 </div>
             </form>
+            {{-- <h3>Highlight.io</h3>
+            <div class="w-32">
+                <x-forms.checkbox instantSave='instantSave("highlight")'
+                    id="server.settings.is_logdrain_highlight_enabled" label="Enabled" />
+            </div>
+            <form wire:submit.prevent='submit("highlight")' class="flex flex-col">
+                <div class="flex flex-col gap-4">
+                    <div class="flex flex-col w-full gap-2 xl:flex-row">
+                        <x-forms.input type="password" required id="server.settings.logdrain_highlight_project_id"
+                            label="Project Id" />
+                    </div>
+                </div>
+                <div class="flex justify-end gap-4 pt-6">
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+            </form> --}}
+            <h3>Custom FluentBit configuration</h3>
+            <div class="w-32">
+                <x-forms.checkbox instantSave='instantSave("custom")' id="server.settings.is_logdrain_custom_enabled"
+                    label="Enabled" />
+            </div>
+            <form wire:submit.prevent='submit("custom")' class="flex flex-col">
+                <div class="flex flex-col gap-4">
+                    <x-forms.textarea rows="6" required id="server.settings.logdrain_custom_config"
+                        label="Custom FluentBit Configuration" />
+                        <x-forms.textarea  id="server.settings.logdrain_custom_config_parser"
+                        label="Custom Parser Configuration" />
+                </div>
+                <div class="flex justify-end gap-4 pt-6">
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+            </form>
+
         </div>
     </div>
 </div>

resources/views/livewire/server/new/by-ip.blade.php

@@ -3,7 +3,7 @@
         <x-limit-reached name="servers" />
     @else
         <h1>Create a new Server</h1>
-        <div class="subtitle ">Servers are the main blocks of your infrastructure.</div>
+        <div class="subtitle">Servers are the main blocks of your infrastructure.</div>
         <form class="flex flex-col gap-2" wire:submit.prevent='submit'>
             <div class="flex gap-2">
                 <x-forms.input id="name" label="Name" required />
@@ -25,6 +25,10 @@
                     @endif
                 @endforeach
             </x-forms.select>
+            {{-- <div class="w-64">
+                <x-forms.checkbox type="checkbox" id="is_swarm_manager"
+                    label="Is it a Swarm Manager?" />
+            </div> --}}
             <x-forms.button type="submit">
                 Save New Server
             </x-forms.button>

resources/views/livewire/server/proxy/status.blade.php

@@ -1,6 +1,6 @@
 <div>
     @if ($server->isFunctional())
-        <div class="flex gap-2" @if ($polling) wire:poll.2000ms='checkProxy' @endif>
+        <div class="flex gap-2">
             @if (data_get($server, 'proxy.status') === 'running')
                 <x-status.running status="Proxy Running" />
             @elseif (data_get($server, 'proxy.status') === 'restarting')

resources/views/project/resources.blade.php

@@ -79,7 +79,7 @@
         @endforeach
         @foreach ($environment->services->sortBy('name') as $service)
             <a class="relative box group"
-                href="{{ route('project.service', [$project->uuid, $environment->name, $service->uuid]) }}">
+                href="{{ route('project.service.configuration', [$project->uuid, $environment->name, $service->uuid]) }}">
                 <div class="flex flex-col mx-6">
                     <div class="font-bold text-white">{{ $service->name }}</div>
                     <div class="description">{{ $service->description }}</div>

routes/web.php

@@ -120,7 +120,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
 
     // Services
-    Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}', ServiceIndex::class)->name('project.service');
+    Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}', ServiceIndex::class)->name('project.service.configuration');
     Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}/{service_name}', ServiceShow::class)->name('project.service.show');
     Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}/{service_name}/logs', Logs::class)->name('project.service.logs');
 });

routes/webhooks.php

@@ -225,13 +225,9 @@ Route::post('/source/github/events/manual', function () {
                 return response("Nothing to do. No applications found with branch '$base_branch'.");
             }
         }
-        ray($applications);
         foreach ($applications as $application) {
-            ray($application);
             $webhook_secret = data_get($application, 'manual_webhook_secret_github');
-            ray($webhook_secret);
             $hmac = hash_hmac('sha256', request()->getContent(), $webhook_secret);
-            ray($hmac, $x_hub_signature_256);
             if (!hash_equals($x_hub_signature_256, $hmac)) {
                 ray('Invalid signature');
                 continue;
@@ -317,11 +313,13 @@ Route::post('/source/github/events', function () {
             // Installation handled by setup redirect url. Repositories queried on-demand.
             return response('cool');
         }
-        $github_app = GithubApp::where('app_id', $x_github_hook_installation_target_id)->firstOrFail();
+        $github_app = GithubApp::where('app_id', $x_github_hook_installation_target_id)->first();
+        if (is_null($github_app)) {
+            return response('Nothing to do. No GitHub App found.');
+        }
 
         $webhook_secret = data_get($github_app, 'webhook_secret');
         $hmac = hash_hmac('sha256', request()->getContent(), $webhook_secret);
-        ray($hmac, $x_hub_signature_256)->blue();
         if (config('app.env') !== 'local') {
             if (!hash_equals($x_hub_signature_256, $hmac)) {
                 return response('not cool');
@@ -658,12 +656,10 @@ Route::post('/payments/paddle/events', function () {
         $h1 = Str::of($signature)->after('h1=');
         $signedPayload = $ts->value . ':' . request()->getContent();
         $verify = hash_hmac('sha256', $signedPayload, config('subscription.paddle_webhook_secret'));
-        ray($verify, $h1->value, hash_equals($verify, $h1->value));
         if (!hash_equals($verify, $h1->value)) {
             return response('Invalid signature.', 400);
         }
         $eventType = data_get($payload, 'event_type');
-        ray($eventType);
         $webhook = Webhook::create([
             'type' => 'paddle',
             'payload' => $payload,

scripts/install.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
 ## Do not modify this file. You will lose the ability to install and auto-update!
 
-###########
-## Always run "php artisan app:sync-to-bunny-cdn --env=secrets" or "scripts/run sync-bunny" if you update this file.
-###########
-
-VERSION="1.0.3"
+VERSION="1.1.0"
 DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
@@ -18,10 +14,14 @@ if [ $EUID != 0 ]; then
     echo "Please run as root"
     exit
 fi
-if [ $OS_TYPE != "ubuntu" ] && [ $OS_TYPE != "debian" ] && [ $OS_TYPE != "raspbian" ]; then
-    echo "This script only supports Ubuntu and Debian for now."
+
+case "$OS_TYPE" in
+ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
+*)
+    echo "This script only supports Debian, Redhat or Sles based operating systems for now."
     exit
-fi
+    ;;
+esac
 
 # Ovewrite LATEST_VERSION if user pass a version number
 if [ "$1" != "" ]; then
@@ -40,20 +40,41 @@ echo "Coolify version: $LATEST_VERSION"
 echo -e "-------------"
 echo "Installing required packages..."
 
-apt update -y >/dev/null 2>&1
-apt install -y curl wget git jq jc >/dev/null 2>&1
+case "$OS_TYPE" in
+ubuntu | debian | raspbian)
+    apt update -y >/dev/null 2>&1
+    apt install -y curl wget git jq >/dev/null 2>&1
+    ;;
+centos | fedora | rhel | ol | rocky)
+    dnf install -y curl wget git jq >/dev/null 2>&1
+    ;;
+sles | opensuse-leap | opensuse-tumbleweed)
+    zypper refresh >/dev/null 2>&1
+    zypper install -y curl wget git jq >/dev/null 2>&1
+    ;;
+*)
+    echo "This script only supports Debian, Redhat or Sles based operating systems for now."
+    exit
+    ;;
+esac
 
 if ! [ -x "$(command -v docker)" ]; then
-    echo "Docker is not installed. Installing Docker..."
+    echo "Docker is not installed. Installing Docker."
     curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
     if [ -x "$(command -v docker)" ]; then
         echo "Docker installed successfully."
     else
-        echo "Docker installation failed."
-        echo "Maybe your OS is not supported."
-        echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
-        exit 1
-   fi
+        echo "Docker installation failed with Rancher script. Trying with official script."
+        curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
+        if [ -x "$(command -v docker)" ]; then
+            echo "Docker installed successfully."
+        else
+            echo "Docker installation failed with official script."
+            echo "Maybe your OS is not supported."
+            echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+            exit 1
+        fi
+    fi
 fi
 echo -e "-------------"
 echo -e "Check Docker Configuration..."
@@ -93,7 +114,6 @@ else
     systemctl restart docker
 fi
 
-
 echo -e "-------------"
 
 mkdir -p /data/coolify/ssh/keys

scripts/upgrade.sh

@@ -16,6 +16,7 @@ curl -fsSL $CDN/.env.production -o /data/coolify/source/.env.production
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' > /data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env
 
 # Make sure coolify network exists
-docker network create coolify 2>/dev/null
+docker network create --attachable coolify 2>/dev/null
+# docker network create --attachable --driver=overlay coolify-overlay 2>/dev/null
 
 docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"

templates/compose/directus-with-postgresql.yaml

@@ -24,7 +24,7 @@ services:
       - REDIS_PORT=6379
       - WEBSOCKETS_ENABLED=true
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - directus-postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/formbricks.yaml

@@ -0,0 +1,60 @@
+# documentation: https://formbricks.com/docs/self-hosting/docker
+# slogan: Open Source Experience Management
+# tags: form, builder, forms, open source, experience, management, self-hosted, docker
+
+services:
+  formbricks:
+    image: formbricks/formbricks:latest
+    environment:
+      - SERVICE_FQDN_FORMBRICKS
+      - WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS
+      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks}
+      - NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH
+      - NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS
+      - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - MAIL_FROM=${MAIL_FROM:-test@example.com}
+      - SMTP_HOST=${SMTP_HOST:-test.example.com}
+      - SMTP_PORT=${SMTP_PORT:-587}
+      - SMTP_USER=${SMTP_USER:-test}
+      - SMTP_PASSWORD=${SMTP_PASSWORD:-test}
+      - SMTP_SECURE_ENABLED=${SMTP_SECURE_ENABLED:-0}
+      - SHORT_URL_BASE=${SHORT_URL_BASE}
+      - EMAIL_VERIFICATION_DISABLED=${EMAIL_VERIFICATION_DISABLED:-1}
+      - PASSWORD_RESET_DISABLED=${PASSWORD_RESET_DISABLED:-1}
+      - SIGNUP_DISABLED=${SIGNUP_DISABLED:-0}
+      - INVITE_DISABLED=${INVITE_DISABLED:-0}
+      - PRIVACY_URL=${PRIVACY_URL}
+      - TERMS_URL=${TERMS_URL}
+      - IMPRINT_URL=${IMPRINT_URL}
+      - GITHUB_AUTH_ENABLED=${GITHUB_AUTH_ENABLED:-0}
+      - GITHUB_ID=${GITHUB_ID}
+      - GITHUB_SECRET=${GITHUB_SECRET}
+      - GOOGLE_AUTH_ENABLED=${GOOGLE_AUTH_ENABLED:-0}
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - ASSET_PREFIX_URL=${ASSET_PREFIX_URL}
+    volumes:
+      - formbricks-uploads:/apps/web/uploads/
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
+
+  postgresql:
+    image: postgres:16-alpine
+    volumes:
+      - formbricks-postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-formbricks}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10