Merge pull request #1517 from coollabsio/next

v4.0.0-beta.153

app/Actions/Application/StopApplication.php

@@ -11,29 +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));
             }
-            // 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);
+            // Delete Preview Deployments
+            $previewDeployments = $application->previews;
+            foreach ($previewDeployments as $previewDeployment) {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, $previewDeployment->pull_request_id);
+                foreach ($containers as $container) {
+                    $name = str_replace('/', '', $container['Names']);
+                    instant_remote_process(["docker rm -f $name"], $application->destination->server, throwError: false);
+                }
             }
         }
 
+
     }
 }

app/Actions/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

@@ -67,7 +67,7 @@ class InstallDocker
             }
             $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",
@@ -76,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

@@ -21,7 +21,7 @@ class StartService
         $commands[] = "echo 'Pulling images.'";
         $commands[] = "docker compose pull";
         $commands[] = "echo 'Starting containers.'";
-        $commands[] = "docker compose up -d --remove-orphans --force-recreate";
+        $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',[]);

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/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/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}
           ';
         }
     }

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/Shared/EnvironmentVariable/Show.php

@@ -59,7 +59,6 @@ class Show extends Component
     {
         $this->validate();
         $this->env->save();
-        ray($this->env);
         $this->emit('success', 'Environment variable updated successfully.');
         $this->emit('refreshEnvs');
     }

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

@@ -22,6 +22,7 @@ class Logs extends Component
     public $parameters;
     public $query;
     public $status;
+    public $serviceSubType;
 
     public function mount()
     {
@@ -64,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/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/ApplicationDeploymentJob.php

@@ -156,25 +156,27 @@ 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} ";
@@ -214,6 +216,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
             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);
@@ -290,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) {
@@ -370,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;
@@ -402,7 +380,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $envs->push($env->key . '=' . $env->value);
             }
         }
-        ray($envs);
         $envs_base64 = base64_encode($envs->implode("\n"));
         $this->execute_remote_command(
             [
@@ -466,11 +443,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $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}/docker-compose.yaml"), "hidden" => true
+            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);
@@ -479,13 +457,34 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $networkId = "{$this->application->uuid}-{$this->pull_request_id}";
         }
-        $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 ($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();
-        $this->application->loadComposeFile(isInit: false);
     }
     private function deploy_dockerfile_buildpack()
     {
@@ -528,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.'",
                 ]);
@@ -570,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);
             }
         }
     }
@@ -666,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');
@@ -675,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(
             [
@@ -690,6 +706,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [
                 "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
             ],
+
         );
     }
     private function deploy_to_additional_destinations()
@@ -844,26 +861,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_args = $this->env_args->implode(' ');
     }
 
-    private function modify_compose_file()
-    {
-        // ray("{$this->workdir}{$this->docker_compose_location}");
-        $this->execute_remote_command([executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->docker_compose_location}"), "hidden" => true, "save" => 'compose_file']);
-        if ($this->saved_outputs->get('compose_file')) {
-            $compose = $this->saved_outputs->get('compose_file');
-        }
-        try {
-            $yaml = Yaml::parse($compose);
-        } catch (\Exception $e) {
-            throw new \Exception($e->getMessage());
-        }
-        $services = data_get($yaml, 'services');
-        $topLevelNetworks = collect(data_get($yaml, 'networks', []));
-        $definedNetwork = collect([$this->application->uuid]);
-
-        $services = collect($services)->map(function ($service, $serviceName) use ($topLevelNetworks, $definedNetwork) {
-            $serviceNetworks = collect(data_get($service, 'networks', []));
-        });
-    }
     private function generate_compose_file()
     {
         $ports = $this->application->settings->is_static ? [80] : $this->application->ports_exposes_array;
@@ -884,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 = [
@@ -909,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,
@@ -941,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',
@@ -988,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]);
@@ -1204,7 +1232,6 @@ 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->application_deployment_queue->addLogEntry("Rolling update completed.");
         } else {
             $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
             $this->execute_remote_command(
@@ -1226,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()
@@ -1259,7 +1287,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
             }
         }
