Merge pull request #1275 from coollabsio/next

v4.0.0-beta.56

.github/workflows/coolify-helper-next.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "next" ]
     paths:
-      - .github/workflows/coolify-helper.yml
+      - .github/workflows/coolify-helper-next.yml
       - docker/coolify-helper/Dockerfile
 
 env:

.github/workflows/coolify-helper.yml

@@ -77,7 +77,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

app/Actions/Database/StartPostgresql.php

@@ -21,6 +21,7 @@ class StartPostgresql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
+            "echo '####### Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
         ];
@@ -96,6 +97,7 @@ class StartPostgresql
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo '####### {$database->name} started.'";
         return remote_process($this->commands, $server);
     }
 

app/Actions/Proxy/CheckConfiguration.php

@@ -13,12 +13,16 @@ class CheckConfiguration
     {
         $proxy_path = get_proxy_path();
         $proxy_configuration = instant_remote_process([
+            "mkdir -p $proxy_path",
             "cat $proxy_path/docker-compose.yml",
         ], $server, false);
 
-        if ($reset || is_null($proxy_configuration)) {
+        if ($reset || !$proxy_configuration || is_null($proxy_configuration)) {
             $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
         }
+        if (!$proxy_configuration || is_null($proxy_configuration)) {
+            throw new \Exception("Could not generate proxy configuration");
+        }
         return $proxy_configuration;
     }
 }

app/Actions/Proxy/SaveConfiguration.php

@@ -10,9 +10,11 @@ class SaveConfiguration
 {
     use AsAction;
 
-    public function handle(Server $server)
+    public function handle(Server $server, ?string $proxy_settings = null)
     {
-        $proxy_settings = CheckConfiguration::run($server, true);
+        if (is_null($proxy_settings)) {
+            $proxy_settings = CheckConfiguration::run($server, true);
+        }
         $proxy_path = get_proxy_path();
         $docker_compose_yml_base64 = base64_encode($proxy_settings);
 

app/Actions/Proxy/StartProxy.php

@@ -2,8 +2,6 @@
 
 namespace App\Actions\Proxy;
 
-use App\Enums\ProxyStatus;
-use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -14,46 +12,32 @@ class StartProxy
     use AsAction;
     public function handle(Server $server, bool $async = true): Activity|string
     {
-        $proxyType = data_get($server,'proxy.type');
+        $commands = collect([]);
+        $proxyType = $server->proxyType();
         if ($proxyType === 'none') {
             return 'OK';
         }
-        if (is_null($proxyType)) {
-            $server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-            $server->proxy->status = ProxyStatus::EXITED->value;
-            $server->save();
-        }
         $proxy_path = get_proxy_path();
-        $networks = collect($server->standaloneDockers)->map(function ($docker) {
-            return $docker['network'];
-        })->unique();
-        if ($networks->count() === 0) {
-            $networks = collect(['coolify']);
-        }
-        $create_networks_command = $networks->map(function ($network) {
-            return "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null 2>&1 || docker network create --attachable $network > /dev/null 2>&1";
-        });
-
         $configuration = CheckConfiguration::run($server);
         if (!$configuration) {
             throw new \Exception("Configuration is not synced");
         }
+        SaveConfiguration::run($server, $configuration);
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
-        $commands = [
-            "command -v lsof >/dev/null || echo '####### Installing lsof...'",
-            "command -v lsof >/dev/null || apt-get update",
+
+        $commands = $commands->merge([
+            "apt-get update > /dev/null 2>&1 || true",
+            "command -v lsof >/dev/null || echo '####### Installing lsof.'",
             "command -v lsof >/dev/null || apt install -y lsof",
             "command -v lsof >/dev/null || command -v fuser >/dev/null || apt install -y psmisc",
-            "echo '####### Creating required Docker networks...'",
-            ...$create_networks_command,
-            "cd $proxy_path",
-            "echo '####### Creating Docker Compose file...'",
-            "echo '####### Pulling docker image...'",
+            "mkdir -p $proxy_path && cd $proxy_path",
+            "echo '####### Creating Docker Compose file.'",
+            "echo '####### Pulling docker image.'",
             'docker compose pull',
-            "echo '####### Stopping existing coolify-proxy...'",
-            "docker compose down -v --remove-orphans > /dev/null 2>&1 || true",
+            "echo '####### Stopping existing coolify-proxy.'",
+            "docker compose down -v --remove-orphans > /dev/null 2>&1",
             "command -v fuser >/dev/null || command -v lsof >/dev/null || echo '####### Could not kill existing processes listening on port 80 & 443. Please stop the process holding these ports...'",
             "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9 || true",
             "command -v lsof >/dev/null && lsof -nt -i:443 | xargs -r kill -9 || true",
@@ -62,16 +46,20 @@ class StartProxy
             "systemctl disable nginx > /dev/null 2>&1 || true",
             "systemctl disable apache2 > /dev/null 2>&1 || true",
             "systemctl disable apache > /dev/null 2>&1 || true",
-            "echo '####### Starting coolify-proxy...'",
+            "echo '####### Starting coolify-proxy.'",
             'docker compose up -d --remove-orphans',
-            "echo '####### Proxy installed successfully...'"
-        ];
-        if (!$async) {
-            instant_remote_process($commands, $server);
-            return 'OK';
-        } else {
+            "echo '####### Proxy installed successfully.'"
+        ]);
+        $commands = $commands->merge(connectProxyToNetworks($server));
+        if ($async) {
             $activity = remote_process($commands, $server);
             return $activity;
+        } else {
+            instant_remote_process($commands, $server);
+            $server->proxy->set('status', 'running');
+            $server->proxy->set('type', $proxyType);
+            $server->save();
+            return 'OK';
         }
     }
 }

app/Actions/Server/InstallDocker.php

@@ -7,7 +7,7 @@ use App\Models\StandaloneDocker;
 
 class InstallDocker
 {
-    public function __invoke(Server $server, bool $instant = false)
+    public function __invoke(Server $server)
     {
         $dockerVersion = '24.0';
         $config = base64_encode('{
@@ -55,9 +55,6 @@ class InstallDocker
                 "echo '####### Done!'"
             ];
         }
-        if ($instant) {
-            return instant_remote_process($command, $server);
-        }
         return remote_process($command, $server);
     }
 }

app/Actions/Server/UpdateCoolify.php

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

app/Actions/Service/StartService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+
+class StartService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        $service->saveComposeConfigs();
+        $commands[] = "cd " . $service->workdir();
+        $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
+        $commands[] = "echo '####### Creating Docker network.'";
+        $commands[] = "docker network create --attachable {$service->uuid} >/dev/null 2>/dev/null || true";
+        $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
+        $commands[] = "echo '####### Pulling images.'";
+        $commands[] = "docker compose pull";
+        $commands[] = "echo '####### Starting containers.'";
+        $commands[] = "docker compose up -d --remove-orphans --force-recreate";
+        $commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || true";
+        $activity = remote_process($commands, $service->server);
+        return $activity;
+    }
+}

app/Actions/Service/StopService.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+
+class StopService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        $applications = $service->applications()->get();
+        foreach ($applications as $application) {
+            instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
+            $application->update(['status' => 'exited']);
+        }
+        $dbs = $service->databases()->get();
+        foreach ($dbs as $db) {
+            instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
+            $db->update(['status' => 'exited']);
+        }
+        instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+    }
+}

app/Console/Commands/Emails.php

@@ -56,6 +56,7 @@ class Emails extends Command
         $type = select(
             'Which Email should be sent?',
             options: [
+                'updates' => 'Send Update Email to all users',
                 'emails-test' => 'Test',
                 'application-deployment-success' => 'Application - Deployment Success',
                 'application-deployment-failed' => 'Application - Deployment Failed',
@@ -69,7 +70,7 @@ class Emails extends Command
                 'realusers-server-lost-connection' => 'REAL - Server Lost Connection',
             ],
         );
-        $emailsGathered = ['realusers-before-trial','realusers-server-lost-connection'];
+        $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
         if (!in_array($type, $emailsGathered)) {
             $this->email = text('Email Address to send to');
         }
@@ -78,6 +79,38 @@ class Emails extends Command
         $this->mail = new MailMessage();
         $this->mail->subject("Test Email");
         switch ($type) {
+            case 'updates':
+                $teams = Team::all();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email && $member->marketing_emails) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->mail = new MailMessage();
+                        $this->mail->subject('One-click Services, Docker Compose support');
+                        $unsubscribeUrl = route('unsubscribe.marketing.emails', [
+                            'token' => encrypt($email),
+                        ]);
+                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
             case 'emails-test':
                 $this->mail = (new Test())->toMail();
                 $this->sendEmail();
@@ -141,20 +174,20 @@ class Emails extends Command
                 $this->mail = (new BackupSuccess($backup, $db))->toMail();
                 $this->sendEmail();
                 break;
-            // case 'invitation-link':
-            //     $user = User::all()->first();
-            //     $invitation = TeamInvitation::whereEmail($user->email)->first();
-            //     if (!$invitation) {
-            //         $invitation = TeamInvitation::create([
-            //             'uuid' => Str::uuid(),
-            //             'email' => $user->email,
-            //             'team_id' => 1,
-            //             'link' => 'http://example.com',
-            //         ]);
-            //     }
-            //     $this->mail = (new InvitationLink($user))->toMail();
-            //     $this->sendEmail();
-            //     break;
+                // case 'invitation-link':
+                //     $user = User::all()->first();
+                //     $invitation = TeamInvitation::whereEmail($user->email)->first();
+                //     if (!$invitation) {
+                //         $invitation = TeamInvitation::create([
+                //             'uuid' => Str::uuid(),
+                //             'email' => $user->email,
+                //             'team_id' => 1,
+                //             'link' => 'http://example.com',
+                //         ]);
+                //     }
+                //     $this->mail = (new InvitationLink($user))->toMail();
+                //     $this->sendEmail();
+                //     break;
             case 'waitlist-invitation-link':
                 $this->mail = new MailMessage();
                 $this->mail->view('emails.waitlist-invitation', [

app/Console/Commands/SyncBunny.php

@@ -7,6 +7,8 @@ use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Pool;
 use Illuminate\Support\Facades\Http;
 
+use function Laravel\Prompts\confirm;
+
 class SyncBunny extends Command
 {
     /**
@@ -14,7 +16,7 @@ class SyncBunny extends Command
      *
      * @var string
      */
-    protected $signature = 'sync:bunny';
+    protected $signature = 'sync:bunny {--only-template} {--only-version}';
 
     /**
      * The console command description.
@@ -28,6 +30,9 @@ class SyncBunny extends Command
      */
     public function handle()
     {
+        $that = $this;
+        $only_template = $this->option('only-template');
+        $only_version = $this->option('only-version');
         $bunny_cdn = "https://cdn.coollabs.io";
         $bunny_cdn_path = "coolify";
         $bunny_cdn_storage_name = "coolcdn";
@@ -39,51 +44,71 @@ class SyncBunny extends Command
         $install_script = "install.sh";
         $upgrade_script = "upgrade.sh";
         $production_env = ".env.production";
+        $service_template = "service-templates.json";
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($file) {
+        PendingRequest::macro('storage', function ($fileName) use($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/octet-stream'
             ];
-            $fileStream = fopen($file, "r");
-            $file = fread($fileStream, filesize($file));
+            $fileStream = fopen($fileName, "r");
+            $file = fread($fileStream, filesize($fileName));
+            $that->info('Uploading: ' . $fileName);
             return PendingRequest::baseUrl('https://storage.bunnycdn.com')->withHeaders($headers)->withBody($file)->throw();
         });
-        PendingRequest::macro('purge', function ($url) {
+        PendingRequest::macro('purge', function ($url) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_API_KEY'),
                 'Accept' => 'application/json',
             ];
-            ray('Purging: ' . $url);
+            $that->info('Purging: ' . $url);
             return PendingRequest::withHeaders($headers)->get('https://api.bunny.net/purge', [
                 "url" => $url,
                 "async" => false
             ]);
         });
         try {
+            $confirmed = confirm('Are you sure you want to sync?');
+            if (!$confirmed) {
+                return;
+            }
+            if ($only_template) {
+                Http::pool(fn (Pool $pool) => [
+                    $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
+                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
+                ]);
+                $this->info('Service template uploaded & purged...');
+                return;
+            }
+            if ($only_version) {
+                Http::pool(fn (Pool $pool) => [
+                    $pool->storage(fileName: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
+                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
+                ]);
+                $this->info('versions.json uploaded & purged...');
+                return;
+            }
+
             Http::pool(fn (Pool $pool) => [
-                $pool->storage(file: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
-                $pool->storage(file: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),
-                $pool->storage(file: "$parent_dir/$production_env")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$production_env"),
-                $pool->storage(file: "$parent_dir/scripts/$upgrade_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$upgrade_script"),
-                $pool->storage(file: "$parent_dir/scripts/$install_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$install_script"),
-                $pool->storage(file: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
+                $pool->storage(fileName: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
+                $pool->storage(fileName: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),
+                $pool->storage(fileName: "$parent_dir/$production_env")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$production_env"),
+                $pool->storage(fileName: "$parent_dir/scripts/$upgrade_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$upgrade_script"),
+                $pool->storage(fileName: "$parent_dir/scripts/$install_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$install_script"),
             ]);
-            ray("{$bunny_cdn}/{$bunny_cdn_path}");
             Http::pool(fn (Pool $pool) => [
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file_prod"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$production_env"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$upgrade_script"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$install_script"),
-                $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
             ]);
-            echo "All files uploaded & purged...\n";
+            $this->info("All files uploaded & purged...");
         } catch (\Throwable $e) {
-            echo $e->getMessage();
+            $this->error("Error: " . $e->getMessage());
         }
     }
 }

app/Console/Kernel.php

@@ -27,21 +27,28 @@ class Kernel extends ConsoleKernel
             // $this->instance_auto_update($schedule);
             // $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
-            $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
+            // $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
+        }
+    }
+    private function cleanup_servers($schedule)
+    {
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        foreach ($servers as $server) {
+            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
         }
     }
     private function check_resources($schedule)
     {
         $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
-        ray($servers);
-
         foreach ($servers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
         }

app/Data/CoolifyTaskArgs.php

@@ -17,8 +17,11 @@ class CoolifyTaskArgs extends Data
         public string  $type,
         public ?string $type_uuid = null,
         public ?Model  $model = null,
-        public string  $status = ProcessStatus::QUEUED->value,
+        public ?string  $status = null ,
         public bool    $ignore_errors = false,
     ) {
+        if(is_null($status)){
+            $this->status = ProcessStatus::QUEUED->value;
+        }
     }
 }

app/Exceptions/Handler.php

@@ -55,10 +55,12 @@ class Handler extends ExceptionHandler
             }
             app('sentry')->configureScope(
                 function (Scope $scope) {
+                    $email = auth()?->user() ? auth()->user()->email : 'guest';
+                    $instanceAdmin = User::find(0)->email ?? 'admin@localhost';
                     $scope->setUser(
                         [
-                            'email' => auth()->user()->email,
-                            'instanceAdmin' => User::find(0)->email
+                            'email' => $email,
+                            'instanceAdmin' => $instanceAdmin
                         ]
                     );
                 }

app/Http/Controllers/ProjectController.php

@@ -2,8 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\EnvironmentVariable;
 use App\Models\Project;
 use App\Models\Server;
+use App\Models\Service;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
 
 class ProjectController extends Controller
 {
@@ -41,9 +45,10 @@ class ProjectController extends Controller
 
     public function new()
     {
-        $type = request()->query('type');
+        $services = getServiceTemplates();
+        $type = Str::of(request()->query('type'));
         $destination_uuid = request()->query('destination');
-        $server = requesT()->query('server');
+        $server_id = request()->query('server_id');
 
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
@@ -61,8 +66,71 @@ class ProjectController extends Controller
                 'database_uuid' => $standalone_postgresql->uuid,
             ]);
         }
+        if ($type->startsWith('one-click-service-') && !is_null( (int)$server_id)) {
+            $oneClickServiceName = $type->after('one-click-service-')->value();
+            $oneClickService = data_get($services, "$oneClickServiceName.compose");
+            ray($oneClickServiceName);
+            $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
+            if ($oneClickDotEnvs) {
+                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/');
+            }
+            if ($oneClickService) {
+                $service = Service::create([
+                    'name' => "$oneClickServiceName-" . Str::random(10),
+                    'docker_compose_raw' => base64_decode($oneClickService),
+                    'environment_id' => $environment->id,
+                    'server_id' => (int) $server_id,
+                ]);
+                $service->name = "$oneClickServiceName-" . $service->uuid;
+                $service->save();
+                if ($oneClickDotEnvs?->count() > 0) {
+                    $oneClickDotEnvs->each(function ($value) use ($service) {
+                        $key = Str::before($value, '=');
+                        $value = Str::of(Str::after($value, '='));
+                        $generatedValue = $value;
+                        if ($value->contains('SERVICE_')) {
+                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            switch ($command->value()) {
+                                case 'PASSWORD':
+                                    $generatedValue = Str::password(symbols: false);
+                                    break;
+                                case 'PASSWORD_64':
+                                    $generatedValue = Str::password(length: 64, symbols: false);
+                                    break;
+                                case 'BASE64_64':
+                                    $generatedValue = Str::random(64);
+                                    break;
+                                case 'BASE64_128':
+                                    $generatedValue = Str::random(128);
+                                    break;
+                                case 'BASE64':
+                                    $generatedValue = Str::random(32);
+                                    break;
+                                case 'USER':
+                                    $generatedValue = Str::random(16);
+                                    break;
+                            }
+                        }
+                        EnvironmentVariable::create([
+                            'key' => $key,
+                            'value' => $generatedValue,
+                            'service_id' => $service->id,
+                            'is_build_time' => false,
+                            'is_preview' => false,
+                        ]);
+                    });
+                }
+                $service->parse(isNew: true);
+
+                return redirect()->route('project.service', [
+                    'service_uuid' => $service->uuid,
+                    'environment_name' => $environment->name,
+                    'project_uuid' => $project->uuid,
+                ]);
+            }
+        }
         return view('project.new', [
-            'type' => $type
+            'type' => $type->value()
         ]);
     }
 