-        ray($dockerfile->implode("\n"));
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
         $this->execute_remote_command([
             executeInDocker($this->deployment_uuid, "echo '{$dockerfile_base64}' | base64 -d > {$this->workdir}{$this->dockerfile_location}"),
@@ -1289,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,6 +32,12 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         return $this->server->id;
     }
 
+    public function __construct(public Server $server)
+    {
+        if (isDev()) $this->handle();
+    }
+
+
     public function handle()
     {
         // ray("checking container statuses for {$this->server->id}");
@@ -42,23 +45,62 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             if (!$this->server->isServerReady()) {
                 return;
             };
-            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+            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 = 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) {
@@ -94,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.
                         }
@@ -245,7 +301,11 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             // 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 {
@@ -253,8 +313,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     if ($shouldStart) {
                         StartProxy::run($this->server, false);
                         $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                    } else {
-                        ray('Proxy could not be started.');
                     }
                 } catch (\Throwable $e) {
                     ray($e);

app/Models/Application.php

@@ -50,11 +50,14 @@ class Application extends BaseModel
     }
     public function link()
     {
-        return route('project.application.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'application_uuid' => $this->uuid
-        ]);
+        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()
     {
@@ -584,12 +587,12 @@ class Application extends BaseModel
         $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,
             ]);
         }
@@ -614,7 +617,7 @@ class Application extends BaseModel
     function loadComposeFile($isInit = false)
     {
         $initialDockerComposeLocation = $this->docker_compose_location;
-        $initialDockerComposePrLocation = $this->docker_compose_pr_location;
+        // $initialDockerComposePrLocation = $this->docker_compose_pr_location;
         if ($this->build_pack === 'dockercompose') {
             if ($isInit && $this->docker_compose_raw) {
                 return;
@@ -623,11 +626,11 @@ class Application extends BaseModel
             ['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([".$composeFile"]);
-            if ($composeFile !== $prComposeFile) {
-                $fileList->push(".$prComposeFile");
-            }
+            // $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,
@@ -645,24 +648,24 @@ class Application extends BaseModel
                 $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();
-                }
-            }
+            // 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}",

app/Models/Server.php

@@ -2,8 +2,6 @@
 
 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;
@@ -18,7 +16,7 @@ use Illuminate\Support\Sleep;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
-use Stringable;
+use Illuminate\Support\Stringable;
 
 class Server extends BaseModel
 {
@@ -37,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) {
@@ -84,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()
@@ -103,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');
@@ -332,7 +347,7 @@ 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(): bool | Stringable
     {
@@ -359,12 +374,16 @@ class Server extends BaseModel
             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([
@@ -375,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;
@@ -400,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()
@@ -417,9 +449,13 @@ 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)
     {

app/Models/Service.php

@@ -131,6 +131,20 @@ 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();
@@ -193,6 +207,7 @@ class Service extends BaseModel
                     break;
             }
         }
+        ray($fields);
         $databases = $this->databases()->get();
 
         foreach ($databases as $database) {
@@ -363,11 +378,14 @@ class Service extends BaseModel
     }
     public function link()
     {
-        return route('project.service.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'service_uuid' => $this->uuid
-        ]);
+        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()
     {

app/Models/StandaloneMariadb.php

@@ -43,11 +43,14 @@ class StandaloneMariadb extends BaseModel
     }
     public function link()
     {
-        return route('project.database.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'database_uuid' => $this->uuid
-        ]);
+        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()
     {

app/Models/StandaloneMongodb.php

@@ -50,11 +50,14 @@ class StandaloneMongodb extends BaseModel
     }
     public function link()
     {
-        return route('project.database.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'database_uuid' => $this->uuid
-        ]);
+        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
     {

app/Models/StandaloneMysql.php

@@ -43,11 +43,14 @@ class StandaloneMysql extends BaseModel
     }
     public function link()
     {
-        return route('project.database.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'database_uuid' => $this->uuid
-        ]);
+        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
     {

app/Models/StandalonePostgresql.php

@@ -43,11 +43,14 @@ class StandalonePostgresql extends BaseModel
     }
     public function link()
     {
-        return route('project.database.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'database_uuid' => $this->uuid
-        ]);
+        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()
     {

app/Models/StandaloneRedis.php

@@ -38,11 +38,14 @@ class StandaloneRedis extends BaseModel
     }
     public function link()
     {
-        return route('project.database.configuration', [
-            'project_uuid' => $this->environment->project->uuid,
-            'environment_name' => $this->environment->name,
-            'database_uuid' => $this->uuid
-        ]);
+        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()
     {

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;
+    }
 }

bootstrap/helpers/applications.php

@@ -97,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,
         ]);
     }

bootstrap/helpers/docker.php

@@ -93,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';
     }