app/Http/Livewire/Boarding/Index.php

@@ -9,7 +9,6 @@ use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Support\Collection;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class Index extends Component
 {
@@ -40,8 +39,8 @@ class Index extends Component
 
     public bool $dockerInstallationStarted = false;
 
-    public string $localhostPublicKey;
-    public bool $localhostReachable = true;
+    public string $serverPublicKey;
+    public bool $serverReachable = true;
 
     public function mount()
     {
@@ -70,14 +69,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function restartBoarding()
     {
-        // if ($this->selectedServerType !== 'localhost') {
-        //     if ($this->createdServer) {
-        //         $this->createdServer->delete();
-        //     }
-        //     if ($this->createdPrivateKey) {
-        //         $this->createdPrivateKey->delete();
-        //     }
-        // }
         return redirect()->route('boarding');
     }
     public function skipBoarding()
@@ -98,7 +89,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             if (!$this->createdServer) {
                 return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
-            $this->localhostPublicKey = $this->createdServer->privateKey->publicKey();
+            $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
             $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
@@ -123,6 +114,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             return;
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
+        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
         $this->validateServer();
     }
     public function getProxyType()
@@ -137,6 +129,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function selectExistingPrivateKey()
     {
         $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
+        $this->privateKey = $this->createdPrivateKey->private_key;
         $this->currentState = 'create-server';
     }
     public function createNewServer()
@@ -201,11 +194,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
             instant_remote_process(['uptime'], $this->createdServer, true);
 
-            $this->createdServer->settings->update([
+            $this->createdServer->settings()->update([
                 'is_reachable' => true,
             ]);
         } catch (\Throwable $e) {
-            $this->localhostReachable = false;
+            $this->serverReachable = false;
             return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
 
@@ -216,8 +209,12 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
                 $this->currentState = 'install-docker';
                 throw new \Exception('Docker version is not supported or not installed.');
             }
-            $this->dockerInstalledOrSkipped();
+            $this->createdServer->settings()->update([
+                'is_usable' => true,
+            ]);
+            $this->getProxyType();
         } catch (\Throwable $e) {
+            $this->dockerInstallationStarted = false;
             return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
     }
@@ -229,10 +226,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function dockerInstalledOrSkipped()
     {
-        $this->createdServer->settings->update([
-            'is_usable' => true,
-        ]);
-        $this->getProxyType();
+        $this->validateServer();
     }
     public function selectProxy(string|null $proxyType = null)
     {

app/Http/Livewire/Destination/Form.php

@@ -38,7 +38,7 @@ class Form extends Component
             $this->destination->delete();
             return redirect()->route('dashboard');
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 }

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

@@ -78,7 +78,7 @@ class StandaloneDocker extends Component
 
     private function createNetworkAndAttachToProxy()
     {
-        instant_remote_process(['docker network create --attachable ' . $this->network], $this->server, throwError: false);
-        instant_remote_process(["docker network connect $this->network coolify-proxy"], $this->server, throwError: false);
+        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
     }
 }

app/Http/Livewire/Help.php

@@ -4,8 +4,8 @@ namespace App\Http\Livewire;
 
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Route;
 use Livewire\Component;
-use Route;
 
 class Help extends Component
 {
@@ -28,7 +28,7 @@ class Help extends Component
     public function submit()
     {
         try {
-            $this->rateLimit(1, 60);
+            $this->rateLimit(3, 60);
             $this->validate();
             $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
             $debug = "Route: {$this->path}";
@@ -42,7 +42,7 @@ class Help extends Component
             );
             $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
             send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
-            $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
+            $this->emit('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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

@@ -4,24 +4,24 @@ namespace App\Http\Livewire\Project\Application;
 
 use App\Models\Application;
 use App\Models\InstanceSettings;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Livewire\Component;
 use Spatie\Url\Url;
+use Symfony\Component\Yaml\Yaml;
 
 class General extends Component
 {
     public string $applicationId;
 
     public Application $application;
+    public Collection $services;
     public string $name;
     public string|null $fqdn;
     public string $git_repository;
     public string $git_branch;
     public string|null $git_commit_sha;
     public string $build_pack;
-    public string|null $wildcard_domain = null;
-    public string|null $server_wildcard_domain = null;
-    public string|null $global_wildcard_domain = null;
 
     public bool $is_static;
     public bool $is_git_submodules_enabled;
@@ -31,6 +31,7 @@ class General extends Component
     public bool $is_auto_deploy_enabled;
     public bool $is_force_https_enabled;
 
+
     protected $rules = [
         'application.name' => 'required',
         'application.description' => 'nullable',
@@ -66,6 +67,7 @@ class General extends Component
         'application.ports_exposes' => 'Ports exposes',
         'application.ports_mappings' => 'Ports mappings',
         'application.dockerfile' => 'Dockerfile',
+
     ];
 
     public function instantSave()
@@ -87,65 +89,43 @@ class General extends Component
         $this->application->save();
         $this->application->refresh();
         $this->emit('success', 'Application settings updated!');
-        $this->checkWildCardDomain();
     }
 
-    protected function checkWildCardDomain()
-    {
-        $coolify_instance_settings = InstanceSettings::get();
-        $this->server_wildcard_domain = data_get($this->application, 'destination.server.settings.wildcard_domain');
-        $this->global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
-        $this->wildcard_domain = $this->server_wildcard_domain ?? $this->global_wildcard_domain ?? null;
-    }
+    public function getWildcardDomain() {
+        $server = data_get($this->application, 'destination.server');
+        if ($server) {
+            $fqdn = generateFqdn($server, $this->application->uuid);
+            ray($fqdn);
+            $this->application->fqdn = $fqdn;
+            $this->application->save();
+            $this->emit('success', 'Application settings updated!');
+        }
 
+    }
     public function mount()
     {
-        $this->is_static = $this->application->settings->is_static;
-        $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-        $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-        $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-        $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        $this->checkWildCardDomain();
-    }
-
-    public function generateGlobalRandomDomain()
-    {
-        // Set wildcard domain based on Global wildcard domain
-        $url = Url::fromString($this->global_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
-    }
-
-    public function generateServerRandomDomain()
-    {
-        // Set wildcard domain based on Server wildcard domain
-        $url = Url::fromString($this->server_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
+        if (data_get($this->application,'settings')) {
+            $this->is_static = $this->application->settings->is_static;
+            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
+            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
+            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
+            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        }
     }
 
     public function submit()
     {
-        ray($this->application);
         try {
             $this->validate();
-            if (data_get($this->application,'fqdn')) {
+            if (data_get($this->application, 'fqdn')) {
                 $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                     return Str::of($domain)->trim()->lower();
                 });
                 $this->application->fqdn = $domains->implode(',');
             }
-            if ($this->application->dockerfile) {
+            if (data_get($this->application, 'dockerfile')) {
                 $port = get_port_from_dockerfile($this->application->dockerfile);
                 if ($port) {
                     $this->application->ports_exposes = $port;

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

@@ -21,7 +21,7 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob($this->application->destination->server));
+        dispatch(new ContainerStatusJob($this->application->destination->server));
         $this->application->refresh();
         $this->application->previews->each(function ($preview) {
             $preview->refresh();
@@ -64,7 +64,7 @@ class Heading extends Component
         foreach ($containers as $container) {
             $containerName = data_get($container, 'Names');
             if ($containerName) {
-                remote_process(
+                instant_remote_process(
                     ["docker rm -f {$containerName}"],
                     $this->application->destination->server
                 );

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

@@ -72,8 +72,7 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generateApplicationContainerName($this->application->uuid, $pull_request_id);
-            ray('Stopping container: ' . $container_name);
+            $container_name = generateApplicationContainerName($this->application, $pull_request_id);
 
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();

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

@@ -10,7 +10,7 @@ class CreateScheduledBackup extends Component
     public $database;
     public $frequency;
     public bool $enabled = true;
-    public bool $save_s3 = true;
+    public bool $save_s3 = false;
     public $s3_storage_id;
     public $s3s;
 

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

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

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

@@ -9,8 +9,9 @@ use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
 use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Route;
 use Livewire\Component;
-use Route;
+use Spatie\Url\Url;
 
 class GithubPrivateRepository extends Component
 {
@@ -40,21 +41,6 @@ class GithubPrivateRepository extends Component
     public string|null $publish_directory = null;
     protected int $page = 1;
 
-    // public function saveFromRedirect(string $route, ?Collection $parameters = null){
-    //     session()->forget('from');
-    //     if (!$parameters || $parameters->count() === 0) {
-    //         $parameters = $this->parameters;
-    //     }
-    //     $parameters = collect($parameters) ?? collect([]);
-    //     $queries = collect($this->query) ?? collect([]);
-    //     $parameters = $parameters->merge($queries);
-    //     session(['from'=> [
-    //         'back'=> $this->currentRoute,
-    //         'route' => $route,
-    //         'parameters' => $parameters
-    //     ]]);
-    //     return redirect()->route($route);
-    // }
 
     public function mount()
     {
@@ -110,6 +96,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
+        $this->selected_branch_name = data_get($this->branches,'0.name');
     }
 
     protected function loadBranchByPage()
@@ -159,6 +146,12 @@ class GithubPrivateRepository extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+
+            $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
+            $application->save();
+
             redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,

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

@@ -46,7 +46,6 @@ class GithubPrivateRepositoryDeployKey extends Component
     private GithubApp|GitlabApp|null $git_source = null;
     private string $git_host;
     private string $git_repository;
-    private string $git_branch;
 
     public function mount()
     {
@@ -96,7 +95,7 @@ class GithubPrivateRepositoryDeployKey extends Component
             $application_init = [
                 'name' => generate_random_name(),
                 'git_repository' => $this->git_repository,
-                'git_branch' => $this->git_branch,
+                'git_branch' => $this->branch,
                 'git_full_url' => "git@$this->git_host:$this->git_repository.git",
                 'build_pack' => 'nixpacks',
                 'ports_exposes' => $this->port,
@@ -112,6 +111,11 @@ class GithubPrivateRepositoryDeployKey extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+            $application->name = generate_random_name($application->uuid);
+            $application->save();
+
             return redirect()->route('project.application.configuration', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
@@ -127,11 +131,6 @@ class GithubPrivateRepositoryDeployKey extends Component
         $this->repository_url_parsed = Url::fromString($this->repository_url);
         $this->git_host = $this->repository_url_parsed->getHost();
         $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
-        if ($this->branch) {
-            $this->git_branch = $this->branch;
-        } else {
-            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
-        }
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();

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

@@ -26,6 +26,10 @@ class PublicGitRepository extends Component
     public string $git_branch = 'main';
     public int $rate_limit_remaining = 0;
     public $rate_limit_reset = 0;
+    private object $repository_url_parsed;
+    public GithubApp|GitlabApp|null $git_source = null;
+    public string $git_host;
+    public string $git_repository;
     protected $rules = [
         'repository_url' => 'required|url',
         'port' => 'required|numeric',
@@ -38,10 +42,6 @@ class PublicGitRepository extends Component
         'is_static' => 'static',
         'publish_directory' => 'publish directory',
     ];
-    private object $repository_url_parsed;
-    private GithubApp|GitlabApp|null $git_source = null;
-    private string $git_host;
-    private string $git_repository;
 
     public function mount()
     {
@@ -69,20 +69,22 @@ class PublicGitRepository extends Component
     {
         try {
             $this->branch_found = false;
-        $this->validate([
-            'repository_url' => 'required|url'
-        ]);
-        $this->get_git_source();
-        $this->get_branch();
-        $this->selected_branch = $this->git_branch;
+            $this->validate([
+                'repository_url' => 'required|url'
+            ]);
+            $this->get_git_source();
+            $this->get_branch();
+            $this->selected_branch = $this->git_branch;
         } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-        if (!$this->branch_found && $this->git_branch == 'main') {
-            try {
-                $this->git_branch = 'master';
-                $this->get_branch();
-            } catch (\Throwable $e) {
+            ray($e->getMessage());
+            if (!$this->branch_found && $this->git_branch == 'main') {
+                try {
+                    $this->git_branch = 'master';
+                    $this->get_branch();
+                } catch (\Throwable $e) {
+                    return handleError($e, $this);
+                }
+            } else {
                 return handleError($e, $this);
             }
         }
@@ -122,9 +124,6 @@ class PublicGitRepository extends Component
             $project_uuid = $this->parameters['project_uuid'];
             $environment_name = $this->parameters['environment_name'];
 
-            $this->get_git_source();
-            $this->git_branch = $this->selected_branch ?? $this->git_branch;
-
             $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
             if (!$destination) {
                 $destination = SwarmDocker::where('uuid', $destination_uuid)->first();
@@ -137,7 +136,6 @@ class PublicGitRepository extends Component
             $project = Project::where('uuid', $project_uuid)->first();
             $environment = $project->load(['environments'])->environments->where('name', $environment_name)->first();
 
-
             $application_init = [
                 'name' => generate_application_name($this->git_repository, $this->git_branch),
                 'git_repository' => $this->git_repository,
@@ -153,9 +151,15 @@ class PublicGitRepository extends Component
             ];
 
             $application = Application::create($application_init);
+
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+            $application->name = generate_application_name($this->git_repository, $this->git_branch, $application->uuid);
+            $application->save();
+
             return redirect()->route('project.application.configuration', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,

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

@@ -3,12 +3,12 @@
 namespace App\Http\Livewire\Project\New;
 
 use App\Models\Server;
-use App\Models\StandaloneDocker;
-use App\Models\SwarmDocker;
 use Countable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Http;
 use Livewire\Component;
-use Route;
 
 class Select extends Component
 {
@@ -17,16 +17,20 @@ class Select extends Component
     public string $type;
     public string $server_id;
     public string $destination_uuid;
-    public Countable|array|Server $servers;
+    public Countable|array|Server $servers = [];
     public Collection|array $standaloneDockers = [];
     public Collection|array $swarmDockers = [];
     public array $parameters;
+    public Collection|array $services = [];
+    public bool $loadingServices = true;
+    public bool $loading = false;
 
     public ?string $existingPostgresqlUrl = null;
 
     protected $queryString = [
         'server',
     ];
+
     public function mount()
     {
         $this->parameters = get_route_parameters();
@@ -44,9 +48,31 @@ class Select extends Component
     //         return handleError($e, $this);
     //     }
     // }
+
+    public function loadThings()
+    {
+        $this->loadServices();
+        $this->loadServers();
+    }
+    public function loadServices(bool $forceReload = false)
+    {
+        try {
+            if ($forceReload) {
+                Cache::forget('services');
+            }
+            $this->services = getServiceTemplates();
+            $this->emit('success', 'Successfully loaded services.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->loadingServices = false;
+        }
+    }
     public function setType(string $type)
     {
         $this->type = $type;
+        if ($this->loading) return;
+        $this->loading = true;
         if ($type === "existing-postgresql") {
             $this->current_step = $type;
             return;
@@ -83,10 +109,11 @@ class Select extends Component
             'environment_name' => $this->parameters['environment_name'],
             'type' => $this->type,
             'destination' => $this->destination_uuid,
+            'server_id' => $this->server_id,
         ]);
     }
 
-    public function load_servers()
+    public function loadServers()
     {
         $this->servers = Server::isUsable()->get();
     }

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

@@ -45,6 +45,9 @@ CMD ["nginx", "-g", "daemon off;"]
         $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
 
         $port = get_port_from_dockerfile($this->dockerfile);
+        if (!$port) {
+            $port = 80;
+        }
         $application = Application::create([
             'name' => 'dockerfile-' . new Cuid2(7),
             'repository_project_id' => 0,
@@ -56,11 +59,15 @@ CMD ["nginx", "-g", "daemon off;"]
             'environment_id' => $environment->id,
             'destination_id' => $destination->id,
             'destination_type' => $destination_class,
+            'health_check_enabled' => false,
             'source_id' => 0,
             'source_type' => GithubApp::class
         ]);
+
+        $fqdn = generateFqdn($destination->server, $application->uuid);
         $application->update([
-            'name' => 'dockerfile-' . $application->id
+            'name' => 'dockerfile-' . $application->uuid,
+            'fqdn' => $fqdn
         ]);
 
         redirect()->route('project.application.configuration', [

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

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Models\ServiceApplication;
+use Livewire\Component;
+
+class Application extends Component
+{
+    public ServiceApplication $application;
+    public $parameters;
+    protected $rules = [
+        'application.human_name' => 'nullable',
+        'application.description' => 'nullable',
+        'application.fqdn' => 'nullable',
+        'application.image' => 'required',
+        'application.exclude_from_status' => 'required|boolean',
+        'application.required_fqdn' => 'required|boolean',
+    ];
+    public function render()
+    {
+        return view('livewire.project.service.application');
+    }
+    public function instantSave()
+    {
+        $this->submit();
+    }
+
+    public function delete()
+    {
+        try {
+            $this->application->delete();
+            $this->emit('success', 'Application deleted successfully.');
+            return redirect()->route('project.service', $this->parameters);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->application->save();
+            updateCompose($this->application);
+            $this->emit('success', 'Application saved successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->emit('generateDockerCompose');
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Models\LocalFileVolume;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Livewire\Component;
+use Illuminate\Support\Str;
+
+class FileStorage extends Component
+{
+    public LocalFileVolume $fileStorage;
+    public ServiceApplication|ServiceDatabase $service;
+    public string $fs_path;
+    public ?string $workdir = null;
+
+    protected $rules = [
+        'fileStorage.is_directory' => 'required',
+        'fileStorage.fs_path' => 'required',
+        'fileStorage.mount_path' => 'required',
+        'fileStorage.content' => 'nullable',
+    ];
+    public function mount()
+    {
+        $this->service = $this->fileStorage->service;
+         if (Str::of($this->fileStorage->fs_path)->startsWith('.')) {
+            $this->workdir = $this->service->service->workdir();
+            $this->fs_path = Str::of($this->fileStorage->fs_path)->after('.');
+         } else {
+            $this->workdir = null;
+            $this->fs_path = $this->fileStorage->fs_path;
+         }
+    }
+    public function submit()
+    {
+        $original = $this->fileStorage->getOriginal();
+        try {
+            $this->validate();
+            if ($this->fileStorage->is_directory) {
+                $this->fileStorage->content = null;
+            }
+            $this->fileStorage->save();
+            $this->fileStorage->saveStorageOnServer($this->service);
+            $this->emit('success', 'File updated successfully.');
+        } catch (\Throwable $e) {
+            $this->fileStorage->setRawAttributes($original);
+            $this->fileStorage->save();
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        $this->submit();
+    }
+    public function render()
+    {
+        return view('livewire.project.service.file-storage');
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Jobs\ContainerStatusJob;
+use App\Models\Service;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public Service $service;
+    public $applications;
+    public $databases;
+    public array $parameters;
+    public array $query;
+    protected $rules = [
+        'service.docker_compose_raw' => 'required',
+        'service.docker_compose' => 'required',
+        'service.name' => 'required',
+        'service.description' => 'nullable',
+    ];
+    protected $listeners = ["saveCompose"];
+    public function render()
+    {
+        return view('livewire.project.service.index');
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->refreshStack();
+    }
+    public function saveCompose($raw)
+    {
+        $this->service->docker_compose_raw = $raw;
+        $this->submit();
+    }
+    public function checkStatus()
+    {
+        dispatch_sync(new ContainerStatusJob($this->service->server));
+        $this->refreshStack();
+    }
+    public function refreshStack()
+    {
+        $this->applications = $this->service->applications->sort();
+        $this->applications->each(function ($application) {
+            $application->refresh();
+        });
+        $this->databases = $this->service->databases->sort();
+        $this->databases->each(function ($database) {
+            $database->refresh();
+        });
+    }
+
+
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->service->save();
+            $this->service->parse();
+            $this->service->refresh();
+            $this->service->saveComposeConfigs();
+            $this->refreshStack();
+            $this->emit('refreshEnvs');
+            $this->emit('success', 'Service saved successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use Livewire\Component;
+
+class Modal extends Component
+{
+    public function serviceStatusUpdated() {
+        $this->emit('serviceStatusUpdated');
+    }
+    public function render()
+    {
+        return view('livewire.project.service.modal');
+    }
+}

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

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

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

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Service $service;
+    public ?ServiceApplication $serviceApplication = null;
+    public ?ServiceDatabase $serviceDatabase = null;
+    public array $parameters;
+    public array $query;
+    public Collection $services;
+    protected $listeners = ['generateDockerCompose'];
+
+    public function mount()
+    {
+        try {
+            $this->services = collect([]);
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            if ($service) {
+                $this->serviceApplication = $service;
+                $this->serviceApplication->getFilesFromServer();
+            } else {
+                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase->getFilesFromServer();
+            }
+            if (is_null($service)) {
+                throw new \Exception("Service not found.");
+            }
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+
+    }
+    public function generateDockerCompose()
+    {
+        $this->service->parse();
+    }
+    public function render()
+    {
+        return view('livewire.project.service.show');
+    }
+}

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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Project\Shared;
 
+use App\Actions\Service\StopService;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -19,13 +20,26 @@ class Danger extends Component
 
     public function delete()
     {
-        $destination = $this->resource->destination->getMorphClass()::where('id', $this->resource->destination->id)->first();
-
-        instant_remote_process(["docker rm -f {$this->resource->uuid}"], $destination->server);
-        $this->resource->delete();
-        return redirect()->route('project.resources', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'environment_name' => $this->parameters['environment_name']
-        ]);
+        // Should be queued
+        try {
+            if ($this->resource->type() === 'service') {
+                $server = $this->resource->server;
+                StopService::run($this->resource);
+            } else {
+                $destination = data_get($this->resource, 'destination');
+                if ($destination) {
+                    $destination = $this->resource->destination->getMorphClass()::where('id', $this->resource->destination->id)->first();
+                    $server = $destination->server;
+                }
+                instant_remote_process(["docker rm -f {$this->resource->uuid}"], $server);
+            }
+            $this->resource->delete();
+            return redirect()->route('project.resources', [
+                'project_uuid' => $this->parameters['project_uuid'],
+                'environment_name' => $this->parameters['environment_name']
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }

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

@@ -9,13 +9,13 @@ class Add extends Component
     public $parameters;
     public bool $is_preview = false;
     public string $key;
-    public string $value;
+    public ?string $value = null;
     public bool $is_build_time = false;
 
     protected $listeners = ['clearAddEnv' => 'clear'];
     protected $rules = [
         'key' => 'required|string',
-        'value' => 'required|string',
+        'value' => 'nullable',
         'is_build_time' => 'required|boolean',
     ];
     protected $validationAttributes = [
@@ -31,8 +31,8 @@ class Add extends Component
 
     public function submit()
     {
-        ray('submitting');
         $this->validate();
+        ray($this->key, $this->value, $this->is_build_time);
         $this->emitUp('submit', [
             'key' => $this->key,
             'value' => $this->value,

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

@@ -68,11 +68,16 @@ class All extends Component
                 $environment->value = $variable;
                 $environment->is_build_time = false;
                 $environment->is_preview = $isPreview ? true : false;
-                if ($this->resource->type() === 'application') {
-                    $environment->application_id = $this->resource->id;
-                }
-                if ($this->resource->type() === 'standalone-postgresql') {
-                    $environment->standalone_postgresql_id = $this->resource->id;
+                switch ($this->resource->type()) {
+                    case 'application':
+                        $environment->application_id = $this->resource->id;
+                        break;
+                    case 'standalone-postgresql':
+                        $environment->standalone_postgresql_id = $this->resource->id;
+                        break;
+                    case 'service':
+                        $environment->service_id = $this->resource->id;
+                        break;
                 }
                 $environment->save();
             }
@@ -104,11 +109,16 @@ class All extends Component
             $environment->is_build_time = $data['is_build_time'];
             $environment->is_preview = $data['is_preview'];
 
-            if ($this->resource->type() === 'application') {
-                $environment->application_id = $this->resource->id;
-            }
-            if ($this->resource->type() === 'standalone-postgresql') {
-                $environment->standalone_postgresql_id = $this->resource->id;
+            switch ($this->resource->type()) {
+                case 'application':
+                    $environment->application_id = $this->resource->id;
+                    break;
+                case 'standalone-postgresql':
+                    $environment->standalone_postgresql_id = $this->resource->id;
+                    break;
+                case 'service':
+                    $environment->service_id = $this->resource->id;
+                    break;
             }
             $environment->save();
             $this->refreshEnvs();

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

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

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

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use Livewire\Component;
+
+class HealthChecks extends Component
+{
+
+    public $resource;
+    protected $rules = [
+        'resource.health_check_enabled' => 'boolean',
+        'resource.health_check_path' => 'string',
+        'resource.health_check_port' => 'nullable|string',
+        'resource.health_check_host' => 'string',
+        'resource.health_check_method' => 'string',
+        'resource.health_check_return_code' => 'integer',
+        'resource.health_check_scheme' => 'string',
+        'resource.health_check_response_text' => 'nullable|string',
+        'resource.health_check_interval' => 'integer',
+        'resource.health_check_timeout' => 'integer',
+        'resource.health_check_retries' => 'integer',
+        'resource.health_check_start_period' => 'integer',
+
+    ];
+    public function instantSave()
+    {
+        $this->resource->save();
+        $this->emit('success', 'Health check updated.');
+
+
+    }
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->resource->save();
+            $this->emit('success', 'Health check updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.health-checks');
+    }
+}

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

@@ -2,13 +2,17 @@
 
 namespace App\Http\Livewire\Project\Shared\Storages;
 
+use App\Models\LocalPersistentVolume;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
-    public $storage;
-    public string|null $modalId = null;
+    public LocalPersistentVolume $storage;
+    public bool $isReadOnly = false;
+    public ?string $modalId = null;
+    public ?string $realName = null;
+
     protected $rules = [
         'storage.name' => 'required|string',
         'storage.mount_path' => 'required|string',
@@ -22,6 +26,11 @@ class Show extends Component
 
     public function mount()
     {
+        if ($this->storage->resource_type === 'App\Models\ServiceApplication' || $this->storage->resource_type === 'App\Models\ServiceDatabase') {
+            $this->realName = "{$this->storage->service->service->uuid}_{$this->storage->name}";
+        } else {
+            $this->realName = $this->storage->name;
+        }
         $this->modalId = new Cuid2(7);
     }
 

app/Http/Livewire/Server/Form.php

@@ -23,6 +23,7 @@ class Form extends Component
         'server.ip' => 'required',
         'server.user' => 'required',
         'server.port' => 'required',
+        'server.settings.is_cloudflare_tunnel' => 'required',
         'server.settings.is_reachable' => 'required',
         'server.settings.is_part_of_swarm' => 'required',
         'wildcard_domain' => 'nullable|url',
@@ -33,6 +34,7 @@ class Form extends Component
         'server.ip' => 'ip',
         'server.user' => 'user',
         'server.port' => 'port',
+        'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
         'server.settings.is_reachable' => 'is reachable',
         'server.settings.is_part_of_swarm' => 'is part of swarm'
     ];
@@ -42,7 +44,11 @@ class Form extends Component
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
-
+    public function instantSave() {
+        refresh_server_connection($this->server->privateKey);
+        $this->validateServer();
+        $this->server->settings->save();
+    }
     public function installDocker()
     {
         $this->dockerInstallationStarted = true;
@@ -58,21 +64,19 @@ class Form extends Component
                 $this->uptime = $uptime;
                 $this->emit('success', 'Server is reachable.');
             } else {
-                ray($this->uptime);
-
                 $this->emit('error', 'Server is not reachable.');
-
                 return;
             }
             if ($dockerVersion) {
                 $this->dockerVersion = $dockerVersion;
-                $this->emit('proxyStatusUpdated');
                 $this->emit('success', 'Docker Engine 23+ is installed!');
             } else {
                 $this->emit('error', 'No Docker Engine or older than 23 version installed.');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
+        } finally {
+            $this->emit('proxyStatusUpdated');
         }
     }
 

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

@@ -79,7 +79,7 @@ class ByIp extends Component
             $server->settings->save();
             return redirect()->route('server.show', $server->uuid);
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Server/Proxy.php

@@ -6,6 +6,7 @@ use App\Actions\Proxy\CheckConfiguration;
 use App\Actions\Proxy\SaveConfiguration;
 use App\Models\Server;
 use Livewire\Component;
+use Illuminate\Support\Str;
 
 class Proxy extends Component
 {
@@ -37,8 +38,8 @@ class Proxy extends Component
 
     public function select_proxy($proxy_type)
     {
-        $this->server->proxy->type = $proxy_type;
-        $this->server->proxy->status = 'exited';
+        $this->server->proxy->set('status', 'exited');
+        $this->server->proxy->set('type', $proxy_type);
         $this->server->save();
         $this->selectedProxy = $this->server->proxy->type;
         $this->emit('proxyStatusUpdated');
@@ -47,14 +48,14 @@ class Proxy extends Component
     public function submit()
     {
         try {
-            SaveConfiguration::run($this->server);
+            SaveConfiguration::run($this->server, $this->proxy_settings);
             $this->server->proxy->redirect_url = $this->redirect_url;
             $this->server->save();
 
             setup_default_redirect_404(redirect_url: $this->server->proxy->redirect_url, server: $this->server);
             $this->emit('success', 'Proxy configuration saved.');
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 
@@ -63,7 +64,7 @@ class Proxy extends Component
         try {
             $this->proxy_settings = CheckConfiguration::run($this->server, true);
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 
@@ -71,8 +72,14 @@ class Proxy extends Component
     {
         try {
             $this->proxy_settings = CheckConfiguration::run($this->server);
+            if (Str::of($this->proxy_settings)->contains('--api.dashboard=true') && Str::of($this->proxy_settings)->contains('--api.insecure=true')) {
+                $this->emit('traefikDashboardAvailable', true);
+            } else {
+                $this->emit('traefikDashboardAvailable', false);
+            }
+
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
-use App\Actions\Proxy\SaveConfiguration;
 use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
@@ -10,9 +9,16 @@ use Livewire\Component;
 class Deploy extends Component
 {
     public Server $server;
-    public $proxy_settings = null;
-    protected $listeners = ['proxyStatusUpdated'];
+    public bool $traefikDashboardAvailable = false;
+    public ?string $currentRoute = null;
+    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable'];
 
+    public function mount() {
+        $this->currentRoute = request()->route()->getName();
+    }
+    public function traefikDashboardAvailable(bool $data) {
+        $this->traefikDashboardAvailable = $data;
+    }
     public function proxyStatusUpdated()
     {
         $this->server->refresh();
@@ -20,17 +26,10 @@ class Deploy extends Component
     public function startProxy()
     {
         try {
-            if (
-                $this->server->proxy->last_applied_settings &&
-                $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
-            ) {
-                SaveConfiguration::run($this->server);
-            }
-
             $activity = StartProxy::run($this->server);
             $this->emit('newMonitorActivity', $activity->id);
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 

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

@@ -11,6 +11,8 @@ class Modal extends Component
 
     public function proxyStatusUpdated()
     {
+        $this->server->proxy->set('status', 'running');
+        $this->server->save();
         $this->emit('proxyStatusUpdated');
     }
 }

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

@@ -18,12 +18,10 @@ class Status extends Component
     public function getProxyStatus()
     {
         try {
-            if ($this->server->isFunctional()) {
-                dispatch_sync(new ContainerStatusJob($this->server));
-                $this->emit('proxyStatusUpdated');
-            }
+            dispatch_sync(new ContainerStatusJob($this->server));
+            $this->emit('proxyStatusUpdated');
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
     public function getProxyStatusWithNoti()

app/Http/Livewire/Server/ShowPrivateKey.php

@@ -14,8 +14,8 @@ class ShowPrivateKey extends Component
     public function setPrivateKey($newPrivateKeyId)
     {
         try {
-            refresh_server_connection($this->server->privateKey);
             $oldPrivateKeyId = $this->server->private_key_id;
+            refresh_server_connection($this->server->privateKey);
             $this->server->update([
                 'private_key_id' => $newPrivateKeyId
             ]);

app/Http/Livewire/Settings/Configuration.php

@@ -45,7 +45,12 @@ class Configuration extends Component
         $this->settings->do_not_track = $this->do_not_track;
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
-        $this->settings->next_channel = $this->next_channel;
+        if ($this->next_channel) {
+            $this->settings->next_channel = false;
+            $this->next_channel = false;
+        } else {
+            $this->settings->next_channel = $this->next_channel;
+        }
         $this->settings->save();
         $this->emit('success', 'Settings updated!');
     }
@@ -68,7 +73,7 @@ class Configuration extends Component
     {
         $file = "$this->dynamic_config_path/coolify.yaml";
         if (empty($this->settings->fqdn)) {
-            remote_process([
+            instant_remote_process([
                 "rm -f $file",
             ], $this->server);
         } else {
@@ -124,7 +129,6 @@ class Configuration extends Component
                 ];
             }
             $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-            dispatch(new ContainerStatusJob($this->server));
         }
     }
 
@@ -137,7 +141,7 @@ class Configuration extends Component
             $yaml;
 
         $base64 = base64_encode($yaml);
-        remote_process([
+        instant_remote_process([
             "mkdir -p $this->dynamic_config_path",
             "echo '$base64' | base64 -d > $file",
         ], $this->server);

app/Jobs/ApplicationDeploymentJob.php

@@ -37,6 +37,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private int $application_deployment_queue_id;
 
+    private bool $newVersionIsHealthy = false;
     private ApplicationDeploymentQueue $application_deployment_queue;
     private Application $application;
     private string $deployment_uuid;
@@ -88,7 +89,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->build_workdir = "{$this->workdir}" . rtrim($this->application->base_directory, '/');
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        $this->container_name = generateApplicationContainerName($this->application->uuid, $this->pull_request_id);
+        $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
@@ -96,7 +97,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $this->preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pull_request_id);
             if ($this->application->fqdn) {
-                $preview_fqdn = data_get($this->preview, 'fqdn');
+                if (data_get($this->preview, 'fqdn')) {
+                    $preview_fqdn = getFqdnWithoutPort(data_get($this->preview, 'fqdn'));
+                }
                 $template = $this->application->preview_url_template;
                 $url = Url::fromString($this->application->fqdn);
                 $host = $url->getHost();
@@ -166,6 +169,54 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         }
     }
+    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->application->git_repository}:build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+        $this->save_environment_variables();
+        $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
+        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 save_environment_variables()
+    {
+        $envs = collect([]);
+        foreach ($this->application->environment_variables as $env) {
+            $envs->push($env->key . '=' . $env->value);
+        }
+        $envs_base64 = base64_encode($envs->implode("\n"));
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
+            ],
+        );
+    }
     private function deploy_simple_dockerfile()
     {
         $dockerfile_base64 = base64_encode($this->application->dockerfile);
@@ -235,18 +286,33 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function rolling_update()
     {
-        $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 'Application has ports mapped to the host system, rolling update is not supported. Stopping current container.'"],
+            );
+            $this->stop_running_container(force: true);
+            $this->start_by_compose_file();
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'Rolling update started.'"],
+            );
+            $this->start_by_compose_file();
+            $this->health_check();
+            $this->stop_running_container();
+        }
     }
     private function health_check()
     {
+        if ($this->application->isHealthcheckDisabled()) {
+            $this->newVersionIsHealthy = true;
+            return;
+        }
         ray('New container name: ', $this->container_name);
         if ($this->container_name) {
             $counter = 0;
             $this->execute_remote_command(
                 [
-                    "echo 'Waiting for health check to pass on the new version of your application.'"
+                    "echo 'Waiting for healthcheck to pass on the new version of your application.'"
                 ],
             );
             while ($counter < $this->application->health_check_retries) {
@@ -263,11 +329,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 );
                 $this->execute_remote_command(
                     [
-                        "echo 'New version health check status: {$this->saved_outputs->get('health_check')}'"
+                        "echo 'New version healthcheck status: {$this->saved_outputs->get('health_check')}'"
                     ],
                 );
                 if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
+                    $this->newVersionIsHealthy = true;
                     $this->execute_remote_command(
+                        [
+                            "echo 'New version of your application is healthy.'"
+                        ],
                         [
                             "echo 'Rolling update completed.'"
                         ],
@@ -335,7 +405,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->execute_remote_command(
             [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} to {$this->workdir}. '"
+                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->workdir}. '"
             ],
             [
                 $this->importing_git_repository()
@@ -475,7 +545,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'container_name' => $this->container_name,
                     'restart' => RESTART_MODE,
                     'environment' => $environment_variables,
-                    'labels' => $this->set_labels_for_applications(),
+                    'labels' => generateLabelsApplication($this->application, $this->preview),
                     'expose' => $ports,
                     'networks' => [
                         $this->destination->network,
@@ -507,6 +577,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if ($this->application->isHealthcheckDisabled()) {
+            data_forget($docker_compose, 'services.' . $this->container_name . '.healthcheck');
+        }
         if (count($this->application->ports_mappings_array) > 0 && $this->pull_request_id === 0) {
             $docker_compose['services'][$this->container_name]['ports'] = $this->application->ports_mappings_array;
         }
@@ -577,75 +650,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         return $environment_variables->all();
     }
 
-    private function set_labels_for_applications()
-    {
-
-        $appId = $this->application->id;
-        if ($this->pull_request_id !== 0) {
-            $appId = $appId . '-pr-' . $this->pull_request_id;
-        }
-        $labels = [];
-        $labels[] = 'coolify.managed=true';
-        $labels[] = 'coolify.version=' . config('version');
-        $labels[] = 'coolify.applicationId=' . $appId;
-        $labels[] = 'coolify.type=application';
-        $labels[] = 'coolify.name=' . $this->application->name;
-        if ($this->pull_request_id !== 0) {
-            $labels[] = 'coolify.pullRequestId=' . $this->pull_request_id;
-        }
-        if ($this->application->fqdn) {
-            if ($this->pull_request_id !== 0) {
-                $domains = Str::of(data_get($this->preview, 'fqdn'))->explode(',');
-            } else {
-                $domains = Str::of(data_get($this->application, 'fqdn'))->explode(',');
-            }
-            if ($this->application->destination->server->proxy->type === ProxyTypes::TRAEFIK_V2->value) {
-                $labels[] = 'traefik.enable=true';
-                foreach ($domains as $domain) {
-                    $url = Url::fromString($domain);
-                    $host = $url->getHost();
-                    $path = $url->getPath();
-                    $schema = $url->getScheme();
-                    $slug = Str::slug($host . $path);
-
-                    $http_label = "{$this->container_name}-{$slug}-http";
-                    $https_label = "{$this->container_name}-{$slug}-https";
-
-                    if ($schema === 'https') {
-                        // Set labels for https
-                        $labels[] = "traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)";
-                        $labels[] = "traefik.http.routers.{$https_label}.entryPoints=https";
-                        $labels[] = "traefik.http.routers.{$https_label}.middlewares=gzip";
-                        if ($path !== '/') {
-                            $labels[] = "traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix";
-                            $labels[] = "traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}";
-                        }
-
-                        $labels[] = "traefik.http.routers.{$https_label}.tls=true";
-                        $labels[] = "traefik.http.routers.{$https_label}.tls.certresolver=letsencrypt";
-
-                        // Set labels for http (redirect to https)
-                        $labels[] = "traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)";
-                        $labels[] = "traefik.http.routers.{$http_label}.entryPoints=http";
-                        if ($this->application->settings->is_force_https_enabled) {
-                            $labels[] = "traefik.http.routers.{$http_label}.middlewares=redirect-to-https";
-                        }
-                    } else {
-                        // Set labels for http
-                        $labels[] = "traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)";
-                        $labels[] = "traefik.http.routers.{$http_label}.entryPoints=http";
-                        $labels[] = "traefik.http.routers.{$http_label}.middlewares=gzip";
-                        if ($path !== '/') {
-                            $labels[] = "traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix";
-                            $labels[] = "traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}";
-                        }
-                    }
-                }
-            }
-        }
-        return $labels;
-    }
-
     private function generate_healthcheck_commands()
     {
         if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile') {
@@ -653,15 +657,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return 'exit 0';
         }
         if (!$this->application->health_check_port) {
-            $this->application->health_check_port = $this->application->ports_exposes_array[0];
+            $health_check_port = $this->application->ports_exposes_array[0];
+        } else {
+            $health_check_port = $this->application->health_check_port;
         }
         if ($this->application->health_check_path) {
             $generated_healthchecks_commands = [
-                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}{$this->application->health_check_path} > /dev/null"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null"
             ];
         } else {
             $generated_healthchecks_commands = [
-                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}/"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/"
             ];
         }
         return implode(' ', $generated_healthchecks_commands);
@@ -718,20 +724,27 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
     }
 
-    private function stop_running_container()
+    private function stop_running_container(bool $force = false)
     {
         if ($this->currently_running_container_name) {
-            $this->execute_remote_command(
-                ["echo -n 'Removing old version of your application.'"],
-                [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
-            );
+            if ($this->newVersionIsHealthy || $force) {
+                $this->execute_remote_command(
+                    ["echo -n 'Removing old version of your application.'"],
+                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
+                );
+            } else {
+                $this->execute_remote_command(
+                    ["echo -n 'New version is not healthy, rolling back to the old version.'"],
+                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true],
+                );
+            }
         }
     }
 
     private function start_by_compose_file()
     {
         $this->execute_remote_command(
-            ["echo -n 'Rolling update started.'"],
+            ["echo -n 'Starting application (could take a while).'"],
             [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
         );
     }

app/Jobs/ContainerStatusJob.php

@@ -8,7 +8,6 @@ use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
 use App\Notifications\Server\Unreachable;
-use Arr;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
@@ -17,6 +16,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
@@ -28,11 +28,12 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function __construct(public Server $server)
     {
+        $this->handle();
     }
 
     public function middleware(): array
     {
-        return [new WithoutOverlapping($this->server->uuid)];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function uniqueId(): string
@@ -74,35 +75,42 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $containers = format_docker_command_output_to_json($containers);
             $applications = $this->server->applications();
             $databases = $this->server->databases();
+            $services = $this->server->services()->get();
             $previews = $this->server->previews();
-
+            $this->server->proxyType();
             /// Check if proxy is running
             $foundProxyContainer = $containers->filter(function ($value, $key) {
                 return data_get($value, 'Name') === '/coolify-proxy';
             })->first();
             if (!$foundProxyContainer) {
+                ray('Proxy not found, starting it...');
                 if ($this->server->isProxyShouldRun()) {
                     StartProxy::run($this->server, false);
                     $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
                 }
             } else {
-                ray($foundProxyContainer);
                 $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
                 $this->server->save();
+                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
             }
             $foundApplications = [];
             $foundApplicationPreviews = [];
             $foundDatabases = [];
+            $foundServices = [];
+
             foreach ($containers as $container) {
                 $containerStatus = data_get($container, 'State.Status');
+                $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
+                $containerStatus = "$containerStatus ($containerHealth)";
                 $labels = data_get($container, 'Config.Labels');
                 $labels = Arr::undot(format_docker_labels_to_json($labels));
                 $labelId = data_get($labels, 'coolify.applicationId');
                 if ($labelId) {
                     if (str_contains($labelId, '-pr-')) {
-                        $previewId = (int) Str::after($labelId, '-pr-');
+                        $pullRequestId = data_get($labels, 'coolify.pullRequestId');
                         $applicationId = (int) Str::before($labelId, '-pr-');
-                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $previewId)->first();
+                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
                             $statusFromDb = $preview->status;
@@ -139,7 +147,64 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                         }
                     }
                 }
+                $serviceLabelId = data_get($labels, 'coolify.serviceId');
+                if ($serviceLabelId) {
+                    $subType = data_get($labels, 'coolify.service.subType');
+                    $subId = data_get($labels, 'coolify.service.subId');
+                    $service = $services->where('id', $serviceLabelId)->first();
+                    if (!$service) {
+                        continue;
+                    }
+                    if ($subType === 'application') {
+                        $service =  $service->applications()->where('id', $subId)->first();
+                    } else {
+                        $service =  $service->databases()->where('id', $subId)->first();
+                    }
+                    if ($service) {
+                        $foundServices[] = "$service->id-$service->name";
+                        $statusFromDb = $service->status;
+                        if ($statusFromDb !== $containerStatus) {
+                            // ray('Updating status: ' . $containerStatus);
+                            $service->update(['status' => $containerStatus]);
+                        }
+                    }
+                }
             }
+            $exitedServices = collect([]);
+            foreach ($services as $service) {
+                $apps = $service->applications()->get();
+                $dbs = $service->databases()->get();
+                foreach ($apps as $app) {
+                    if (in_array("$app->id-$app->name", $foundServices)) {
+                        continue;
+                    } else {
+                        $exitedServices->push($app);
+                    }
+                }
+                foreach ($dbs as $db) {
+                    if (in_array("$db->id-$db->name", $foundServices)) {
+                        continue;
+                    } else {
+                        $exitedServices->push($db);
+                    }
+                }
+            }
+            $exitedServices = $exitedServices->unique('id');
+            foreach ($exitedServices as $exitedService) {
+                if ($exitedService->status === 'exited') {
+                    continue;
+                }
+                $name = data_get($exitedService, 'name');
+                $fqdn = data_get($exitedService, 'fqdn');
+                $containerName = $name ? "$name ($fqdn)" : $fqdn;
+                $project = data_get($service, 'environment.project');
+                $environment = data_get($service, 'environment');
+
+                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/service/" . $service->uuid;
+                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $exitedService->update(['status' => 'exited']);
+            }
+
             $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
             foreach ($notRunningApplications as $applicationId) {
                 $application = $applications->where('id', $applicationId)->first();
@@ -198,94 +263,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
-
-
-
-
-
-
-
-
-
-
-
-
-            return;
-            foreach ($applications as $application) {
-                $uuid = data_get($application, 'uuid');
-                $id = data_get($application, 'id');
-                $foundContainer = $containers->filter(function ($value, $key) use ($id, $uuid) {
-                    $labels = data_get($value, 'Config.Labels');
-                    $labels = Arr::undot(format_docker_labels_to_json($labels));
-                    $labelId = data_get($labels, 'coolify.applicationId');
-                    if ($labelId == $id) {
-                        return $value;
-                    }
-                    $isPR = Str::startsWith(data_get($value, 'Name'), "/$uuid");
-                    $isPR = Str::contains(data_get($value, 'Name'), "-pr-");
-                    if ($isPR) {
-                        return false;
-                    }
-                    return $value;
-                })->first();
-                if ($foundContainer) {
-                    $containerStatus = data_get($foundContainer, 'State.Status');
-                    $databaseStatus = data_get($application, 'status');
-                    if ($containerStatus !== $databaseStatus) {
-                        $application->update(['status' => $containerStatus]);
-                    }
-                } else {
-                    $databaseStatus = data_get($application, 'status');
-                    if ($databaseStatus !== 'exited') {
-                        $application->update(['status' => 'exited']);
-                        $name = data_get($application, 'name');
-                        $fqdn = data_get($application, 'fqdn');
-                        $containerName = $name ? "$name ($fqdn)" : $fqdn;
-                        $project = data_get($application, 'environment.project');
-                        $environment = data_get($application, 'environment');
-                        $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $application->uuid;
-                        $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
-                    }
-                }
-                $previews = $application->previews;
-                foreach ($previews as $preview) {
-                    $foundContainer = $containers->filter(function ($value, $key) use ($id, $uuid, $preview) {
-                        $labels = data_get($value, 'Config.Labels');
-                        $labels = Arr::undot(format_docker_labels_to_json($labels));
-                        $labelId = data_get($labels, 'coolify.applicationId');
-                        if ($labelId == "$id-pr-{$preview->id}") {
-                            return $value;
-                        }
-                        return Str::startsWith(data_get($value, 'Name'), "/$uuid-pr-{$preview->id}");
-                    })->first();
-                }
-            }
-            foreach ($databases as $database) {
-                $uuid = data_get($database, 'uuid');
-                $foundContainer = $containers->filter(function ($value, $key) use ($uuid) {
-                    return Str::startsWith(data_get($value, 'Name'), "/$uuid");
-                })->first();
-
-                if ($foundContainer) {
-                    $containerStatus = data_get($foundContainer, 'State.Status');
-                    $databaseStatus = data_get($database, 'status');
-                    if ($containerStatus !== $databaseStatus) {
-                        $database->update(['status' => $containerStatus]);
-                    }
-                } else {
-                    $databaseStatus = data_get($database, 'status');
-                    if ($databaseStatus !== 'exited') {
-                        $database->update(['status' => 'exited']);
-                        $name = data_get($database, 'name');
-                        $containerName = $name;
-                        $project = data_get($database, 'environment.project');
-                        $environment = data_get($database, 'environment');
-                        $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
-                        $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
-                    }
-                }
-            }
-            // TODO Monitor other containers not managed by Coolify
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());

app/Jobs/DatabaseBackupJob.php

@@ -61,7 +61,8 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
-            if (data_get($this->database, 'status') !== 'running') {
+            $status = Str::of(data_get($this->database, 'status'));
+            if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
@@ -89,7 +90,6 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $this->upload_to_s3();
             }
             $this->save_backup_logs();
-            // TODO: Notify user
         } catch (\Throwable $e) {
             ray($e->getMessage());
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());

app/Jobs/DockerCleanupJob.php

@@ -16,65 +16,66 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 500;
+    public $timeout = 1000;
     public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
     public function middleware(): array
     {
-        return [
-            (new WithoutOverlapping("dockerimagejobs"))->shared(),
-        ];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
-    public function __construct()
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+    public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $queue = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
-        if ($queue->count() > 0) {
+        $queuedCount = 0;
+        $this->server->applications()->each(function ($application) use ($queuedCount) {
+            $count = data_get($application->deployments(), 'count', 0);
+            $queuedCount += $count;
+        });
+        if ($queuedCount > 0) {
             ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
             return;
         }
         try {
-            // ray()->showQueries()->color('orange');
-            $servers = Server::all();
-            foreach ($servers as $server) {
-                if (
-                    !$server->isFunctional()
-                ) {
-                    continue;
-                }
-                if (isDev()) {
-                    $this->dockerRootFilesystem = "/";
+            if (!$this->server->isFunctional()) {
+                return;
+            }
+            if (isDev()) {
+                $this->dockerRootFilesystem = "/";
+            } else {
+                $this->dockerRootFilesystem = instant_remote_process(
+                    [
+                        "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
+                    ],
+                    $this->server,
+                    false
+                );
+            }
+            if (!$this->dockerRootFilesystem) {
+                return;
+            }
+            $this->usageBefore = $this->getFilesystemUsage();
+            if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
+                ray('Cleaning up ' . $this->server->name)->color('orange');
+                instant_remote_process(['docker image prune -af'], $this->server);
+                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
+                instant_remote_process(['docker builder prune -af'], $this->server);
+                $usageAfter = $this->getFilesystemUsage();
+                if ($usageAfter <  $this->usageBefore) {
+                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
-                    $this->dockerRootFilesystem = instant_remote_process(
-                        [
-                            "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
-                        ],
-                        $server,
-                        false
-                    );
-                }
-                if (!$this->dockerRootFilesystem) {
-                    continue;
-                }
-                $this->usageBefore = $this->getFilesystemUsage($server);
-                if ($this->usageBefore >= $server->settings->cleanup_after_percentage) {
-                    ray('Cleaning up ' . $server->name)->color('orange');
-                    instant_remote_process(['docker image prune -af'], $server);
-                    instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server);
-                    instant_remote_process(['docker builder prune -af'], $server);
-                    $usageAfter = $this->getFilesystemUsage($server);
-                    if ($usageAfter <  $this->usageBefore) {
-                        ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name)->color('orange');
-                        send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name);
-                    } else {
-                        ray('DockerCleanupJob failed to save disk space on ' . $server->name)->color('orange');
-                    }
-                } else {
-                    ray('No need to clean up ' . $server->name)->color('orange');
+                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
                 }
+            } else {
+                ray('No need to clean up ' . $this->server->name)->color('orange');
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
@@ -83,8 +84,8 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
         }
     }
 
-    private function getFilesystemUsage(Server $server)
+    private function getFilesystemUsage()
     {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $server, false);
+        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
     }
 }

app/Models/Application.php

@@ -19,7 +19,13 @@ class Application extends BaseModel
         });
         static::deleting(function ($application) {
             $application->settings()->delete();
+            $storages =  $application->persistentStorages()->get();
+            foreach ($storages as $storage) {
+                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server);
+            }
             $application->persistentStorages()->delete();
+            $application->environment_variables()->delete();
+            $application->environment_variables_preview()->delete();
         });
     }
 
@@ -206,13 +212,9 @@ class Application extends BaseModel
     {
         if (data_get($this, 'private_key_id')) {
             return 'deploy_key';
-        }
-        if (data_get($this, 'source')) {
+        } else if (data_get($this, 'source')) {
             return 'source';
         }
-        if (data_get($this, 'private_key_id')) {
-            return 'deploy_key';
-        }
         throw new \Exception('No deployment type found');
     }
     public function could_set_build_commands(): bool
@@ -224,9 +226,17 @@ class Application extends BaseModel
     }
     public function git_based(): bool
     {
-        if ($this->dockerfile || $this->build_pack === 'dockerfile') {
+        if ($this->dockerfile) {
             return false;
         }
         return true;
     }
+    public function isHealthcheckDisabled(): bool
+    {
+        if (data_get($this, 'dockerfile') || data_get($this, 'build_pack') === 'dockerfile' || data_get($this,'health_check_enabled') === false) {
+            ray('dockerfile');
+            return true;
+        }
+        return false;
+    }
 }

app/Models/Environment.php

@@ -14,7 +14,7 @@ class Environment extends Model
 
     public function can_delete_environment()
     {
-        return $this->applications()->count() == 0 && $this->postgresqls()->count() == 0;
+        return $this->applications()->count() == 0 && $this->postgresqls()->count() == 0 && $this->services()->count() == 0;
     }
 
     public function applications()

app/Models/EnvironmentVariable.php

@@ -33,18 +33,23 @@ class EnvironmentVariable extends Model
             }
         });
     }
-
+    public function service() {
+        return $this->belongsTo(Service::class);
+    }
     protected function value(): Attribute
     {
         return Attribute::make(
-            get: fn (string $value) => $this->get_environment_variables($value),
-            set: fn (string $value) => $this->set_environment_variables($value),
+            get: fn (?string $value = null) => $this->get_environment_variables($value),
+            set: fn (?string $value = null) => $this->set_environment_variables($value),
         );
     }
 
-    private function get_environment_variables(string $environment_variable): string|null
+    private function get_environment_variables(?string $environment_variable = null): string|null
     {
         // $team_id = currentTeam()->id;
+        if (!$environment_variable) {
+            return null;
+        }
         $environment_variable = trim(decrypt($environment_variable));
         if (Str::startsWith($environment_variable, '{{') && Str::endsWith($environment_variable, '}}') && Str::contains($environment_variable, 'global.')) {
             $variable = Str::after($environment_variable, 'global.');
@@ -57,8 +62,11 @@ class EnvironmentVariable extends Model
         return $environment_variable;
     }
 
-    private function set_environment_variables(string $environment_variable): string|null
+    private function set_environment_variables(?string $environment_variable = null): string|null
     {
+        if (is_null($environment_variable) && $environment_variable == '') {
+            return null;
+        }
         $environment_variable = trim($environment_variable);
         return encrypt($environment_variable);
     }
@@ -69,4 +77,5 @@ class EnvironmentVariable extends Model
             set: fn (string $value) => Str::of($value)->trim(),
         );
     }
+
 }

app/Models/GithubApp.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 
 class GithubApp extends BaseModel
 {
+
     protected $guarded = [];
     protected $appends = ['type'];
     protected $casts = [
@@ -17,6 +18,7 @@ class GithubApp extends BaseModel
         'webhook_secret',
     ];
 
+
     static public function public()
     {
         return GithubApp::whereTeamId(currentTeam()->id)->whereisPublic(true)->whereNotNull('app_id')->get();
@@ -34,6 +36,7 @@ class GithubApp extends BaseModel
             if ($applications_count > 0) {
                 throw new \Exception('You cannot delete this GitHub App because it is in use by ' . $applications_count . ' application(s). Delete them first.');
             }
+            $github_app->privateKey()->delete();
         });
     }
 

app/Models/LocalFileVolume.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Str;
+
+class LocalFileVolume extends BaseModel
+{
+    use HasFactory;
+    protected $guarded = [];
+
+    public function service()
+    {
+        return $this->morphTo('resource');
+    }
+    public function saveStorageOnServer(ServiceApplication|ServiceDatabase $service)
+    {
+        $workdir = $service->service->workdir();
+        $server = $service->service->server;
+        $commands = collect([
+            "mkdir -p $workdir > /dev/null 2>&1 || true",
+            "cd $workdir"
+        ]);
+        $fileVolume = $this;
+        $path = Str::of(data_get($fileVolume, 'fs_path'));
+        $content = data_get($fileVolume, 'content');
+        if ($path->startsWith('.')) {
+            $path = $path->after('.');
+            $path = $workdir . $path;
+        }
+        $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
+        $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
+        ray($isFile);
+        if ($isFile == 'OK' && $fileVolume->is_directory) {
+            throw new \Exception("File $path is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.");
+        } else if ($isDir == 'OK' && !$fileVolume->is_directory) {
+            throw new \Exception("File $path is a directory on the server, but you are trying to mark it as a file. Please delete the directory on the server or mark it as directory.");
+        }
+        if (($isFile == 'NOK' && !$fileVolume->is_directory) || $isFile == 'OK') {
+            $rootDir = Str::of($path)->dirname();
+            $commands->push("mkdir -p $rootDir > /dev/null 2>&1 || true");
+            $commands->push("touch $path > /dev/null 2>&1 || true");
+            if ($content) {
+                $content = base64_encode($content);
+                $commands->push("echo '$content' | base64 -d > $path");
+            }
+        } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
+            $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
+        }
+        return instant_remote_process($commands, $server);
+    }
+}

app/Models/LocalPersistentVolume.php

@@ -12,12 +12,19 @@ class LocalPersistentVolume extends Model
 
     public function application()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
+    }
+    public function service()
+    {
+        return $this->morphTo('resource');
+    }
+    public function database()
+    {
+        return $this->morphTo('resource');
     }
-
     public function standalone_postgresql()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
     }
 
     protected function name(): Attribute

app/Models/Server.php

@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
 use Illuminate\Database\Eloquent\Builder;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
@@ -76,6 +78,16 @@ class Server extends BaseModel
         return $this->hasOne(ServerSetting::class);
     }
 
+    public function proxyType()
+    {
+        $type = $this->proxy->get('type');
+        if (is_null($type)) {
+            $this->proxy->type = ProxyTypes::TRAEFIK_V2->value;
+            $this->proxy->status = ProxyStatus::EXITED->value;
+            $this->save();
+        }
+        return $this->proxy->get('type');
+    }
     public function scopeWithProxy(): Builder
     {
         return $this->proxy->modelScope();
@@ -104,8 +116,13 @@ class Server extends BaseModel
             return $standaloneDocker->applications;
         })->flatten();
     }
+    public function services()
+    {
+        return $this->hasMany(Service::class);
+    }
 
-    public function previews() {
+    public function previews()
+    {
         return $this->destinations()->map(function ($standaloneDocker) {
             return $standaloneDocker->applications->map(function ($application) {
                 return $application->previews;
@@ -147,6 +164,9 @@ class Server extends BaseModel
     public function isProxyShouldRun()
     {
         $shouldRun = false;
+        if ($this->proxyType() === ProxyTypes::NONE->value) {
+            return false;
+        }
         foreach ($this->applications() as $application) {
             if (data_get($application, 'fqdn')) {
                 $shouldRun = true;
@@ -161,7 +181,8 @@ class Server extends BaseModel
         }
         return $shouldRun;
     }
-    public function isFunctional() {
+    public function isFunctional()
+    {
         return $this->settings->is_reachable && $this->settings->is_usable;
     }
 }

app/Models/Service.php

@@ -0,0 +1,511 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use Symfony\Component\Yaml\Yaml;
+use Illuminate\Support\Str;
+use Spatie\Url\Url;
+
+class Service extends BaseModel
+{
+    use HasFactory;
+    protected $guarded = [];
+
+    protected static function booted()
+    {
+        static::deleted(function ($service) {
+            $storagesToDelete = collect([]);
+            foreach ($service->applications()->get() as $application) {
+                $storages = $application->persistentStorages()->get();
+                foreach ($storages as $storage) {
+                    $storagesToDelete->push($storage);
+                }
+                $application->persistentStorages()->delete();
+            }
+            foreach ($service->databases()->get() as $database) {
+                $storages = $database->persistentStorages()->get();
+                foreach ($storages as $storage) {
+                    $storagesToDelete->push($storage);
+                }
+                $database->persistentStorages()->delete();
+            }
+            $service->environment_variables()->delete();
+            $service->applications()->delete();
+            $service->databases()->delete();
+            if ($storagesToDelete->count() > 0) {
+                $storagesToDelete->each(function ($storage) use ($service) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $service->server, false);
+                });
+            }
+            instant_remote_process(["docker network rm {$service->uuid}"], $service->server, false);
+        });
+    }
+    public function type()
+    {
+        return 'service';
+    }
+
+    public function documentation()
+    {
+        $services = Cache::get('services', []);
+        $service = data_get($services, Str::of($this->name)->beforeLast('-')->value, []);
+        return data_get($service, 'documentation', config('constants.docs.base_url'));
+    }
+    public function applications()
+    {
+        return $this->hasMany(ServiceApplication::class);
+    }
+    public function databases()
+    {
+        return $this->hasMany(ServiceDatabase::class);
+    }
+    public function environment()
+    {
+        return $this->belongsTo(Environment::class);
+    }
+    public function server()
+    {
+        return $this->belongsTo(Server::class);
+    }
+    public function byName(string $name)
+    {
+        $app = $this->applications()->whereName($name)->first();
+        if ($app) {
+            return $app;
+        }
+        $db = $this->databases()->whereName($name)->first();
+        if ($db) {
+            return $db;
+        }
+        return null;
+    }
+    public function environment_variables(): HasMany
+    {
+        return $this->hasMany(EnvironmentVariable::class)->orderBy('key', 'asc');
+    }
+    public function workdir()
+    {
+        return service_configuration_dir() . "/{$this->uuid}";
+    }
+    public function saveComposeConfigs()
+    {
+        $workdir = $this->workdir();
+        $commands[] = "mkdir -p $workdir";
+        $commands[] = "cd $workdir";
+
+        $docker_compose_base64 = base64_encode($this->docker_compose);
+        $commands[] = "echo $docker_compose_base64 | base64 -d > docker-compose.yml";
+        $envs = $this->environment_variables()->get();
+        $commands[] = "rm -f .env || true";
+        foreach ($envs as $env) {
+            $commands[] = "echo '{$env->key}={$env->value}' >> .env";
+        }
+        if ($envs->count() === 0) {
+            $commands[] = "touch .env";
+        }
+        instant_remote_process($commands, $this->server);
+    }
+
+    public function parse(bool $isNew = false): Collection
+    {
+        // ray()->clearAll();
+        if ($this->docker_compose_raw) {
+            try {
+                $yaml = Yaml::parse($this->docker_compose_raw);
+            } catch (\Exception $e) {
+                throw new \Exception($e->getMessage());
+            }
+
+            $topLevelVolumes = collect(data_get($yaml, 'volumes', []));
+            $topLevelNetworks = collect(data_get($yaml, 'networks', []));
+            $dockerComposeVersion = data_get($yaml, 'version') ?? '3.8';
+            $services = data_get($yaml, 'services');
+            $definedNetwork = $this->uuid;
+
+            $generatedServiceFQDNS = collect([]);
+
+            $services = collect($services)->map(function ($service, $serviceName) use ($topLevelVolumes, $topLevelNetworks, $definedNetwork, $isNew, $generatedServiceFQDNS) {
+                $serviceVolumes = collect(data_get($service, 'volumes', []));
+                $servicePorts = collect(data_get($service, 'ports', []));
+                $serviceNetworks = collect(data_get($service, 'networks', []));
+                $serviceVariables = collect(data_get($service, 'environment', []));
+                $serviceLabels = collect(data_get($service, 'labels', []));
+
+                $containerName = "$serviceName-{$this->uuid}";
+
+                // Decide if the service is a database
+                $isDatabase = false;
+                $image = data_get_str($service, 'image');
+                if ($image->contains(':')) {
+                    $image = Str::of($image);
+                } else {
+                    $image = Str::of($image)->append(':latest');
+                }
+                $imageName = $image->before(':');
+
+                if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
+                    $isDatabase = true;
+                }
+                data_set($service, 'is_database', $isDatabase);
+
+                // Create new serviceApplication or serviceDatabase
+                if ($isDatabase) {
+                    if ($isNew) {
+                        $savedService = ServiceDatabase::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    } else {
+                        $savedService = ServiceDatabase::where([
+                            'name' => $serviceName,
+                            'service_id' => $this->id
+                        ])->first();
+                    }
+                } else {
+                    if ($isNew) {
+                        $savedService = ServiceApplication::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    } else {
+                        $savedService = ServiceApplication::where([
+                            'name' => $serviceName,
+                            'service_id' => $this->id
+                        ])->first();
+                    }
+                }
+                if (is_null($savedService)) {
+                    if ($isDatabase) {
+                        $savedService = ServiceDatabase::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    } else {
+                        $savedService = ServiceApplication::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    }
+                }
+
+                // Check if image changed
+                if ($savedService->image !== $image) {
+                    $savedService->image = $image;
+                    $savedService->save();
+                }
+
+                // Collect/create/update networks
+                if ($serviceNetworks->count() > 0) {
+                    foreach ($serviceNetworks as $networkName => $networkDetails) {
+                        $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
+                            return $value == $networkName || $key == $networkName;
+                        });
+                        if (!$networkExists) {
+                            $topLevelNetworks->put($networkDetails, null);
+                        }
+                    }
+                }
+
+                // Collect/create/update ports
+                $collectedPorts = collect([]);
+                if ($servicePorts->count() > 0) {
+                    foreach ($servicePorts as $sport) {
+                        if (is_string($sport) || is_numeric($sport)) {
+                            $collectedPorts->push($sport);
+                        }
+                        if (is_array($sport)) {
+                            $target = data_get($sport, 'target');
+                            $published = data_get($sport, 'published');
+                            $protocol = data_get($sport, 'protocol');
+                            $collectedPorts->push("$target:$published/$protocol");
+                        }
+                    }
+                }
+                $savedService->ports = $collectedPorts->implode(',');
+                $savedService->save();
+
+                // Add Coolify specific networks
+                $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
+                    return $value == $definedNetwork;
+                });
+                if (!$definedNetworkExists) {
+                    $topLevelNetworks->put($definedNetwork, [
+                        'name' => $definedNetwork,
+                        'external' => true
+                    ]);
+                }
+                $networks = $serviceNetworks->toArray();
+                $networks = array_merge($networks, [$definedNetwork]);
+                data_set($service, 'networks', $networks);
+
+                // Collect/create/update volumes
+                if ($serviceVolumes->count() > 0) {
+                    foreach ($serviceVolumes as $volume) {
+                        $type = null;
+                        $source = null;
+                        $target = null;
+                        $content = null;
+                        $isDirectory = false;
+                        if (is_string($volume)) {
+                            $source = Str::of($volume)->before(':');
+                            $target = Str::of($volume)->after(':')->beforeLast(':');
+                            if ($source->startsWith('./') || $source->startsWith('/') || $source->startsWith('~')) {
+                                $type = Str::of('bind');
+                            } else {
+                                $type = Str::of('volume');
+                            }
+                        } else if (is_array($volume)) {
+                            $type = data_get_str($volume, 'type');
+                            $source = data_get_str($volume, 'source');
+                            $target = data_get_str($volume, 'target');
+                            $content = data_get($volume, 'content');
+                            $isDirectory = (bool) data_get($volume, 'isDirectory', false);
+                            $foundConfig = $savedService->fileStorages()->whereMountPath($target)->first();
+                            if ($foundConfig) {
+                                $content = data_get($foundConfig, 'content');
+                                $isDirectory = (bool) data_get($foundConfig, 'is_directory');
+                            }
+                        }
+                        if ($type->value() === 'bind') {
+                            if ($source->value() === "/var/run/docker.sock") {
+                                continue;
+                            }
+                            if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
+                                continue;
+                            }
+                            LocalFileVolume::updateOrCreate(
+                                [
+                                    'mount_path' => $target,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ],
+                                [
+                                    'fs_path' => $source,
+                                    'mount_path' => $target,
+                                    'content' => $content,
+                                    'is_directory' => $isDirectory,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ]
+                            );
+                        } else if ($type->value() === 'volume') {
+                            $topLevelVolumes->put($source->value(), null);
+                            LocalPersistentVolume::updateOrCreate(
+                                [
+                                    'mount_path' => $target,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ],
+                                [
+                                    'name' => Str::slug($source, '-'),
+                                    'mount_path' => $target,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ]
+                            );
+                        }
+                        $savedService->getFilesFromServer();
+                    }
+                }
+
+                // Add env_file with at least .env to the service
+                // $envFile = collect(data_get($service, 'env_file', []));
+                // if ($envFile->count() > 0) {
+                //     if (!$envFile->contains('.env')) {
+                //         $envFile->push('.env');
+                //     }
+                // } else {
+                //     $envFile = collect(['.env']);
+                // }
+                // data_set($service, 'env_file', $envFile->toArray());
+
+
+                // Get variables from the service
+                foreach ($serviceVariables as $variableName => $variable) {
+                    if (is_numeric($variableName)) {
+                        $variable = Str::of($variable);
+                        if ($variable->contains('=')) {
+                            // - SESSION_SECRET=123
+                            // - SESSION_SECRET=
+                            $key = $variable->before('=');
+                            $value = $variable->after('=');
+                        } else {
+                            // - SESSION_SECRET
+                            $key = $variable;
+                            $value = null;
+                        }
+                    } else {
+                        // SESSION_SECRET: 123
+                        // SESSION_SECRET:
+                        $key = Str::of($variableName);
+                        $value = Str::of($variable);
+                    }
+                    if ($key->startsWith('SERVICE_FQDN')) {
+                        if (is_null(data_get($savedService, 'fqdn'))) {
+                            $fqdn = generateFqdn($this->server, $containerName);
+                            if (substr_count($key->value(), '_') === 2 && $key->contains("=")) {
+                                $path = $value->value();
+                                if ($generatedServiceFQDNS->count() > 0) {
+                                    $alreadyGenerated = $generatedServiceFQDNS->has($key->value());
+                                    if ($alreadyGenerated) {
+                                        $fqdn = $generatedServiceFQDNS->get($key->value());
+                                    } else {
+                                        $generatedServiceFQDNS->put($key->value(), $fqdn);
+                                    }
+                                } else {
+                                    $generatedServiceFQDNS->put($key->value(), $fqdn);
+                                }
+                                $fqdn = "$fqdn$path";
+                            }
+                            if (!$isDatabase) {
+                                $savedService->fqdn = $fqdn;
+                                $savedService->save();
+                            }
+                        }
+                        continue;
+                    }
+                    if ($value?->startsWith('$')) {
+                        $value = Str::of(replaceVariables($value));
+                        $key = $value;
+                        $foundEnv = EnvironmentVariable::where([
+                            'key' => $key,
+                            'service_id' => $this->id,
+                        ])->first();
+                        if ($value->startsWith('SERVICE_')) {
+                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            $forService = $value->afterLast('_');
+                            $generatedValue = null;
+                            if ($command->value() === 'FQDN' || $command->value() === 'URL') {
+                                $fqdn = generateFqdn($this->server, $containerName);
+                                if ($foundEnv) {
+                                    $fqdn = data_get($foundEnv, 'value');
+                                } else {
+                                    EnvironmentVariable::create([
+                                        'key' => $key,
+                                        'value' => $fqdn,
+                                        'is_build_time' => false,
+                                        'service_id' => $this->id,
+                                        'is_preview' => false,
+                                    ]);
+                                }
+
+                                if (!$isDatabase) {
+                                    $savedService->fqdn = $fqdn;
+                                    $savedService->save();
+                                }
+                            } else {
+                                switch ($command) {
+                                    case 'PASSWORD':
+                                        $generatedValue = Str::password(symbols: false);
+                                        break;
+                                    case 'PASSWORD_64':
+                                        $generatedValue = Str::password(length: 64, symbols: false);
+                                        break;
+                                    case 'BASE64_64':
+                                        $generatedValue = Str::random(64);
+                                        break;
+                                    case 'BASE64_128':
+                                        $generatedValue = Str::random(128);
+                                        break;
+                                    case 'BASE64':
+                                        $generatedValue = Str::random(32);
+                                        break;
+                                    case 'USER':
+                                        $generatedValue = Str::random(16);
+                                        break;
+                                }
+
+                                if (!$foundEnv) {
+                                    EnvironmentVariable::create([
+                                        'key' => $key,
+                                        'value' => $generatedValue,
+                                        'is_build_time' => false,
+                                        'service_id' => $this->id,
+                                        'is_preview' => false,
+                                    ]);
+                                }
+                            }
+                        } else {
+                            if ($value->contains(':-')) {
+                                $key = $value->before(':');
+                                $defaultValue = $value->after(':-');
+                            } else if ($value->contains('-')) {
+                                $key = $value->before('-');
+                                $defaultValue = $value->after('-');
+                            } else if ($value->contains(':?')) {
+                                $key = $value->before(':');
+                                $defaultValue = $value->after(':?');
+                            } else if ($value->contains('?')) {
+                                $key = $value->before('?');
+                                $defaultValue = $value->after('?');
+                            } else {
+                                $key = $value;
+                                $defaultValue = null;
+                            }
+                            if ($foundEnv) {
+                                $defaultValue = data_get($foundEnv, 'value');
+                            }
+                            EnvironmentVariable::updateOrCreate([
+                                'key' => $key,
+                                'service_id' => $this->id,
+                            ], [
+                                'value' => $defaultValue,
+                                'is_build_time' => false,
+                                'service_id' => $this->id,
+                                'is_preview' => false,
+                            ]);
+                        }
+                    }
+                }
+
+                // Add labels to the service
+                $fqdns = collect(data_get($savedService, 'fqdns'));
+                $defaultLabels = defaultLabels($this->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
+                $serviceLabels = $serviceLabels->merge($defaultLabels);
+                if (!$isDatabase && $fqdns->count() > 0) {
+                    if ($fqdns) {
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, $containerName, true));
+                    }
+                }
+
+                data_set($service, 'labels', $serviceLabels->toArray());
+                data_forget($service, 'is_database');
+                data_set($service, 'restart', RESTART_MODE);
+                data_set($service, 'container_name', $containerName);
+                data_forget($service, 'volumes.*.content');
+                data_forget($service, 'volumes.*.isDirectory');
+
+                // Remove unnecessary variables from service.environment
+                $withoutServiceEnvs = collect([]);
+                collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
+                    if (!Str::of($key)->startsWith('$SERVICE_')) {
+                        $withoutServiceEnvs->put($key, $value);
+                    }
+                });
+                data_set($service, 'environment', $withoutServiceEnvs->toArray());
+                return $service;
+            });
+            $finalServices = [
+                'version' => $dockerComposeVersion,
+                'services' => $services->toArray(),
+                'volumes' => $topLevelVolumes->toArray(),
+                'networks' => $topLevelNetworks->toArray(),
+            ];
+            $this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
+            $this->docker_compose = Yaml::dump($finalServices, 10, 2);
+            $this->save();
+            $this->saveComposeConfigs();
+            return collect([]);
+        } else {
+            return collect([]);
+        }
+    }
+}

app/Models/ServiceApplication.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Cache;
+
+class ServiceApplication extends BaseModel
+{
+    use HasFactory;
+    protected $guarded = [];
+
+    public function type()
+    {
+        return 'service';
+    }
+    public function service()
+    {
+        return $this->belongsTo(Service::class);
+    }
+    public function persistentStorages()
+    {
+        return $this->morphMany(LocalPersistentVolume::class, 'resource');
+    }
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
+    public function fqdns(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => is_null($this->fqdn)
+                ? []
+                : explode(',', $this->fqdn),
+
+        );
+    }
+    public function getFilesFromServer()
+    {
+        getFilesystemVolumesFromServer($this);
+    }
+}

app/Models/ServiceDatabase.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Symfony\Component\Yaml\Yaml;
+
+class ServiceDatabase extends BaseModel
+{
+    use HasFactory;
+    protected $guarded = [];
+
+    public function type()
+    {
+        return 'service';
+    }
+    public function service()
+    {
+        return $this->belongsTo(Service::class);
+    }
+    public function persistentStorages()
+    {
+        return $this->morphMany(LocalPersistentVolume::class, 'resource');
+    }
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
+    public function getFilesFromServer()
+    {
+        getFilesystemVolumesFromServer($this);
+    }
+}

app/Models/StandaloneDocker.php

@@ -21,6 +21,11 @@ class StandaloneDocker extends BaseModel
         return $this->belongsTo(Server::class);
     }
 
+    public function services()
+    {
+        return $this->morphMany(Service::class, 'destination');
+    }
+
     public function attachedTo()
     {
         return $this->applications?->count() > 0 || $this->databases?->count() > 0;

app/Models/StandalonePostgresql.php

@@ -31,6 +31,7 @@ class StandalonePostgresql extends BaseModel
         static::deleted(function ($database) {
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
+            $database->environment_variables()->delete();
             instant_remote_process(['docker volume rm postgres-data-' . $database->uuid], $database->destination->server, false);
         });
     }

app/Notifications/Application/DeploymentFailed.php

@@ -14,7 +14,7 @@ class DeploymentFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public Application $application;
     public ?ApplicationPreview $preview = null;
 

app/Notifications/Application/DeploymentSuccess.php

@@ -14,7 +14,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public Application $application;
     public ApplicationPreview|null $preview = null;
 

app/Notifications/Application/StatusChanged.php

@@ -13,7 +13,7 @@ class StatusChanged extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
 
     public Application $application;
     public string $application_name;

app/Notifications/Channels/EmailChannel.php

@@ -6,27 +6,34 @@ use Exception;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Mail;
+use Log;
 
 class EmailChannel
 {
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
-        $this->bootConfigs($notifiable);
-        $recepients = $notifiable->getRecepients($notification);
+        try {
+            $this->bootConfigs($notifiable);
+            $recepients = $notifiable->getRecepients($notification);
+            ray($recepients);
+            if (count($recepients) === 0) {
+                throw new Exception('No email recipients found');
+            }
 
-        if (count($recepients) === 0) {
-            throw new Exception('No email recipients found');
+            $mailMessage = $notification->toMail($notifiable);
+            Mail::send(
+                [],
+                [],
+                fn (Message $message) => $message
+                    ->to($recepients)
+                    ->subject($mailMessage->subject)
+                    ->html((string)$mailMessage->render())
+            );
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            send_internal_notification("EmailChannel error: {$e->getMessage()}. Failed to send email to: " . implode(', ', $recepients) . " with subject: {$mailMessage->subject}");
+            throw $e;
         }
-
-        $mailMessage = $notification->toMail($notifiable);
-        Mail::send(
-            [],
-            [],
-            fn (Message $message) => $message
-                ->to($recepients)
-                ->subject($mailMessage->subject)
-                ->html((string)$mailMessage->render())
-        );
     }
 
     private function bootConfigs($notifiable): void

app/Notifications/Container/ContainerRestarted.php

@@ -12,7 +12,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
 
 
     public function __construct(public string $name, public Server $server, public ?string $url = null)

app/Notifications/Database/BackupFailed.php

@@ -3,8 +3,6 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use App\Notifications\Channels\DiscordChannel;
-use App\Notifications\Channels\EmailChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public string $name;
     public string $frequency;
 

app/Notifications/Database/BackupSuccess.php

@@ -3,8 +3,6 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use App\Notifications\Channels\DiscordChannel;
-use App\Notifications\Channels\EmailChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public string $name;
     public string $frequency;
 

app/Notifications/Internal/GeneralNotification.php

@@ -12,7 +12,7 @@ class GeneralNotification extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 5;
+    public $tries = 1;
     public function __construct(public string $message)
     {
     }

app/Notifications/Test.php

@@ -2,9 +2,6 @@
 
 namespace App\Notifications;
 
-use App\Notifications\Channels\DiscordChannel;
-use App\Notifications\Channels\EmailChannel;
-use App\Notifications\Channels\TelegramChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;

app/Providers/RouteServiceProvider.php

@@ -50,5 +50,8 @@ class RouteServiceProvider extends ServiceProvider
             }
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });
+        RateLimiter::for('5', function (Request $request) {
+            return Limit::perMinute(5)->by($request->user()?->id ?: $request->ip());
+        });
     }
 }

app/Traits/ExecuteRemoteCommand.php

@@ -36,7 +36,7 @@ trait ExecuteRemoteCommand
             $this->save = data_get($single_command, 'save');
 
             $remote_command = generateSshCommand($this->server, $command);
-            $process =  Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden) {
+            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden) {
                 $output = Str::of($output)->trim();
                 $new_log_entry = [
                     'command' => $command,

app/View/Components/Forms/Textarea.php

@@ -25,7 +25,7 @@ class Textarea extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $realtimeValidation = false,
-        public string      $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
+        public string      $defaultClass = "textarea leading-normal bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     ) {
         //
     }

app/View/Components/Services/Explanation.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\View\Components\Services;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Explanation extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.services.explanation');
+    }
+}

app/View/Components/Services/Links.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\View\Components\Services;
+
+use App\Models\Service;
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Collection;
+use Illuminate\View\Component;
+use Illuminate\Support\Str;
+
+class Links extends Component
+{
+    public Collection $links;
+    public function __construct(public Service $service)
+    {
+        $this->links = collect([]);
+        $service->applications()->get()->map(function ($application) {
+            if ($application->fqdn) {
+                $fqdns = collect(Str::of($application->fqdn)->explode(','));
+                $fqdns->map(function ($fqdn) {
+                    $this->links->push(getFqdnWithoutPort($fqdn));
+                });
+            }
+            if ($application->ports) {
+                $portsCollection = collect(Str::of($application->ports)->explode(','));
+                $portsCollection->map(function ($port) {
+                    if (Str::of($port)->contains(':')) {
+                        $hostPort = Str::of($port)->before(':');
+                    } else {
+                        $hostPort = $port;
+                    }
+                    $this->links->push(base_url(withPort:false) . ":{$hostPort}");
+                });
+            }
+        });
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.services.links');
+    }
+}

app/View/Components/Status/Index.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\View\Components\Status;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Index extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(
+        public string $status = 'exited',
+    )
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.status.index');
+    }
+}

app/View/Components/Status/Services.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\View\Components\Status;
+
+use App\Models\Service;
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Services extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(
+        public Service $service,
+        public string $complexStatus = 'exited',
+    ) {
+        $this->complexStatus = serviceStatus($service);
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.status.services');
+    }
+}

bootstrap/helpers/constants.php

@@ -10,3 +10,16 @@ const VALID_CRON_STRINGS = [
     'yearly' => '0 0 1 1 *',
 ];
 const RESTART_MODE = 'unless-stopped';
+
+const DATABASE_DOCKER_IMAGES = [
+    'mysql',
+    'mariadb',
+    'postgres',
+    'mongo',
+    'redis',
+    'memcached',
+    'couchdb',
+    'neo4j',
+    'influxdb',
+    'clickhouse/clickhouse-server'
+];

bootstrap/helpers/docker.php

@@ -1,11 +1,15 @@
 <?php
 
+use App\Enums\ProxyTypes;
 use App\Models\Application;
+use App\Models\ApplicationPreview;
 use App\Models\Server;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Spatie\Url\Url;
 
-function getCurrentApplicationContainerStatus(Server $server, int $id): Collection {
+function getCurrentApplicationContainerStatus(Server $server, int $id): Collection
+{
     $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
     if (!$containers) {
         return collect([]);
@@ -26,7 +30,7 @@ function format_docker_command_output_to_json($rawOutput): Collection
         ->map(fn ($outputLine) => json_decode($outputLine, true, flags: JSON_THROW_ON_ERROR));
 }
 
-function format_docker_labels_to_json(string|Array $rawOutput): Collection
+function format_docker_labels_to_json(string|array $rawOutput): Collection
 {
     if (is_array($rawOutput)) {
         return collect($rawOutput);
@@ -59,7 +63,8 @@ function format_docker_envs_to_json($rawOutput)
         return collect([]);
     }
 }
-function checkMinimumDockerEngineVersion($dockerVersion) {
+function checkMinimumDockerEngineVersion($dockerVersion)
+{
     $majorDockerVersion = Str::of($dockerVersion)->before('.')->value();
     if ($majorDockerVersion <= 22) {
         $dockerVersion = null;
@@ -72,8 +77,9 @@ function executeInDocker(string $containerId, string $command)
     // return "docker exec {$this->deployment_uuid} bash -c '{$command} |& tee -a /proc/1/fd/1; [ \$PIPESTATUS -eq 0 ] || exit \$PIPESTATUS'";
 }
 
-function getApplicationContainerStatus(Application $application) {
-    $server = data_get($application,'destination.server');
+function getApplicationContainerStatus(Application $application)
+{
+    $server = data_get($application, 'destination.server');
     $id = $application->id;
     if (!$server) {
         return 'exited';
@@ -98,16 +104,16 @@ function getContainerStatus(Server $server, string $container_id, bool $all_data
     return data_get($container[0], 'State.Status', 'exited');
 }
 
-function generateApplicationContainerName(string $uuid, int $pull_request_id = 0)
+function generateApplicationContainerName(Application $application, $pull_request_id = 0)
 {
     $now = now()->format('Hisu');
     if ($pull_request_id !== 0 && $pull_request_id !== null) {
-        return $uuid . '-pr-' . $pull_request_id;
+        return $application->uuid . '-pr-' . $pull_request_id;
     } else {
-        return $uuid . '-' . $now;
+        return $application->uuid . '-' . $now;
     }
 }
-function get_port_from_dockerfile($dockerfile): int
+function get_port_from_dockerfile($dockerfile): int|null
 {
     $dockerfile_array = explode("\n", $dockerfile);
     $found_exposed_port = null;
@@ -121,5 +127,101 @@ function get_port_from_dockerfile($dockerfile): int
     if ($found_exposed_port) {
         return (int)$found_exposed_port->value();
     }
-    return 80;
+    return null;
+}
+
+function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'application', $subType = null, $subId = null)
+{
+    $labels = collect([]);
+    $labels->push('coolify.managed=true');
+    $labels->push('coolify.version=' . config('version'));
+    $labels->push("coolify." . $type . "Id=" . $id);
+    $labels->push("coolify.type=$type");
+    $labels->push('coolify.name=' . $name);
+    if ($pull_request_id !== 0) {
+        $labels->push('coolify.pullRequestId=' . $pull_request_id);
+    }
+    if ($type === 'service') {
+        $labels->push('coolify.service.subId=' . $subId);
+        $labels->push('coolify.service.subType=' . $subType);
+    }
+    return $labels;
+}
+function fqdnLabelsForTraefik(Collection $domains, $container_name, $is_force_https_enabled)
+{
+    $labels = collect([]);
+    $labels->push('traefik.enable=true');
+    foreach ($domains as $domain) {
+        $url = Url::fromString($domain);
+        $host = $url->getHost();
+        $path = $url->getPath();
+        $schema = $url->getScheme();
+        $port = $url->getPort();
+        $slug = Str::slug($host . $path);
+
+        $http_label = "{$container_name}-{$slug}-http";
+        $https_label = "{$container_name}-{$slug}-https";
+
+        if ($schema === 'https') {
+            // Set labels for https
+            $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
+            $labels->push("traefik.http.routers.{$https_label}.entryPoints=https");
+            $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
+            if ($port) {
+                $labels->push("traefik.http.routers.{$https_label}.service={$https_label}");
+                $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
+            }
+            if ($path !== '/') {
+                $labels->push("traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix");
+                $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
+            }
+
+            $labels->push("traefik.http.routers.{$https_label}.tls=true");
+            $labels->push("traefik.http.routers.{$https_label}.tls.certresolver=letsencrypt");
+
+            // Set labels for http (redirect to https)
+            $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
+            $labels->push("traefik.http.routers.{$http_label}.entryPoints=http");
+            if ($is_force_https_enabled) {
+                $labels->push("traefik.http.routers.{$http_label}.middlewares=redirect-to-https");
+            }
+        } else {
+            // Set labels for http
+            $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
+            $labels->push("traefik.http.routers.{$http_label}.entryPoints=http");
+            $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip");
+            if ($port) {
+                $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
+                $labels->push("traefik.http.services.{$http_label}.loadbalancer.server.port=$port");
+            }
+            if ($path !== '/') {
+                $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix");
+                $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
+            }
+        }
+    }
+
+    return $labels;
+}
+function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null): array
+{
+
+    $pull_request_id = data_get($preview, 'pull_request_id', 0);
+    $container_name = generateApplicationContainerName($application, $pull_request_id);
+    $appId = $application->id;
+    if ($pull_request_id !== 0 && $pull_request_id !== null) {
+        $appId = $appId . '-pr-' . $pull_request_id;
+    }
+    $labels = collect([]);
+    $labels = $labels->merge(defaultLabels($appId, $container_name, $pull_request_id));
+    if ($application->fqdn) {
+        if ($pull_request_id !== 0) {
+            $domains = Str::of(data_get($preview, 'fqdn'))->explode(',');
+        } else {
+            $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
+        }
+        // Add Traefik labels no matter which proxy is selected
+        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $container_name, $application->settings->is_force_https_enabled));
+    }
+    return $labels->all();
 }

bootstrap/helpers/proxy.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Actions\Proxy\SaveConfiguration;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use Symfony\Component\Yaml\Yaml;
@@ -10,7 +11,23 @@ function get_proxy_path()
     $proxy_path = "$base_path/proxy";
     return $proxy_path;
 }
-
+function connectProxyToNetworks(Server $server)
+{
+    $networks = collect($server->standaloneDockers)->map(function ($docker) {
+        return $docker['network'];
+    })->unique();
+    if ($networks->count() === 0) {
+        $networks = collect(['coolify']);
+    }
+    $commands = $networks->map(function ($network) {
+        return [
+            "echo '####### Connecting coolify-proxy to $network network...'",
+            "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null || docker network create --attachable $network >/dev/null",
+            "docker network connect $network coolify-proxy >/dev/null 2>&1 || true",
+        ];
+    });
+    return $commands->flatten();
+}
 function generate_default_proxy_configuration(Server $server)
 {
     $proxy_path = get_proxy_path();
@@ -86,17 +103,18 @@ function generate_default_proxy_configuration(Server $server)
     if (isDev()) {
         $config['services']['traefik']['command'][] = "--log.level=debug";
     }
-    return Yaml::dump($config, 4, 2);
+    $config = Yaml::dump($config, 4, 2);
+    SaveConfiguration::run($server, $config);
+    return $config;
 }
 
 function setup_default_redirect_404(string|null $redirect_url, Server $server)
 {
-    ray('called');
     $traefik_dynamic_conf_path = get_proxy_path() . "/dynamic";
     $traefik_default_redirect_file = "$traefik_dynamic_conf_path/default_redirect_404.yaml";
-    ray($redirect_url);
     if (empty($redirect_url)) {
         instant_remote_process([
+            "mkdir -p $traefik_dynamic_conf_path",
             "rm -f $traefik_default_redirect_file",
         ], $server);
     } else {
@@ -156,7 +174,6 @@ function setup_default_redirect_404(string|null $redirect_url, Server $server)
             $yaml;
 
         $base64 = base64_encode($yaml);
-        ray("mkdir -p $traefik_dynamic_conf_path");
         instant_remote_process([
             "mkdir -p $traefik_dynamic_conf_path",
             "echo '$base64' | base64 -d > $traefik_default_redirect_file",

bootstrap/helpers/remoteProcess.php

@@ -16,14 +16,19 @@ use Illuminate\Support\Str;
 use Spatie\Activitylog\Contracts\Activity;
 
 function remote_process(
-    array   $command,
+    Collection|array   $command,
     Server  $server,
-    string  $type = ActivityTypes::INLINE->value,
+    ?string  $type = null,
     ?string $type_uuid = null,
     ?Model  $model = null,
     bool    $ignore_errors = false,
 ): Activity {
-
+    if (is_null($type)) {
+        $type = ActivityTypes::INLINE->value;
+    }
+    if ($command instanceof Collection) {
+        $command = $command->toArray();
+    }
     $command_string = implode("\n", $command);
     if (auth()->user()) {
         $teams = auth()->user()->teams->pluck('id');
@@ -31,7 +36,6 @@ function remote_process(
             throw new \Exception("User is not part of the team that owns this server");
         }
     }
-
     return resolve(PrepareCoolifyTask::class, [
         'remoteProcessArgs' => new CoolifyTaskArgs(
             server_uuid: $server->uuid,
@@ -81,6 +85,9 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     if ($isMux && config('coolify.mux_enabled')) {
         $ssh_command .= '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/ssh/mux/%h_%p_%r ';
     }
+    if (data_get($server,'settings.is_cloudflare_tunnel')) {
+        $ssh_command .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
+    }
     $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
     $ssh_command .= "-i {$privateKeyLocation} "
         . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
@@ -97,8 +104,11 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     // ray($ssh_command);
     return $ssh_command;
 }
-function instant_remote_process(array $command, Server $server, $throwError = true)
+function instant_remote_process(Collection|array $command, Server $server, $throwError = true)
 {
+    if ($command instanceof Collection) {
+        $command = $command->toArray();
+    }
     $command_string = implode("\n", $command);
     $ssh_command = generateSshCommand($server, $command_string);
     $process = Process::run($ssh_command);
@@ -179,7 +189,7 @@ function validateServer(Server $server, bool $throwError = false)
             ];
         }
         $server->settings->is_reachable = true;
-
+        instant_remote_process(["docker ps"], $server, $throwError);
         $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $server, $throwError);
         if (!$dockerVersion) {
             $dockerVersion = null;

bootstrap/helpers/services.php

@@ -0,0 +1,139 @@
+<?php
+
+use App\Models\EnvironmentVariable;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+
+function replaceRegex(?string $name = null)
+{
+    return "/\\\${?{$name}[^}]*}?|\\\${$name}\w+/";
+}
+function collectRegex(string $name)
+{
+    return "/{$name}\w+/";
+}
+function replaceVariables($variable)
+{
+    return $variable->replaceFirst('$', '')->replaceFirst('{', '')->replaceLast('}', '');
+}
+
+function serviceStatus(Service $service)
+{
+    $foundRunning = false;
+    $isDegraded = false;
+    $foundRestaring = false;
+    $applications = $service->applications;
+    $databases = $service->databases;
+    foreach ($applications as $application) {
+        if ($application->exclude_from_status) {
+            continue;
+        }
+        if (Str::of($application->status)->startsWith('running')) {
+            $foundRunning = true;
+        } else if (Str::of($application->status)->startsWith('restarting')) {
+            $foundRestaring = true;
+        } else {
+            $isDegraded = true;
+        }
+    }
+    foreach ($databases as $database) {
+        if ($database->exclude_from_status) {
+            continue;
+        }
+        if (Str::of($database->status)->startsWith('running')) {
+            $foundRunning = true;
+        } else if (Str::of($database->status)->startsWith('restarting')) {
+            $foundRestaring = true;
+        } else {
+            $isDegraded = true;
+        }
+    }
+    if ($foundRestaring) {
+        return 'degraded';
+    }
+    if ($foundRunning && !$isDegraded) {
+        return 'running';
+    } else if ($foundRunning && $isDegraded) {
+        return 'degraded';
+    } else if (!$foundRunning && !$isDegraded) {
+        return 'exited';
+    }
+    return 'exited';
+}
+function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneService)
+{
+    // TODO: make this async
+    try {
+        $workdir = $oneService->service->workdir();
+        $server = $oneService->service->server;
+        $fileVolumes = $oneService->fileStorages()->get();
+        $commands = collect([
+            "mkdir -p $workdir > /dev/null 2>&1 || true",
+            "cd "
+        ]);
+        instant_remote_process($commands, $server);
+        foreach ($fileVolumes as $fileVolume) {
+            $path = Str::of(data_get($fileVolume, 'fs_path'));
+            $content = data_get($fileVolume, 'content');
+            if ($path->startsWith('.')) {
+                $path = $path->after('.');
+                $fileLocation = $workdir . $path;
+            } else {
+                $fileLocation = $path;
+            }
+            $isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
+            $isDir = instant_remote_process(["test -d $fileLocation && echo OK || echo NOK"], $server);
+            if ($isFile == 'OK' && !$fileVolume->is_directory) {
+                $filesystemContent = instant_remote_process(["cat $fileLocation"], $server);
+                if (base64_encode($filesystemContent) != base64_encode($content)) {
+                    $fileVolume->content = $filesystemContent;
+                    $fileVolume->save();
+                }
+            } else {
+                if ($isDir == 'OK') {
+                    $fileVolume->content = null;
+                    $fileVolume->is_directory = true;
+                    $fileVolume->save();
+                } else {
+                    $fileVolume->content = null;
+                    $fileVolume->is_directory = false;
+                    $fileVolume->save();
+                }
+            }
+        }
+    } catch (\Throwable $e) {
+        return handleError($e);
+    }
+}
+function updateCompose($resource)
+{
+    try {
+        $name = data_get($resource, 'name');
+        $dockerComposeRaw = data_get($resource, 'service.docker_compose_raw');
+        $dockerCompose = Yaml::parse($dockerComposeRaw);
+
+        // Switch Image
+        $image = data_get($resource, 'image');
+        data_set($dockerCompose, "services.{$name}.image", $image);
+
+        // Update FQDN
+        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
+        ray($variableName);
+        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+        if ($generatedEnv) {
+            $generatedEnv->value = $resource->fqdn;
+            $generatedEnv->save();
+        }
+
+
+        $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);
+        $resource->service->docker_compose_raw = $dockerComposeRaw;
+        $resource->service->save();
+    } catch (\Throwable $e) {
+        return handleError($e);
+    }
+}

bootstrap/helpers/shared.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\InstanceSettings;
+use App\Models\Server;
 use App\Models\Team;
 use App\Models\User;
 use App\Notifications\Channels\DiscordChannel;
@@ -11,33 +12,42 @@ use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use Illuminate\Database\QueryException;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
+use Illuminate\Support\Stringable;
 use Nubs\RandomNameGenerator\All;
 use Poliander\Cron\CronExpression;
 use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
+use Spatie\Url\Url;
 
+function base_configuration_dir(): string
+{
+    return '/data/coolify';
+}
 function application_configuration_dir(): string
 {
-    return '/data/coolify/applications';
+    return base_configuration_dir() . "/applications";
+}
+function service_configuration_dir(): string
+{
+    return base_configuration_dir() . "/services";
 }
-
 function database_configuration_dir(): string
 {
-    return '/data/coolify/databases';
+    return base_configuration_dir() . "/databases";
 }
 function database_proxy_dir($uuid): string
 {
-    return "/data/coolify/databases/$uuid/proxy";
+    return base_configuration_dir() . "/databases/$uuid/proxy";
 }
-
 function backup_dir(): string
 {
-    return '/data/coolify/backups';
+    return base_configuration_dir() . "/backups";
 }
 
 function generate_readme_file(string $name, string $updated_at): string
@@ -77,6 +87,7 @@ function refreshSession(?Team $team = null): void
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
     ray('handleError');
+    ray($error);
     if ($error instanceof Throwable) {
         $message = $error->getMessage();
     } else {
@@ -94,6 +105,7 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     if (isset($livewire)) {
         return $livewire->emit('error', $message);
     }
+
     throw new RuntimeException($message);
 }
 function general_error_handler(Throwable $err, Livewire\Component $that = null, $isJson = false, $customErrorMessage = null): mixed
@@ -151,10 +163,12 @@ function get_latest_version_of_coolify(): string
     }
 }
 
-function generate_random_name(): string
+function generate_random_name(?string $cuid = null): string
 {
     $generator = All::create();
-    $cuid = new Cuid2(7);
+    if (is_null($cuid)) {
+        $cuid = new Cuid2(7);
+    }
     return Str::kebab("{$generator->getName()}-$cuid");
 }
 function generateSSHKey()
@@ -173,9 +187,11 @@ function formatPrivateKey(string $privateKey)
     }
     return $privateKey;
 }
-function generate_application_name(string $git_repository, string $git_branch): string
+function generate_application_name(string $git_repository, string $git_branch, ?string $cuid = null): string
 {
-    $cuid = new Cuid2(7);
+    if (is_null($cuid)) {
+        $cuid = new Cuid2(7);
+    }
     return Str::kebab("$git_repository:$git_branch-$cuid");
 }
 
@@ -227,7 +243,14 @@ function base_ip(): string
     }
     return "localhost";
 }
-
+function getFqdnWithoutPort(String $fqdn)
+{
+    $url = Url::fromString($fqdn);
+    $host = $url->getHost();
+    $scheme = $url->getScheme();
+    $path = $url->getPath();
+    return "$scheme://$host$path";
+}
 /**
  * If fqdn is set, return it, otherwise return public ip.
  */
@@ -365,3 +388,49 @@ function parseEnvFormatToArray($env_file_contents)
     }
     return $env_array;
 }
+
+function data_get_str($data, $key, $default = null): Stringable
+{
+    $str = data_get($data, $key, $default) ?? $default;
+    return Str::of($str);
+}
+
+function generateFqdn(Server $server, string $random)
+{
+    $wildcard = data_get($server, 'settings.wildcard_domain');
+    if (is_null($wildcard) || $wildcard === '') {
+        $wildcard = sslip($server);
+    }
+    $url = Url::fromString($wildcard);
+    $host = $url->getHost();
+    $path = $url->getPath() === '/' ? '' : $url->getPath();
+    $scheme = $url->getScheme();
+    $finalFqdn = "$scheme://{$random}.$host$path" ;
+    return $finalFqdn;
+}
+function sslip(Server $server)
+{
+    if (isDev()) {
+        return "http://127.0.0.1.sslip.io";
+    }
+    if ($server->ip === 'host.docker.internal') {
+        $baseIp = base_ip();
+        return "http://$baseIp.sslip.io";
+    }
+    return "http://{$server->ip}.sslip.io";
+}
+
+function getServiceTemplates()
+{
+    if (isDev()) {
+        $services = File::get(base_path('templates/service-templates.json'));
+        $services = collect(json_decode($services))->sortKeys();
+    } else {
+        $services = Http::get(config('constants.services.official'));
+        if ($services->failed()) {
+            throw new \Exception($services->body());
+        }
+        $services = collect($services->json())->sortKeys();
+    }
+    return $services;
+}

bootstrap/helpers/subscriptions.php

@@ -138,5 +138,6 @@ function allowedPathsForBoardingAccounts()
         ...allowedPathsForUnsubscribedAccounts(),
         'boarding',
         'livewire/message/boarding.index',
+        'livewire/message/activity-monitor'
     ];
 }

config/constants.php

@@ -1,6 +1,10 @@
 <?php
 return [
-    'ssh' =>[
+    'docs' => [
+        'base_url' => 'https://coolify.io/docs',
+        'contact' => 'https://coolify.io/docs/contact',
+    ],
+    'ssh' => [
         'connection_timeout' => 10,
         'server_interval' => 20,
         'command_timeout' => 7200,
@@ -14,8 +18,11 @@ return [
             'expiration' => 10,
         ],
     ],
+    'services' => [
+        'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
+    ],
     'limits' => [
-        'trial_period'=> 14,
+        'trial_period' => 7,
         '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://62de992090e4e0cb28f18231835ea006@o1082494.ingest.sentry.io/4505347448045568',
+    'dsn' => 'https://72f02655749d5d687297b6b9f078b8b9@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.42',
+    'release' => '4.0.0-beta.56',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/toaster.php

@@ -30,7 +30,7 @@ return [
      *
      * Minimum: 3000 (in milliseconds)
      */
-    'duration' => 3000,
+    'duration' => 5000,
 
     /**
      * The horizontal position of each toast.

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.42';
+return '4.0.0-beta.56';

database/migrations/2023_09_20_082541_update_services_table.php

@@ -0,0 +1,35 @@
+<?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('services', function (Blueprint $table) {
+            $table->foreignId('server_id')->nullable();
+            $table->longText('description')->nullable();
+            $table->longText('docker_compose_raw');
+            $table->longText('docker_compose')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('services', function (Blueprint $table) {
+            $table->dropColumn('server_id');
+            $table->dropColumn('description');
+            $table->dropColumn('docker_compose_raw');
+            $table->dropColumn('docker_compose');
+        });
+    }
+};

database/migrations/2023_09_20_082733_create_service_databases_table.php

@@ -0,0 +1,38 @@
+<?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::create('service_databases', function (Blueprint $table) {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->string('name');
+            $table->string('human_name')->nullable();
+            $table->longText('description')->nullable();
+
+            $table->longText('ports')->nullable();
+            $table->longText('exposes')->nullable();
+
+            $table->string('status')->default('exited');
+
+            $table->foreignId('service_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('service_databases');
+    }
+};

database/migrations/2023_09_20_082737_create_service_applications_table.php

@@ -0,0 +1,39 @@
+<?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::create('service_applications', function (Blueprint $table) {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->string('name');
+            $table->string('human_name')->nullable();
+            $table->longText('description')->nullable();
+
+            $table->string('fqdn')->unique()->nullable();
+            $table->longText('ports')->nullable();
+            $table->longText('exposes')->nullable();
+
+            $table->string('status')->default('exited');
+
+            $table->foreignId('service_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('service_applications');
+    }
+};

database/migrations/2023_09_20_083549_update_environment_variables_table.php

@@ -0,0 +1,29 @@
+<?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('environment_variables', function (Blueprint $table) {
+            $table->foreignId('service_id')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('environment_variables', function (Blueprint $table) {
+            $table->dropColumn('service_id');
+        });
+    }
+};