@@ -101,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)
@@ -275,8 +291,11 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
     return $labels->all();
 }
 
-function isDatabaseImage(string $image)
+function isDatabaseImage(?string $image = null)
 {
+    if (is_null($image)) {
+        return false;
+    }
     $image = str($image);
     if ($image->contains(':')) {
         $image = str($image);

bootstrap/helpers/proxy.php

@@ -54,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']);
     }
@@ -66,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(),
@@ -102,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",
@@ -110,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,
             ],
         ],
     ];
@@ -128,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)

bootstrap/helpers/shared.php

@@ -863,7 +863,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         $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();
@@ -914,13 +913,17 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         continue;
                     }
                     if ($value?->startsWith('$')) {
-                        $value = Str::of(replaceVariables($value));
-                        $key = $value;
                         $foundEnv = EnvironmentVariable::where([
                             'key' => $key,
                             'service_id' => $resource->id,
                         ])->first();
+                        $value = Str::of(replaceVariables($value));
+                        $key = $value;
                         if ($value->startsWith('SERVICE_')) {
+                            $foundEnv = EnvironmentVariable::where([
+                                'key' => $key,
+                                'service_id' => $resource->id,
+                            ])->first();
                             ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
                             if ($command->value() === 'FQDN' || $command->value() === 'URL') {
                                 if (Str::lower($forService) === $serviceName) {
@@ -1000,7 +1003,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 if ($savedService->serviceType()) {
                     $fqdns = generateServiceSpecificFqdns($savedService, forTraefik: true);
                 } else {
-                    $fqdns = collect(data_get($savedService, 'fqdns'));
+                    $fqdns = collect(data_get($savedService, 'fqdns'))->filter();
                 }
                 $defaultLabels = defaultLabels($resource->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
                 $serviceLabels = $serviceLabels->merge($defaultLabels);
@@ -1099,6 +1102,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             $serviceNetworks = collect(data_get($service, 'networks', []));
             $serviceVariables = collect(data_get($service, 'environment', []));
             $serviceLabels = collect(data_get($service, 'labels', []));
+            $serviceBuildVariables = collect(data_get($service, 'build.args', []));
+            $serviceVariables = $serviceVariables->merge($serviceBuildVariables);
             if ($serviceLabels->count() > 0) {
                 $removedLabels = collect([]);
                 $serviceLabels = $serviceLabels->filter(function ($serviceLabel, $serviceLabelName) use ($removedLabels) {
@@ -1145,6 +1150,52 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     data_set($service, 'volumes', $serviceVolumes->toArray());
                 }
             } else {
+                if (count($serviceVolumes) > 0) {
+                    $serviceVolumes = $serviceVolumes->map(function ($volume) use ($resource, $topLevelVolumes) {
+                        if (is_string($volume)) {
+                            $volume = str($volume);
+                            if ($volume->contains(':')) {
+                                $name = $volume->before(':');
+                                $mount = $volume->after(':');
+                                if ($name->startsWith('.') || $name->startsWith('~')) {
+                                    $dir = base_configuration_dir() . '/applications/' . $resource->uuid;
+                                    if ($name->startsWith('.')) {
+                                        $name = $name->replaceFirst('.', $dir);
+                                    }
+                                    if ($name->startsWith('~')) {
+                                        $name = $name->replaceFirst('~', $dir);
+                                    }
+                                    $volume = str("$name:$mount");
+                                } else {
+                                    $topLevelVolumes->put($name->value(), [
+                                        'name' => $name->value(),
+                                    ]);
+                                }
+                            }
+                        } else if (is_array($volume)) {
+                            $source = data_get($volume, 'source');
+                            if ($source) {
+                                if (str($source, '.') || str($source, '~')) {
+                                    $dir = base_configuration_dir() . '/applications/' . $resource->uuid;
+                                    if (str($source, '.')) {
+                                        $source = str('.', $dir, $source);
+                                    }
+                                    if (str($source, '~')) {
+                                        $source = str('~', $dir, $source);
+                                    }
+                                    data_set($volume, 'source', $source);
+                                } else {
+                                    data_set($volume, 'source', $source);
+                                    $topLevelVolumes->put($source, [
+                                        'name' => $source,
+                                    ]);
+                                }
+                            }
+                        }
+                        return $volume->value();
+                    });
+                    data_set($service, 'volumes', $serviceVolumes->toArray());
+                }
             }
             // Decide if the service is a database
             $isDatabase = isDatabaseImage(data_get_str($service, 'image'));
@@ -1271,13 +1322,18 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     continue;
                 }
                 if ($value?->startsWith('$')) {
-                    $value = Str::of(replaceVariables($value));
-                    $key = $value;
                     $foundEnv = EnvironmentVariable::where([
                         'key' => $key,
-                        'application_id' => $resource->id,
+                        'service_id' => $resource->id,
                     ])->first();
+                    $value = Str::of(replaceVariables($value));
+                    $key = $value;
+
                     if ($value->startsWith('SERVICE_')) {
+                        $foundEnv = EnvironmentVariable::where([
+                            'key' => $key,
+                            'application_id' => $resource->id,
+                        ])->first();
                         ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
                         if ($command->value() === 'FQDN' || $command->value() === 'URL') {
                             if (Str::lower($forService) === $serviceName) {

config/constants.php

@@ -22,7 +22,7 @@ return [
         'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
     ],
     'limits' => [
-        'trial_period' => 7,
+        'trial_period' => 0,
         'server' => [
             'zero' => 0,
             'self-hosted' => 999999999999,

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.147',
+    'release' => '4.0.0-beta.153',
     // 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.147';
+return '4.0.0-beta.153';

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/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/navbar.blade.php

@@ -15,6 +15,8 @@
     <div class="flex-1"></div>
     @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
         <x-applications.advanced :application="$application" />
         @if ($application->status !== 'exited')

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>
@@ -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/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/general.blade.php

@@ -67,23 +67,43 @@
                     @endif
                 </div>
             @endif
-            @if ($application->build_pack !== 'dockerimage' && $application->build_pack !== 'dockercompose')
+            @if ($application->build_pack !== 'dockercompose')
                 <h3>Docker Registry</h3>
-                <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>
+                @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
+                    @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
+                @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" />
+                        @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
-                        <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->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
+
                     @endif
 
                 </div>
@@ -140,8 +160,8 @@
             @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"
+                    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

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

@@ -7,7 +7,7 @@
                 @if ($loop->first)
                     <h2 class="pb-4">Logs</h2>
                 @endif
-                <livewire:project.shared.get-logs :server="$server" :container="$container" />
+                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="$container" />
             @empty
                 <div>No containers are not running.</div>
             @endforelse
@@ -16,7 +16,7 @@
         <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" />
@@ -28,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

@@ -25,10 +25,17 @@
                 @if ($loop->first)
                     <h3 class="pt-4">Defined resources</h3>
                 @endif
-                <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>
+                @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>
@@ -38,10 +45,17 @@
                 @if ($loop->first)
                     <h3 class="pt-4">Defined resources</h3>
                 @endif
-                <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>
+                @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>

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

@@ -62,6 +62,25 @@
                     </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')

scripts/install.sh

@@ -59,15 +59,21 @@ sles | opensuse-leap | opensuse-tumbleweed)
 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
+        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 "-------------"

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/gitea-with-postgresql.yaml

@@ -30,7 +30,7 @@ services:
       retries: 15
 
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - gitea-postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/grafana-with-postgresql.yaml

@@ -25,7 +25,7 @@ services:
     depends_on:
       - postgresql
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/mattermost.yaml

@@ -18,7 +18,7 @@ services:
     depends_on:
       - postgres
   postgres:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/meilisearch.yaml

@@ -0,0 +1,19 @@
+# documentation: https://www.meilisearch.com/docs/learn/configuration/instance_options
+# slogan: MeiliSearch is a powerful, fast, open-source, easy to use and deploy search engine.
+# tags: search,engine,fulltext,full,text,meilisearch
+
+services:
+  meilisearch:
+    image: getmeili/meilisearch:latest
+    environment:
+      - SERVICE_FQDN_MEILISEARCH
+      - MEILI_NO_ANALYTICS=${MEILI_NO_ANALYTICS:-true}
+      - MEILI_ENV=${MEILI_ENV:-production}
+      - MEILI_MASTER_KEY=${SERVICE_PASSWORD_MEILISEARCH}
+    volumes:
+      - meilisearch-data:/meili_data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:7700/health"]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/n8n-with-postgresql.yaml

@@ -24,7 +24,7 @@ services:
     depends_on:
       - postgresql
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/sonarqube.yaml

@@ -21,7 +21,7 @@ services:
       postgresql:
         condition: service_healthy
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/trigger.yaml

@@ -31,7 +31,7 @@ services:
     healthcheck:
       test: ["NONE"]
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/umami.yaml

@@ -14,7 +14,7 @@ services:
       postgresql:
         condition: service_healthy
   postgresql:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:

templates/service-templates.json

@@ -68,7 +68,7 @@
     "directus-with-postgresql": {
         "documentation": "https:\/\/docs.directus.io\/self-hosted\/quickstart.html",
         "slogan": "Directus is an open-source tool that wraps custom SQL databases with a dynamic API, and provides an intuitive admin app for managing its content.",
-        "compose": "c2VydmljZXM6CiAgZGlyZWN0dXM6CiAgICBpbWFnZTogJ2RpcmVjdHVzL2RpcmVjdHVzOjEwLjcnCiAgICB2b2x1bWVzOgogICAgICAtICdkaXJlY3R1cy11cGxvYWRzOi9kaXJlY3R1cy91cGxvYWRzJwogICAgICAtICdkaXJlY3R1cy1leHRlbnNpb25zOi9kaXJlY3R1cy9leHRlbnNpb25zJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0RJUkVDVFVTCiAgICAgIC0gS0VZPSRTRVJWSUNFX0JBU0U2NF82NF9LRVkKICAgICAgLSBTRUNSRVQ9JFNFUlZJQ0VfQkFTRTY0XzY0X1NFQ1JFVAogICAgICAtICdBRE1JTl9FTUFJTD0ke0FETUlOX0VNQUlMOi1hZG1pbkBleGFtcGxlLmNvbX0nCiAgICAgIC0gQURNSU5fUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfQURNSU4KICAgICAgLSBEQl9DTElFTlQ9cG9zdGdyZXMKICAgICAgLSBEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1JUPTU0MzIKICAgICAgLSAnREJfREFUQUJBU0U9JHtQT1NUR1JFU1FMX0RBVEFCQVNFOi1kaXJlY3R1c30nCiAgICAgIC0gREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTUUwKICAgICAgLSBEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMCiAgICAgIC0gUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFJFRElTX1BPUlQ9NjM3OQogICAgICAtIFdFQlNPQ0tFVFNfRU5BQkxFRD10cnVlCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAnZGlyZWN0dXMtcG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZGlyZWN0dXN9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo3LWFscGluZScKICAgIGNvbW1hbmQ6ICdyZWRpcy1zZXJ2ZXIgLS1hcHBlbmRvbmx5IHllcycKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RpcmVjdHVzLXJlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgZGlyZWN0dXM6CiAgICBpbWFnZTogJ2RpcmVjdHVzL2RpcmVjdHVzOjEwLjcnCiAgICB2b2x1bWVzOgogICAgICAtICdkaXJlY3R1cy11cGxvYWRzOi9kaXJlY3R1cy91cGxvYWRzJwogICAgICAtICdkaXJlY3R1cy1leHRlbnNpb25zOi9kaXJlY3R1cy9leHRlbnNpb25zJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0RJUkVDVFVTCiAgICAgIC0gS0VZPSRTRVJWSUNFX0JBU0U2NF82NF9LRVkKICAgICAgLSBTRUNSRVQ9JFNFUlZJQ0VfQkFTRTY0XzY0X1NFQ1JFVAogICAgICAtICdBRE1JTl9FTUFJTD0ke0FETUlOX0VNQUlMOi1hZG1pbkBleGFtcGxlLmNvbX0nCiAgICAgIC0gQURNSU5fUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfQURNSU4KICAgICAgLSBEQl9DTElFTlQ9cG9zdGdyZXMKICAgICAgLSBEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1JUPTU0MzIKICAgICAgLSAnREJfREFUQUJBU0U9JHtQT1NUR1JFU1FMX0RBVEFCQVNFOi1kaXJlY3R1c30nCiAgICAgIC0gREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTUUwKICAgICAgLSBEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMCiAgICAgIC0gUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFJFRElTX1BPUlQ9NjM3OQogICAgICAtIFdFQlNPQ0tFVFNfRU5BQkxFRD10cnVlCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAnZGlyZWN0dXMtcG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZGlyZWN0dXN9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo3LWFscGluZScKICAgIGNvbW1hbmQ6ICdyZWRpcy1zZXJ2ZXIgLS1hcHBlbmRvbmx5IHllcycKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RpcmVjdHVzLXJlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "directus",
             "cms",
@@ -208,7 +208,7 @@
     "gitea-with-postgresql": {
         "documentation": "https:\/\/docs.gitea.com",
         "slogan": "Gitea (with PostgreSQL)vis a self-hosted, lightweight Git service, offering version control, collaboration, and code hosting.",
-        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0RCX1RZUEU9cG9zdGdyZXMKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0hPU1Q9cG9zdGdyZXNxbAogICAgICAtICdHSVRFQV9fZGF0YWJhc2VfX05BTUU9JHtQT1NUR1JFU1FMX0RBVEFCQVNFLWdpdGVhfScKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19QQVNTV0Q9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTAogICAgdm9sdW1lczoKICAgICAgLSAnZ2l0ZWEtZGF0YTovdmFyL2xpYi9naXRlYScKICAgICAgLSAnZ2l0ZWEtdGltZXpvbmU6L2V0Yy90aW1lem9uZTpybycKICAgICAgLSAnZ2l0ZWEtbG9jYWx0aW1lOi9ldGMvbG9jYWx0aW1lOnJvJwogICAgcG9ydHM6CiAgICAgIC0gJzIyMjIyOjIyJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNS1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1wb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU1FMX0RBVEFCQVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0RCX1RZUEU9cG9zdGdyZXMKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0hPU1Q9cG9zdGdyZXNxbAogICAgICAtICdHSVRFQV9fZGF0YWJhc2VfX05BTUU9JHtQT1NUR1JFU1FMX0RBVEFCQVNFLWdpdGVhfScKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19QQVNTV0Q9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTAogICAgdm9sdW1lczoKICAgICAgLSAnZ2l0ZWEtZGF0YTovdmFyL2xpYi9naXRlYScKICAgICAgLSAnZ2l0ZWEtdGltZXpvbmU6L2V0Yy90aW1lem9uZTpybycKICAgICAgLSAnZ2l0ZWEtbG9jYWx0aW1lOi9ldGMvbG9jYWx0aW1lOnJvJwogICAgcG9ydHM6CiAgICAgIC0gJzIyMjIyOjIyJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1wb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU1FMX0RBVEFCQVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "version control",
             "collaboration",
@@ -233,7 +233,7 @@
     "grafana-with-postgresql": {
         "documentation": "https:\/\/grafana.com\/docs\/grafana\/latest\/installation\/docker\/",
         "slogan": "Grafana is the open source analytics & monitoring solution for every database.",
-        "compose": "c2VydmljZXM6CiAgZ3JhZmFuYToKICAgIGltYWdlOiBncmFmYW5hL2dyYWZhbmEtb3NzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fR1JBRkFOQQogICAgICAtICdHRl9TRVJWRVJfUk9PVF9VUkw9JHtTRVJWSUNFX0ZRRE5fR1JBRkFOQX0nCiAgICAgIC0gJ0dGX1NFUlZFUl9ET01BSU49JHtTRVJWSUNFX0ZRRE5fR1JBRkFOQX0nCiAgICAgIC0gJ0dGX1NFQ1VSSVRZX0FETUlOX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9HUkFGQU5BfScKICAgICAgLSBHRl9EQVRBQkFTRV9UWVBFPXBvc3RncmVzCiAgICAgIC0gR0ZfREFUQUJBU0VfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gR0ZfREFUQUJBU0VfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gR0ZfREFUQUJBU0VfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnR0ZfREFUQUJBU0VfTkFNRT0ke1BPU1RHUkVTX0RCOi1ncmFmYW5hfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dyYWZhbmEtZGF0YTovdmFyL2xpYi9ncmFmYW5hJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAvYXBpL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWdyYWZhbmF9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgZ3JhZmFuYToKICAgIGltYWdlOiBncmFmYW5hL2dyYWZhbmEtb3NzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fR1JBRkFOQQogICAgICAtICdHRl9TRVJWRVJfUk9PVF9VUkw9JHtTRVJWSUNFX0ZRRE5fR1JBRkFOQX0nCiAgICAgIC0gJ0dGX1NFUlZFUl9ET01BSU49JHtTRVJWSUNFX0ZRRE5fR1JBRkFOQX0nCiAgICAgIC0gJ0dGX1NFQ1VSSVRZX0FETUlOX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9HUkFGQU5BfScKICAgICAgLSBHRl9EQVRBQkFTRV9UWVBFPXBvc3RncmVzCiAgICAgIC0gR0ZfREFUQUJBU0VfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gR0ZfREFUQUJBU0VfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gR0ZfREFUQUJBU0VfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnR0ZfREFUQUJBU0VfTkFNRT0ke1BPU1RHUkVTX0RCOi1ncmFmYW5hfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dyYWZhbmEtZGF0YTovdmFyL2xpYi9ncmFmYW5hJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAvYXBpL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWdyYWZhbmF9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "grafana",
             "analytics",
@@ -304,6 +304,19 @@
             "low-code"
         ]
     },
+    "meilisearch": {
+        "documentation": "https:\/\/www.meilisearch.com\/docs\/learn\/configuration\/instance_options",
+        "slogan": "MeiliSearch is a powerful, fast, open-source, easy to use and deploy search engine.",
+        "compose": "c2VydmljZXM6CiAgbWVpbGlzZWFyY2g6CiAgICBpbWFnZTogJ2dldG1laWxpL21laWxpc2VhcmNoOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9NRUlMSVNFQVJDSAogICAgICAtICdNRUlMSV9OT19BTkFMWVRJQ1M9JHtNRUlMSV9OT19BTkFMWVRJQ1M6LXRydWV9JwogICAgICAtICdNRUlMSV9FTlY9JHtNRUlMSV9FTlY6LXByb2R1Y3Rpb259JwogICAgICAtICdNRUlMSV9NQVNURVJfS0VZPSR7U0VSVklDRV9QQVNTV09SRF9NRUlMSVNFQVJDSH0nCiAgICB2b2x1bWVzOgogICAgICAtICdtZWlsaXNlYXJjaC1kYXRhOi9tZWlsaV9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0Ojc3MDAvaGVhbHRoJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
+        "tags": [
+            "search",
+            "engine",
+            "fulltext",
+            "full",
+            "text",
+            "meilisearch"
+        ]
+    },
     "metube": {
         "documentation": "https:\/\/github.com\/alexta69\/metube",
         "slogan": "A web GUI for youtube-dl with playlist support. It enables you to effortlessly download videos from YouTube and dozens of other sites.",
@@ -346,7 +359,7 @@
     "n8n-with-postgresql": {
         "documentation": "https:\/\/docs.n8n.io\/hosting\/",
         "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSJFdXJvcGUvQmVybGluIicKICAgICAgLSAnVFo9IkV1cm9wZS9CZXJsaW4iJwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSJFdXJvcGUvQmVybGluIicKICAgICAgLSAnVFo9IkV1cm9wZS9CZXJsaW4iJwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "n8n",
             "workflow",
@@ -473,7 +486,7 @@
     "trigger": {
         "documentation": "https:\/\/trigger.dev\/docs\/documentation\/guides\/self-hosting",
         "slogan": "The open source Background Jobs framework for TypeScript",
-        "compose": "c2VydmljZXM6CiAgdHJpZ2dlcjoKICAgIGltYWdlOiAnZ2hjci5pby90cmlnZ2VyZG90ZGV2L3RyaWdnZXIuZGV2OmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTE9HSU5fT1JJR0lOPSRTRVJWSUNFX0ZRRE5fVFJJR0dFUgogICAgICAtIEFQUF9PUklHSU49JFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTUFHSUNfTElOS19TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfTUFHSUMKICAgICAgLSBFTkNSWVBUSU9OX0tFWT0kU0VSVklDRV9QQVNTV09SRF82NF9FTkNSWVBUSU9OCiAgICAgIC0gU0VTU0lPTl9TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfU0VTU0lPTgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXRyaWdnZXJ9JwogICAgICAtIFBPU1RHUkVTX0hPU1Q9cG9zdGdyZXMKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtICdESVJFQ1RfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtIFJVTlRJTUVfUExBVEZPUk09ZG9ja2VyLWNvbXBvc2UKICAgICAgLSBOT0RFX0VOVj1wcm9kdWN0aW9uCiAgICAgIC0gJ0FVVEhfR0lUSFVCX0NMSUVOVF9JRD0ke0FVVEhfR0lUSFVCX0NMSUVOVF9JRH0nCiAgICAgIC0gJ0FVVEhfR0lUSFVCX0NMSUVOVF9TRUNSRVQ9JHtBVVRIX0dJVEhVQl9DTElFTlRfU0VDUkVUfScKICAgICAgLSAnUkVTRU5EX0FQSV9LRVk9JHtSRVNFTkRfQVBJX0tFWX0nCiAgICAgIC0gJ0ZST01fRU1BSUw9JHtGUk9NX0VNQUlMfScKICAgICAgLSAnUkVQTFlfVE9fRU1BSUw9JHtSRVBMWV9UT19FTUFJTH0nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIE5PTkUKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNS1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotdHJpZ2dlcn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgdHJpZ2dlcjoKICAgIGltYWdlOiAnZ2hjci5pby90cmlnZ2VyZG90ZGV2L3RyaWdnZXIuZGV2OmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTE9HSU5fT1JJR0lOPSRTRVJWSUNFX0ZRRE5fVFJJR0dFUgogICAgICAtIEFQUF9PUklHSU49JFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTUFHSUNfTElOS19TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfTUFHSUMKICAgICAgLSBFTkNSWVBUSU9OX0tFWT0kU0VSVklDRV9QQVNTV09SRF82NF9FTkNSWVBUSU9OCiAgICAgIC0gU0VTU0lPTl9TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfU0VTU0lPTgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXRyaWdnZXJ9JwogICAgICAtIFBPU1RHUkVTX0hPU1Q9cG9zdGdyZXMKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtICdESVJFQ1RfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtIFJVTlRJTUVfUExBVEZPUk09ZG9ja2VyLWNvbXBvc2UKICAgICAgLSBOT0RFX0VOVj1wcm9kdWN0aW9uCiAgICAgIC0gJ0FVVEhfR0lUSFVCX0NMSUVOVF9JRD0ke0FVVEhfR0lUSFVCX0NMSUVOVF9JRH0nCiAgICAgIC0gJ0FVVEhfR0lUSFVCX0NMSUVOVF9TRUNSRVQ9JHtBVVRIX0dJVEhVQl9DTElFTlRfU0VDUkVUfScKICAgICAgLSAnUkVTRU5EX0FQSV9LRVk9JHtSRVNFTkRfQVBJX0tFWX0nCiAgICAgIC0gJ0ZST01fRU1BSUw9JHtGUk9NX0VNQUlMfScKICAgICAgLSAnUkVQTFlfVE9fRU1BSUw9JHtSRVBMWV9UT19FTUFJTH0nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIE5PTkUKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotdHJpZ2dlcn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "trigger.dev",
             "background jobs",
@@ -487,7 +500,7 @@
     "umami": {
         "documentation": "https:\/\/umami.is\/docs\/getting-started",
         "slogan": "Umami is a lightweight, self-hosted web analytics platform designed to provide website owners with insights into visitor behavior without compromising user privacy.",
-        "compose": "c2VydmljZXM6CiAgdW1hbWk6CiAgICBpbWFnZTogJ2doY3IuaW8vdW1hbWktc29mdHdhcmUvdW1hbWk6cG9zdGdyZXNxbC1sYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fVU1BTUkKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtIERBVEFCQVNFX1RZUEU9cG9zdGdyZXMKICAgICAgLSBBUFBfU0VDUkVUPSRTRVJWSUNFX1BBU1NXT1JEXzY0X1VNQU1JCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXVtYW1pfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgdW1hbWk6CiAgICBpbWFnZTogJ2doY3IuaW8vdW1hbWktc29mdHdhcmUvdW1hbWk6cG9zdGdyZXNxbC1sYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fVU1BTUkKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJFBPU1RHUkVTX0RCJwogICAgICAtIERBVEFCQVNFX1RZUEU9cG9zdGdyZXMKICAgICAgLSBBUFBfU0VDUkVUPSRTRVJWSUNFX1BBU1NXT1JEXzY0X1VNQU1JCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXVtYW1pfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "analytics",
             "insights",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.147"
+            "version": "4.0.0-beta.153"
         }
     }
 }