Merge pull request #1812 from coollabsio/next

v4.0.0-beta.236

app/Actions/Proxy/StartProxy.php

@@ -15,6 +15,9 @@ class StartProxy
     {
         try {
             $proxyType = $server->proxyType();
+            if ($proxyType === 'NONE') {
+                return 'OK';
+            }
             $commands = collect([]);
             $proxy_path = get_proxy_path();
             $configuration = CheckConfiguration::run($server);

app/Console/Commands/Emails.php

@@ -2,10 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\DatabaseBackupStatusJob;
 use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
@@ -15,6 +17,7 @@ use App\Notifications\Application\DeploymentSuccess;
 use App\Notifications\Application\StatusChanged;
 use App\Notifications\Database\BackupFailed;
 use App\Notifications\Database\BackupSuccess;
+use App\Notifications\Database\DailyBackup;
 use App\Notifications\Test;
 use Exception;
 use Illuminate\Console\Command;
@@ -54,6 +57,8 @@ class Emails extends Command
             options: [
                 'updates' => 'Send Update Email to all users',
                 'emails-test' => 'Test',
+                'database-backup-statuses-daily' => 'Database - Backup Statuses (Daily)',
+                'application-deployment-success-daily' => 'Application - Deployment Success (Daily)',
                 'application-deployment-success' => 'Application - Deployment Success',
                 'application-deployment-failed' => 'Application - Deployment Failed',
                 'application-status-changed' => 'Application - Status Changed',
@@ -67,8 +72,12 @@ class Emails extends Command
             ],
         );
         $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
-        if (!in_array($type, $emailsGathered)) {
+        if (isDev()) {
-            $this->email = text('Email Address to send to');
+            $this->email = "test@example.com";
+        } else {
+            if (!in_array($type, $emailsGathered)) {
+                $this->email = text('Email Address to send to:');
+            }
         }
         set_transanctional_email_settings();
 
@@ -102,7 +111,7 @@ class Emails extends Command
                         $unsubscribeUrl = route('unsubscribe.marketing.emails', [
                             'token' => encrypt($email),
                         ]);
-                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->mail->view('emails.updates', ["unsubscribeUrl" => $unsubscribeUrl]);
                         $this->sendEmail($email);
                     }
                 }
@@ -111,6 +120,35 @@ class Emails extends Command
                 $this->mail = (new Test())->toMail();
                 $this->sendEmail();
                 break;
+            case 'database-backup-statuses-daily':
+                $scheduled_backups = ScheduledDatabaseBackup::all();
+                $databases = collect();
+                foreach ($scheduled_backups as $scheduled_backup) {
+                    $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+                    if ($last_days_backups->isEmpty()) {
+                        continue;
+                    }
+                    $failed = $last_days_backups->where('status', 'failed');
+                    $database = $scheduled_backup->database;
+                    $databases->put($database->name, [
+                        'failed_count' => $failed->count(),
+                    ]);
+                }
+                $this->mail = (new DailyBackup($databases))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-success-daily':
+                $applications = Application::all();
+                foreach ($applications as $application) {
+                    $deployments = $application->get_last_days_deployments();
+                    ray($deployments);
+                    if ($deployments->isEmpty()) {
+                        continue;
+                    }
+                    $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();
+                    $this->sendEmail();
+                }
+                break;
             case 'application-deployment-success':
                 $application = Application::all()->first();
                 $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();

app/Console/Kernel.php

@@ -47,6 +47,10 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
+
+            if (!isCloud()) {
+                $schedule->command('cleanup:database --yes')->daily();
+            }
         }
     }
     private function pull_helper_image($schedule)
@@ -69,35 +73,42 @@ class Kernel extends ConsoleKernel
         }
         foreach ($containerServers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
-            // $schedule
-            //     ->call(function () use ($server) {
-            //         $randomSeconds = rand(1, 40);
-            //         $job = new ContainerStatusJob($server);
-            //         $job->delay($randomSeconds);
-            //         ray('dispatching container status job in ' . $randomSeconds . ' seconds');
-            //         dispatch($job);
-            //     })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
             if ($server->isLogDrainEnabled()) {
                 $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
-                // $schedule
-                //     ->call(function () use ($server) {
-                //         $randomSeconds = rand(1, 40);
-                //         $job = new CheckLogDrainContainerJob($server);
-                //         $job->delay($randomSeconds);
-                //         dispatch($job);
-                //     })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
             }
         }
         foreach ($servers as $server) {
             $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
-            // $schedule
-            //     ->call(function () use ($server) {
-            //         $randomSeconds = rand(1, 40);
-            //         $job = new ServerStatusJob($server);
-            //         $job->delay($randomSeconds);
-            //         dispatch($job);
-            //     })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
         }
+        // Delayed Jobs
+        // foreach ($containerServers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ContainerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             ray('dispatching container status job in ' . $randomSeconds . ' seconds');
+        //             dispatch($job);
+        //         })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
+        //     if ($server->isLogDrainEnabled()) {
+        //         $schedule
+        //             ->call(function () use ($server) {
+        //                 $randomSeconds = rand(1, 40);
+        //                 $job = new CheckLogDrainContainerJob($server);
+        //                 $job->delay($randomSeconds);
+        //                 dispatch($job);
+        //             })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
+        //     }
+        // }
+        // foreach ($servers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ServerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             dispatch($job);
+        //         })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
+        // }
     }
     private function instance_auto_update($schedule)
     {

app/Exceptions/Handler.php

@@ -77,6 +77,9 @@ class Handler extends ExceptionHandler
                     );
                 }
             );
+            if (str($e->getMessage())->contains('No space left on device')) {
+                return;
+            }
             ray('reporting to sentry');
             Integration::captureUnhandledException($e);
         });

app/Http/Controllers/Api/Server.php

@@ -19,11 +19,11 @@ class Server extends Controller
             $server['is_usable'] = $server->settings->is_usable;
             return $server;
         });
-        ray($servers);
         return response()->json($servers);
     }
     public function server_by_uuid(Request $request)
     {
+        $with_resources = $request->query('resources');
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
             return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
@@ -32,23 +32,26 @@ class Server extends Controller
         if (is_null($server)) {
             return response()->json(['error' => 'Server not found.'], 404);
         }
-        $server->load(['settings']);
+        if ($with_resources) {
-        $server['resources'] = $server->definedResources()->map(function ($resource) {
+            $server['resources'] = $server->definedResources()->map(function ($resource) {
-            $payload = [
+                $payload = [
-                'id' => $resource->id,
+                    'id' => $resource->id,
-                'uuid' => $resource->uuid,
+                    'uuid' => $resource->uuid,
-                'name' => $resource->name,
+                    'name' => $resource->name,
-                'type' => $resource->type(),
+                    'type' => $resource->type(),
-                'created_at' => $resource->created_at,
+                    'created_at' => $resource->created_at,
-                'updated_at' => $resource->updated_at,
+                    'updated_at' => $resource->updated_at,
-            ];
+                ];
-            if ($resource->type() === 'service') {
+                if ($resource->type() === 'service') {
-                $payload['status'] = $resource->status();
+                    $payload['status'] = $resource->status();
-            } else {
+                } else {
-                $payload['status'] = $resource->status;
+                    $payload['status'] = $resource->status;
-            }
+                }
-            return $payload;
+                return $payload;
-        });
+            });
+        } else {
+            $server->load(['settings']);
+        }
         return response()->json($server);
     }
 }

app/Http/Controllers/Webhook/Bitbucket.php

@@ -0,0 +1,186 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Livewire\Project\Service\Storage;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Visus\Cuid2\Cuid2;
+
+class Bitbucket extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Bitbicket::manual_bitbucket", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_bitbucket_token = data_get($headers, 'x-hub-signature.0', "");
+            $x_bitbucket_event = data_get($headers, 'x-event-key.0', "");
+            $handled_events = collect(['repo:push', 'pullrequest:created', 'pullrequest:rejected', 'pullrequest:fulfilled']);
+            if (!$handled_events->contains($x_bitbucket_event)) {
+                return response([
+                    'status' => 'failed',
+                    'message' => 'Nothing to do. Event not handled.',
+                ]);
+            }
+            if ($x_bitbucket_event === 'repo:push') {
+                $branch = data_get($payload, 'push.changes.0.new.name');
+                $full_name = data_get($payload, 'repository.full_name');
+
+                if (!$branch) {
+                    return response([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                }
+                ray('Manual webhook bitbucket push event with branch: ' . $branch);
+            }
+            if ($x_bitbucket_event === 'pullrequest:created' || $x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                $branch = data_get($payload, 'pullrequest.destination.branch.name');
+                $base_branch = data_get($payload, 'pullrequest.source.branch.name');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'pullrequest.id');
+                $pull_request_html_url = data_get($payload, 'pullrequest.links.html.href');
+                $commit = data_get($payload, 'pullrequest.source.commit.hash');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            $applications = $applications->where('git_branch', $branch)->get();
+            if ($applications->isEmpty()) {
+                return response([
+                    'status' => 'failed',
+                    'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                ]);
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_bitbucket');
+                $payload = $request->getContent();
+
+                list($algo, $hash) = explode('=', $x_bitbucket_token, 2);
+                $payloadHash = hash_hmac($algo, $payload, $webhook_secret);
+                if (!hash_equals($hash, $payloadHash) && !isDev()) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_bitbucket_event === 'repo:push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Auto deployment disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:created') {
+                    if ($application->isPRDeployable()) {
+                        ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                        $deployment_uuid = new Cuid2(7);
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if (!$found) {
+                            ApplicationPreview::create([
+                                'git_type' => 'bitbucket',
+                                'application_id' => $application->id,
+                                'pull_request_id' => $pull_request_id,
+                                'pull_request_html_url' => $pull_request_html_url,
+                            ]);
+                        }
+                        queue_application_deployment(
+                            application: $application,
+                            pull_request_id: $pull_request_id,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            commit: $commit,
+                            is_webhook: true,
+                            git_type: 'bitbucket'
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Preview deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_bitbucket_event === 'pullrequest:rejected' || $x_bitbucket_event === 'pullrequest:fulfilled') {
+                    ray('Pull request rejected');
+                    $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                    if ($found) {
+                        $found->delete();
+                        $container_name = generateApplicationContainerName($application, $pull_request_id);
+                        instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Preview deployment closed.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No preview deployment found.',
+                        ]);
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e);
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Github.php

@@ -0,0 +1,459 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Enums\ProcessStatus;
+use App\Http\Controllers\Controller;
+use App\Jobs\ApplicationPullRequestUpdateJob;
+use App\Jobs\GithubAppPermissionJob;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\GithubApp;
+use App\Models\PrivateKey;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Github extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            ray($request);
+            $return_payloads = collect([]);
+            $x_github_delivery = request()->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::manual_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $content_type = $request->header('Content-Type');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+
+            if ($content_type !== 'application/json') {
+                $payload = json_decode(data_get($payload, 'payload'), true);
+            }
+            if ($x_github_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'repository.full_name');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                ray('Manual Webhook GitHub Push Event with branch: ' . $branch);
+            }
+            if ($x_github_event === 'pull_request') {
+                $action = data_get($payload, 'action');
+                $full_name = data_get($payload, 'repository.full_name');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$branch) {
+                return response('Nothing to do. No branch found in the request.');
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_github');
+                $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+                if (!hash_equals($x_hub_signature_256, $hmac) && !isDev()) {
+                    ray('Invalid signature');
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true,
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function normal(Request $request)
+    {
+        try {
+            $return_payloads = collect([]);
+            $id = null;
+            $x_github_delivery = $request->header('X-GitHub-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
+                    return Str::contains($file, $x_github_delivery);
+                })->first();
+                if ($github_delivery_found) {
+                    ray('Webhook already found');
+                    return;
+                }
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::normal_{$x_github_delivery}", $json);
+                return;
+            }
+            $x_github_event = Str::lower($request->header('X-GitHub-Event'));
+            $x_github_hook_installation_target_id = $request->header('X-GitHub-Hook-Installation-Target-Id');
+            $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
+            $payload = $request->collect();
+            if ($x_github_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+            $github_app = GithubApp::where('app_id', $x_github_hook_installation_target_id)->first();
+            if (is_null($github_app)) {
+                return response('Nothing to do. No GitHub App found.');
+            }
+            $webhook_secret = data_get($github_app, 'webhook_secret');
+            $hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
+            if (config('app.env') !== 'local') {
+                if (!hash_equals($x_hub_signature_256, $hmac)) {
+                    return response('Invalid signature.');
+                }
+            }
+            if ($x_github_event === 'installation' || $x_github_event === 'installation_repositories') {
+                // Installation handled by setup redirect url. Repositories queried on-demand.
+                $action = data_get($payload, 'action');
+                if ($action === 'new_permissions_accepted') {
+                    GithubAppPermissionJob::dispatch($github_app);
+                }
+                return response('cool');
+            }
+            if ($x_github_event === 'push') {
+                $id = data_get($payload, 'repository.id');
+                $branch = data_get($payload, 'ref');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                ray('Webhook GitHub Push Event: ' . $id . ' with branch: ' . $branch);
+            }
+            if ($x_github_event === 'pull_request') {
+                $action = data_get($payload, 'action');
+                $id = data_get($payload, 'repository.id');
+                $pull_request_id = data_get($payload, 'number');
+                $pull_request_html_url = data_get($payload, 'pull_request.html_url');
+                $branch = data_get($payload, 'pull_request.head.ref');
+                $base_branch = data_get($payload, 'pull_request.base.ref');
+                ray('Webhook GitHub Pull Request Event: ' . $id . ' with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            if (!$id || !$branch) {
+                return response('Nothing to do. No id or branch found.');
+            }
+            $applications = Application::where('repository_project_id', $id)->whereRelation('source', 'is_public', false);
+            if ($x_github_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$branch'.");
+                }
+            }
+            if ($x_github_event === 'pull_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    return response("Nothing to do. No applications found with branch '$base_branch'.");
+                }
+            }
+
+            foreach ($applications as $application) {
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_github_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'success',
+                            'message' => 'Deployment queued.',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                        ]);
+                    }
+                }
+                if ($x_github_event === 'pull_request') {
+                    if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'github',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'github'
+                            );
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment queued.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled.',
+                            ]);
+                        }
+                    }
+                    if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            ApplicationPullRequestUpdateJob::dispatchSync(application: $application, preview: $found, status: ProcessStatus::CLOSED);
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview deployment closed.',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'No preview deployment found.',
+                            ]);
+                        }
+                    }
+                }
+            }
+            ray($return_payloads);
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function redirect(Request $request)
+    {
+        try {
+            $code = $request->get('code');
+            $state = $request->get('state');
+            $github_app = GithubApp::where('uuid', $state)->firstOrFail();
+            $api_url = data_get($github_app, 'api_url');
+            $data = Http::withBody(null)->accept('application/vnd.github+json')->post("$api_url/app-manifests/$code/conversions")->throw()->json();
+            $id = data_get($data, 'id');
+            $slug = data_get($data, 'slug');
+            $client_id = data_get($data, 'client_id');
+            $client_secret = data_get($data, 'client_secret');
+            $private_key = data_get($data, 'pem');
+            $webhook_secret = data_get($data, 'webhook_secret');
+            $private_key = PrivateKey::create([
+                'name' => $slug,
+                'private_key' => $private_key,
+                'team_id' => $github_app->team_id,
+                'is_git_related' => true,
+            ]);
+            $github_app->name = $slug;
+            $github_app->app_id = $id;
+            $github_app->client_id = $client_id;
+            $github_app->client_secret = $client_secret;
+            $github_app->webhook_secret = $webhook_secret;
+            $github_app->private_key_id = $private_key->id;
+            $github_app->save();
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+    public function install(Request $request)
+    {
+        try {
+            $installation_id = $request->get('installation_id');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::install_{$installation_id}", $json);
+                return;
+            }
+            $source = $request->get('source');
+            $setup_action = $request->get('setup_action');
+            $github_app = GithubApp::where('uuid', $source)->firstOrFail();
+            if ($setup_action === 'install') {
+                $github_app->installation_id = $installation_id;
+                $github_app->save();
+            }
+            return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (Exception $e) {
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Gitlab.php

@@ -0,0 +1,202 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Visus\Cuid2\Cuid2;
+
+class Gitlab extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitlab::manual_gitlab", $json);
+                return;
+            }
+            $return_payloads = collect([]);
+            $payload = $request->collect();
+            $headers = $request->headers->all();
+            $x_gitlab_token = data_get($headers, 'x-gitlab-token.0');
+            $x_gitlab_event = data_get($payload, 'object_kind');
+            if ($x_gitlab_event === 'push') {
+                $branch = data_get($payload, 'ref');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                if (Str::isMatch('/refs\/heads\/*/', $branch)) {
+                    $branch = Str::after($branch, 'refs/heads/');
+                }
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    return response($return_payloads);
+                }
+                ray('Manual Webhook GitLab Push Event with branch: ' . $branch);
+            }
+            if ($x_gitlab_event === 'merge_request') {
+                $action = data_get($payload, 'object_attributes.action');
+                $branch = data_get($payload, 'object_attributes.source_branch');
+                $base_branch = data_get($payload, 'object_attributes.target_branch');
+                $full_name = data_get($payload, 'project.path_with_namespace');
+                $pull_request_id = data_get($payload, 'object_attributes.iid');
+                $pull_request_html_url = data_get($payload, 'object_attributes.url');
+                if (!$branch) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => 'Nothing to do. No branch found in the request.',
+                    ]);
+                    return response($return_payloads);
+                }
+                ray('Webhook GitHub Pull Request Event with branch: ' . $branch . ' and base branch: ' . $base_branch . ' and pull request id: ' . $pull_request_id);
+            }
+            $applications = Application::where('git_repository', 'like', "%$full_name%");
+            if ($x_gitlab_event === 'push') {
+                $applications = $applications->where('git_branch', $branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with deploy key set, branch is '$branch' and Git Repository name has $full_name.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            if ($x_gitlab_event === 'merge_request') {
+                $applications = $applications->where('git_branch', $base_branch)->get();
+                if ($applications->isEmpty()) {
+                    $return_payloads->push([
+                        'status' => 'failed',
+                        'message' => "Nothing to do. No applications found with branch '$base_branch'.",
+                    ]);
+                    return response($return_payloads);
+                }
+            }
+            foreach ($applications as $application) {
+                $webhook_secret = data_get($application, 'manual_webhook_secret_gitlab');
+                if ($webhook_secret !== $x_gitlab_token) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Invalid token.',
+                    ]);
+                    ray('Invalid signature');
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional',
+                    ]);
+                    ray('Server is not functional: ' . $application->destination->server->name);
+                    continue;
+                }
+                if ($x_gitlab_event === 'push') {
+                    if ($application->isDeployable()) {
+                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $deployment_uuid = new Cuid2(7);
+                        queue_application_deployment(
+                            application: $application,
+                            deployment_uuid: $deployment_uuid,
+                            force_rebuild: false,
+                            is_webhook: true
+                        );
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled',
+                        ]);
+                        ray('Deployments disabled for ' . $application->name);
+                    }
+                }
+                if ($x_gitlab_event === 'merge_request') {
+                    if ($action === 'open' || $action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
+                        if ($application->isPRDeployable()) {
+                            $deployment_uuid = new Cuid2(7);
+                            $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                            if (!$found) {
+                                ApplicationPreview::create([
+                                    'git_type' => 'gitlab',
+                                    'application_id' => $application->id,
+                                    'pull_request_id' => $pull_request_id,
+                                    'pull_request_html_url' => $pull_request_html_url,
+                                ]);
+                            }
+                            queue_application_deployment(
+                                application: $application,
+                                pull_request_id: $pull_request_id,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                is_webhook: true,
+                                git_type: 'gitlab'
+                            );
+                            ray('Deploying preview for ' . $application->name . ' with branch ' . $branch . ' and base branch ' . $base_branch . ' and pull request id ' . $pull_request_id);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment queued',
+                            ]);
+                        } else {
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'failed',
+                                'message' => 'Preview deployments disabled',
+                            ]);
+                            ray('Preview deployments disabled for ' . $application->name);
+                        }
+                    } else if ($action === 'closed' || $action === 'close') {
+                        $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
+                        if ($found) {
+                            $found->delete();
+                            $container_name = generateApplicationContainerName($application, $pull_request_id);
+                            // ray('Stopping container: ' . $container_name);
+                            instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
+                            $return_payloads->push([
+                                'application' => $application->name,
+                                'status' => 'success',
+                                'message' => 'Preview Deployment closed',
+                            ]);
+                            return response($return_payloads);
+                        }
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No Preview Deployment found',
+                        ]);
+                    } else {
+                        $return_payloads->push([
+                            'application' => $application->name,
+                            'status' => 'failed',
+                            'message' => 'No action found. Contact us for debugging.',
+                        ]);
+                    }
+                }
+            }
+            return response($return_payloads);
+        } catch (Exception $e) {
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Http/Controllers/Webhook/Stripe.php

@@ -0,0 +1,258 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Jobs\ServerLimitCheckJob;
+use App\Jobs\SubscriptionInvoiceFailedJob;
+use App\Jobs\SubscriptionTrialEndedJob;
+use App\Jobs\SubscriptionTrialEndsSoonJob;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\Webhook;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Sleep;
+use Illuminate\Support\Str;
+
+class Stripe extends Controller
+{
+    public function events(Request $request)
+    {
+        try {
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $data = [
+                    'attributes' => $request->attributes->all(),
+                    'request'    => $request->request->all(),
+                    'query'      => $request->query->all(),
+                    'server'     => $request->server->all(),
+                    'files'      => $request->files->all(),
+                    'cookies'    => $request->cookies->all(),
+                    'headers'    => $request->headers->all(),
+                    'content'    => $request->getContent(),
+                ];
+                $json = json_encode($data);
+                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
+                return;
+            }
+            $webhookSecret = config('subscription.stripe_webhook_secret');
+            $signature = $request->header('Stripe-Signature');
+            $excludedPlans = config('subscription.stripe_excluded_plans');
+            $event = \Stripe\Webhook::constructEvent(
+                $request->getContent(),
+                $signature,
+                $webhookSecret
+            );
+            $webhook = Webhook::create([
+                'type' => 'stripe',
+                'payload' => $request->getContent()
+            ]);
+            $type = data_get($event, 'type');
+            $data = data_get($event, 'data.object');
+            switch ($type) {
+                case 'checkout.session.completed':
+                    $clientReferenceId = data_get($data, 'client_reference_id');
+                    if (is_null($clientReferenceId)) {
+                        send_internal_notification('Checkout session completed without client reference id.');
+                        break;
+                    }
+                    $userId = Str::before($clientReferenceId, ':');
+                    $teamId = Str::after($clientReferenceId, ':');
+                    $subscriptionId = data_get($data, 'subscription');
+                    $customerId = data_get($data, 'customer');
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (!$found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                        throw new Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        send_internal_notification('Old subscription activated for team: ' . $teamId);
+                        $subscription->update([
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        send_internal_notification('New subscription for team: ' . $teamId);
+                        Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    }
+                    break;
+                case 'invoice.paid':
+                    $customerId = data_get($data, 'customer');
+                    $planId = data_get($data, 'lines.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    }
+                    $subscription->update([
+                        'stripe_invoice_paid' => true,
+                    ]);
+                    break;
+                case 'invoice.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: ' . $customerId);
+                        return response('No team found in Coolify.');
+                    }
+                    if (!$subscription->stripe_invoice_paid) {
+                        SubscriptionInvoiceFailedJob::dispatch($team);
+                        send_internal_notification('Invoice payment failed: ' . $customerId);
+                    } else {
+                        send_internal_notification('Invoice payment failed but already paid: ' . $customerId);
+                    }
+                    break;
+                case 'payment_intent.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: ' . $customerId);
+                        return response('No subscription found in Coolify.');
+                    }
+                    if ($subscription->stripe_invoice_paid) {
+                        send_internal_notification('payment_intent.payment_failed but invoice is active for customer: ' . $customerId);
+                        return;
+                    }
+                    send_internal_notification('Subscription payment failed for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.updated':
+                    $customerId = data_get($data, 'customer');
+                    $status = data_get($data, 'status');
+                    $subscriptionId = data_get($data, 'items.data.0.subscription');
+                    $planId = data_get($data, 'items.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (!$subscription) {
+                        Sleep::for(5)->seconds();
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    }
+                    if (!$subscription) {
+                        send_internal_notification('No subscription found for: ' . $customerId);
+                        return response("No subscription found", 400);
+                    }
+                    $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
+                    $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
+                    $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
+                    $feedback = data_get($data, 'cancellation_details.feedback');
+                    $comment = data_get($data, 'cancellation_details.comment');
+                    $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                    if (str($lookup_key)->contains('ultimate')) {
+                        $quantity = data_get($data, 'items.data.0.quantity', 10);
+                        $team = data_get($subscription, 'team');
+                        $team->update([
+                            'custom_server_limit' => $quantity,
+                        ]);
+                        ServerLimitCheckJob::dispatch($team);
+                    }
+                    $subscription->update([
+                        'stripe_feedback' => $feedback,
+                        'stripe_comment' => $comment,
+                        'stripe_plan_id' => $planId,
+                        'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
+                    ]);
+                    if ($status === 'paused' || $status === 'incomplete_expired') {
+                        $subscription->update([
+                            'stripe_invoice_paid' => false,
+                        ]);
+                        send_internal_notification('Subscription paused or incomplete for customer: ' . $customerId);
+                    }
+
+                    // Trial ended but subscribed, reactive servers
+                    if ($trialEndedAlready && $status === 'active') {
+                        $team = data_get($subscription, 'team');
+                        $team->trialEndedButSubscribed();
+                    }
+
+                    if ($feedback) {
+                        $reason = "Cancellation feedback for {$customerId}: '" . $feedback . "'";
+                        if ($comment) {
+                            $reason .= ' with comment: \'' . $comment . "'";
+                        }
+                        send_internal_notification($reason);
+                    }
+                    if ($alreadyCancelAtPeriodEnd !== $cancelAtPeriodEnd) {
+                        if ($cancelAtPeriodEnd) {
+                            // send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
+                        } else {
+                            send_internal_notification('customer.subscription.updated for customer: ' . $customerId);
+                        }
+                    }
+                    break;
+                case 'customer.subscription.deleted':
+                    // End subscription
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_subscription_id' => null,
+                        'stripe_plan_id' => null,
+                        'stripe_cancel_at_period_end' => false,
+                        'stripe_invoice_paid' => false,
+                        'stripe_trial_already_ended' => true,
+                    ]);
+                    send_internal_notification('customer.subscription.deleted for customer: ' . $customerId);
+                    break;
+                case 'customer.subscription.trial_will_end':
+                    // Not used for now
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    SubscriptionTrialEndsSoonJob::dispatch($team);
+                    break;
+                case 'customer.subscription.paused':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    if (!$team) {
+                        throw new Exception('No team found for subscription: ' . $subscription->id);
+                    }
+                    $team->trialEnded();
+                    $subscription->update([
+                        'stripe_trial_already_ended' => true,
+                        'stripe_invoice_paid' => false,
+                    ]);
+                    SubscriptionTrialEndedJob::dispatch($team);
+                    send_internal_notification('Subscription paused for customer: ' . $customerId);
+                    break;
+                default:
+                    // Unhandled event type
+            }
+        } catch (Exception $e) {
+            if ($type !== 'payment_intent.payment_failed') {
+                send_internal_notification("Subscription webhook ($type) failed: " . $e->getMessage());
+            }
+            $webhook->update([
+                'status' => 'failed',
+                'failure_reason' => $e->getMessage(),
+            ]);
+            return response($e->getMessage(), 400);
+        }
+    }
+}

app/Http/Controllers/Webhook/Waitlist.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers\Webhook;
+
+use App\Http\Controllers\Controller;
+use App\Models\Waitlist as ModelsWaitlist;
+use Exception;
+use Illuminate\Http\Request;
+
+class Waitlist extends Controller
+{
+    public function confirm(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        ray($email, $confirmation_code);
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found) {
+                if (!$found->verified) {
+                    if ($found->created_at > now()->subMinutes(config('constants.waitlist.expiration'))) {
+                        $found->verified = true;
+                        $found->save();
+                        send_internal_notification('Waitlist confirmed: ' . $email);
+                        return 'Thank you for confirming your email address. We will notify you when you are next in line.';
+                    } else {
+                        $found->delete();
+                        send_internal_notification('Waitlist expired: ' . $email);
+                        return 'Your confirmation code has expired. Please sign up again.';
+                    }
+                }
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist confirmation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+    public function cancel(Request $request)
+    {
+        $email = request()->get('email');
+        $confirmation_code = request()->get('confirmation_code');
+        try {
+            $found = ModelsWaitlist::where('uuid', $confirmation_code)->where('email', $email)->first();
+            if ($found && !$found->verified) {
+                $found->delete();
+                send_internal_notification('Waitlist cancelled: ' . $email);
+                return 'Your email address has been removed from the waitlist.';
+            }
+            return redirect()->route('dashboard');
+        } catch (Exception $e) {
+            send_internal_notification('Waitlist cancellation failed: ' . $e->getMessage());
+            ray($e->getMessage());
+            return redirect()->route('dashboard');
+        }
+    }
+}

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -12,6 +12,10 @@ class DecideWhatToDoWithUser
 {
     public function handle(Request $request, Closure $next): Response
     {
+        if (auth()?->user()?->teams?->count() === 0) {
+            $currentTeam = auth()->user()?->recreate_personal_team();
+            refreshSession($currentTeam);
+        }
         if(auth()?->user()?->currentTeam()){
             refreshSession(auth()->user()->currentTeam());
         }

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -12,6 +12,7 @@ class PreventRequestsDuringMaintenance extends Middleware
      * @var array<int, string>
      */
     protected $except = [
-        //
+        'webhooks/*',
+        '/api/health'
     ];
 }

app/Jobs/ApplicationDeploymentJob.php

@@ -218,12 +218,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $teamId = data_get($this->application, 'environment.project.team.id');
                 $buildServers = Server::buildServers($teamId)->get();
                 if ($buildServers->count() === 0) {
-                    $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+                    $this->application_deployment_queue->addLogEntry("No suitable build server found. Using the deployment server.");
                     $this->build_server = $this->server;
                     $this->original_server = $this->server;
                 } else {
-                    $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
                     $this->build_server = $buildServers->random();
+                    $this->application_deployment_queue->addLogEntry("Found a suitable build server ({$this->build_server->name}).");
                     $this->original_server = $this->server;
                     $this->use_build_server = true;
                 }
@@ -374,6 +374,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->cleanup_git();
         $this->application->loadComposeFile(isInit: false);
         if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $this->application->parseRawCompose();
             $yaml = $composeFile = $this->application->docker_compose_raw;
         } else {
             $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
@@ -413,27 +414,44 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ]);
         }
         $this->write_deployment_configurations();
+
         // Start compose file
-        if ($this->docker_compose_custom_start_command) {
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
-            $this->execute_remote_command(
+            if ($this->docker_compose_custom_start_command) {
-                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
+                $this->execute_remote_command(
-            );
+                    ["cd {$this->basedir} && {$this->docker_compose_custom_start_command}", "hidden" => true],
+                );
+            } else {
+                $server_workdir = $this->application->workdir();
+                ray("SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d");
+                $this->execute_remote_command(
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d", "hidden" => true],
+                );
+            }
         } else {
-            $this->execute_remote_command(
+            if ($this->docker_compose_custom_start_command) {
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                $this->execute_remote_command(
-            );
+                    [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
+                );
+            } else {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                );
+            }
         }
+
+
         $this->application_deployment_queue->addLogEntry("New container started.");
     }
     private function deploy_dockerfile_buildpack()
     {
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
         if ($this->use_build_server) {
             $this->server = $this->build_server;
         }
         if (data_get($this->application, 'dockerfile_location')) {
             $this->dockerfile_location = $this->application->dockerfile_location;
         }
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -528,9 +546,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->server = $this->original_server;
             }
             $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-            $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            if ($this->pull_request_id === 0) {
-            if ($this->pull_request_id !== 0) {
+                $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            } else {
                 $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+                $this->docker_compose_location = "/docker-compose-pr-{$this->pull_request_id}.yml";
             }
             $this->execute_remote_command(
                 [
@@ -725,7 +745,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->write_deployment_configurations();
                 $this->server = $this->original_server;
             }
-            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled) {
+            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->pull_request_id !== 0) {
                 $this->application_deployment_queue->addLogEntry("----------------------------------------");
                 if (count($this->application->ports_mappings_array) > 0) {
                     $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
@@ -733,6 +753,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
                     $this->application_deployment_queue->addLogEntry("Consistent container name feature enabled, rolling update is not supported.");
                 }
+                if ($this->pull_request_id !== 0) {
+                    $this->application->settings->is_consistent_container_name_enabled = true;
+                    $this->application_deployment_queue->addLogEntry("Pull request deployment, rolling update is not supported.");
+                }
                 $this->stop_running_container(force: true);
                 $this->start_by_compose_file();
             } else {
@@ -810,26 +834,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->add_build_env_variables_to_dockerfile();
         }
         $this->build_image();
-        $this->stop_running_container();
+        $this->push_to_docker_registry();
-        if ($this->application->destination->server->isSwarm()) {
+        // $this->stop_running_container();
-            $this->push_to_docker_registry();
+        $this->rolling_update();
-            $this->execute_remote_command(
-                [
-                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}-{$this->pull_request_id}")
-                ],
-            );
-        } else {
-            $this->application_deployment_queue->addLogEntry("Starting preview deployment.");
-            if ($this->use_build_server) {
-                $this->execute_remote_command(
-                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
-                );
-            } else {
-                $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
-                );
-            }
-        }
     }
     private function create_workdir()
     {
@@ -1226,43 +1233,45 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         //     ];
         // }
 
-        if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
+        if ($this->pull_request_id === 0) {
-            $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
+            if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
-            if (count($custom_compose) > 0) {
+                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
-                $ipv4 = data_get($custom_compose, 'ip.0');
+                if (count($custom_compose) > 0) {
-                $ipv6 = data_get($custom_compose, 'ip6.0');
+                    $ipv4 = data_get($custom_compose, 'ip.0');
-                data_forget($custom_compose, 'ip');
+                    $ipv6 = data_get($custom_compose, 'ip6.0');
-                data_forget($custom_compose, 'ip6');
+                    data_forget($custom_compose, 'ip');
-                if ($ipv4 || $ipv6) {
+                    data_forget($custom_compose, 'ip6');
-                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                    if ($ipv4 || $ipv6) {
+                        data_forget($docker_compose['services'][$this->container_name], 'networks');
+                    }
+                    if ($ipv4) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                    }
+                    if ($ipv6) {
+                        $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                    }
+                    $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
                 }
-                if ($ipv4) {
+            } else {
-                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
+                data_forget($docker_compose, 'services.' . $this->container_name);
+                $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
+                if (count($custom_compose) > 0) {
+                    $ipv4 = data_get($custom_compose, 'ip.0');
+                    $ipv6 = data_get($custom_compose, 'ip6.0');
+                    data_forget($custom_compose, 'ip');
+                    data_forget($custom_compose, 'ip6');
+                    if ($ipv4 || $ipv6) {
+                        data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                    }
+                    if ($ipv4) {
+                        $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                    }
+                    if ($ipv6) {
+                        $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                    }
+                    $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
                 }
-                if ($ipv6) {
-                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
-                }
-                $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
-            }
-        } else {
-            $docker_compose['services'][$this->application->uuid] = $docker_compose['services'][$this->container_name];
-            data_forget($docker_compose, 'services.' . $this->container_name);
-            $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
-            if (count($custom_compose) > 0) {
-                $ipv4 = data_get($custom_compose, 'ip.0');
-                $ipv6 = data_get($custom_compose, 'ip6.0');
-                data_forget($custom_compose, 'ip');
-                data_forget($custom_compose, 'ip6');
-                if ($ipv4 || $ipv6) {
-                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
-                }
-                if ($ipv4) {
-                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
-                }
-                if ($ipv6) {
-                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
-                }
-                $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
             }
         }
 
@@ -1539,18 +1548,18 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
             if ($this->pull_request_id === 0) {
                 $containers = $containers->filter(function ($container) {
-                    return data_get($container, 'Names') !== $this->container_name;
+                    return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== $this->container_name . '-pr-' . $this->pull_request_id;
                 });
             }
             $containers->each(function ($container) {
                 $containerName = data_get($container, 'Names');
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                    ["docker rm -f $containerName >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
                 );
             });
             if ($this->application->settings->is_consistent_container_name_enabled) {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                    ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
                 );
             }
         } else {
@@ -1559,7 +1568,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 'status' => ApplicationDeploymentStatus::FAILED->value,
             ]);
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
             );
         }
     }
@@ -1680,7 +1689,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 // 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one
                 $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
+                    ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true]
                 );
             }
         }

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -30,6 +30,9 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
+            if ($this->application->is_public_repository()) {
+                return;
+            }
             if ($this->status === ProcessStatus::CLOSED) {
                 $this->delete_comment();
                 return;

app/Jobs/DatabaseBackupJob.php

@@ -51,6 +51,9 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
+        if (is_null($this->team)) {
+            return;
+        }
         if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
             $this->database = data_get($this->backup, 'database');
             $this->server = $this->database->service->server;
@@ -316,7 +319,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
-            $url = $this->database->getDbUrl(useInternal: true);
+            $url = $this->database->get_db_url(useInternal: true);
             if ($databaseWithCollections === 'all') {
                 $commands[] = "mkdir -p " . $this->backup_dir;
                 $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";

app/Jobs/DatabaseBackupStatusJob.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\Team;
+use App\Notifications\Database\DailyBackup;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class DatabaseBackupStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public function __construct()
+    {
+    }
+
+    public function handle()
+    {
+        // $teams = Team::all();
+        // foreach ($teams as $team) {
+        //     $scheduled_backups = $team->scheduledDatabaseBackups()->get();
+        //     if ($scheduled_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     foreach ($scheduled_backups as $scheduled_backup) {
+        //         $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //         if ($last_days_backups->isEmpty()) {
+        //             continue;
+        //         }
+        //         $failed = $last_days_backups->where('status', 'failed');
+        //     }
+        // }
+
+
+
+
+
+
+
+
+        // $scheduled_backups = ScheduledDatabaseBackup::all();
+        // $databases = collect();
+        // $teams = collect();
+        // foreach ($scheduled_backups as $scheduled_backup) {
+        //     $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //     if ($last_days_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     $failed = $last_days_backups->where('status', 'failed');
+        //     $database = $scheduled_backup->database;
+        //     $team = $database->team();
+        //     $teams->put($team->id, $team);
+        //     $databases->put("{$team->id}:{$database->name}", [
+        //         'failed_count' => $failed->count(),
+        //     ]);
+        // }
+        // foreach ($databases as $name => $database) {
+        //     [$team_id, $name] = explode(':', $name);
+        //     $team = $teams->get($team_id);
+        //     $team?->notify(new DailyBackup($databases));
+        // }
+    }
+}

app/Jobs/DockerCleanupJob.php

@@ -4,6 +4,7 @@ namespace App\Jobs;
 
 use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
+use App\Notifications\Server\DockerCleanup;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -47,8 +48,9 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
                 CleanupDocker::run($this->server);
                 $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    $this->server->team?->notify(new DockerCleanup($this->server, 'Saved ' . ($this->usageBefore - $usageAfter) . '% disk space.'));
-                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    // ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    // send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
                     Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);

app/Listeners/MaintenanceModeDisabledNotification.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Foundation\Events\MaintenanceModeDisabled as EventsMaintenanceModeDisabled;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
+
+class MaintenanceModeDisabledNotification
+{
+    public function __construct()
+    {
+    }
+
+    public function handle(EventsMaintenanceModeDisabled $event): void
+    {
+        ray('Maintenance mode disabled!');
+        $files = Storage::disk('webhooks-during-maintenance')->files();
+        $files = collect($files);
+        $files = $files->sort();
+        foreach ($files as $file) {
+            $content = Storage::disk('webhooks-during-maintenance')->get($file);
+            $data = json_decode($content, true);
+            $symfonyRequest = new SymfonyRequest(
+                $data['query'],
+                $data['request'],
+                $data['attributes'],
+                $data['cookies'],
+                $data['files'],
+                $data['server'],
+                $data['content']
+            );
+
+            foreach ($data['headers'] as $key => $value) {
+                $symfonyRequest->headers->set($key, $value);
+            }
+            $request = Request::createFromBase($symfonyRequest);
+            $endpoint = str($file)->after('_')->beforeLast('_')->value();
+            $class =  "App\Http\Controllers\Webhook\\" . ucfirst(str($endpoint)->before('::')->value());
+            $method = str($endpoint)->after('::')->value();
+            try {
+                $instance = new $class();
+                $instance->$method($request);
+            } catch (\Throwable $th) {
+                ray($th);
+            } finally {
+                Storage::disk('webhooks-during-maintenance')->delete($file);
+            }
+        }
+    }
+}

app/Listeners/MaintenanceModeEnabledNotification.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\MaintenanceModeEnabled;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Events\MaintenanceModeEnabled as EventsMaintenanceModeEnabled;
+use Illuminate\Queue\InteractsWithQueue;
+
+class MaintenanceModeEnabledNotification
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(EventsMaintenanceModeEnabled $event): void
+    {
+        ray('Maintenance mode enabled!');
+    }
+}

app/Livewire/Boarding/Index.php

@@ -122,7 +122,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
         $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->installServer();
+        $this->currentState = 'validate-server';
     }
     public function getProxyType()
     {
@@ -199,7 +199,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function installServer()
     {
-        $this->dispatch('validateServer', true);
+        $this->dispatch('init', true);
     }
     public function validateServer()
     {

app/Livewire/Project/Application/Advanced.php

@@ -9,6 +9,8 @@ class Advanced extends Component
 {
     public Application $application;
     public bool $is_force_https_enabled;
+    public bool $is_gzip_enabled;
+    public bool $is_stripprefix_enabled;
     protected $rules = [
         'application.settings.is_git_submodules_enabled' => 'boolean|required',
         'application.settings.is_git_lfs_enabled' => 'boolean|required',
@@ -19,13 +21,17 @@ class Advanced extends Component
         'application.settings.is_gpu_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
         'application.settings.is_consistent_container_name_enabled' => 'boolean|required',
+        'application.settings.is_gzip_enabled' => 'boolean|required',
+        'application.settings.is_stripprefix_enabled' => 'boolean|required',
         'application.settings.gpu_driver' => 'string|required',
         'application.settings.gpu_count' => 'string|required',
         'application.settings.gpu_device_ids' => 'string|required',
         'application.settings.gpu_options' => 'string|required',
     ];
     public function mount() {
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        $this->is_force_https_enabled = $this->application->isForceHttpsEnabled();
+        $this->is_gzip_enabled = $this->application->isGzipEnabled();
+        $this->is_stripprefix_enabled = $this->application->isStripprefixEnabled();
     }
     public function instantSave()
     {
@@ -40,6 +46,14 @@ class Advanced extends Component
             $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
             $this->dispatch('resetDefaultLabels', false);
         }
+        if ($this->application->settings->is_gzip_enabled !== $this->is_gzip_enabled) {
+            $this->application->settings->is_gzip_enabled = $this->is_gzip_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
+        if ($this->application->settings->is_stripprefix_enabled !== $this->is_stripprefix_enabled) {
+            $this->application->settings->is_stripprefix_enabled = $this->is_stripprefix_enabled;
+            $this->dispatch('resetDefaultLabels', false);
+        }
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
     }

app/Livewire/Project/Application/Configuration.php

@@ -10,7 +10,7 @@ class Configuration extends Component
 {
     public Application $application;
     public $servers;
-    protected $listeners = ['build_pack_updated' => '$refresh'];
+    protected $listeners = ['buildPackUpdated' => '$refresh'];
 
     public function mount()
     {

app/Livewire/Project/Application/General.php

@@ -182,7 +182,7 @@ class General extends Component
             $this->resetDefaultLabels(false);
         }
         $this->submit();
-        $this->dispatch('build_pack_updated');
+        $this->dispatch('buildPackUpdated');
     }
     public function getWildcardDomain()
     {
@@ -263,7 +263,11 @@ class General extends Component
             }
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-                $this->parsedServices = $this->application->parseCompose();
+                if ($this->application->settings->is_raw_compose_deployment_enabled) {
+                    $this->application->parseRawCompose();
+                } else {
+                    $this->parsedServices = $this->application->parseCompose();
+                }
             }
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();

app/Livewire/Project/Database/Mariadb/General.php

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -93,7 +93,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Mongodb/General.php

@@ -44,9 +44,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -95,7 +95,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Mysql/General.php

@@ -46,9 +46,9 @@ class General extends Component
 
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced()
@@ -94,7 +94,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Postgresql/General.php

@@ -53,9 +53,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -87,7 +87,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/Database/Redis/General.php

@@ -39,9 +39,9 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl(true);
+        $this->db_url = $this->database->get_db_url(true);
         if ($this->database->is_public) {
-            $this->db_url_public = $this->database->getDbUrl();
+            $this->db_url_public = $this->database->get_db_url();
         }
     }
     public function instantSaveAdvanced() {
@@ -86,7 +86,7 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getDbUrl();
+                $this->db_url_public = $this->database->get_db_url();
                 $this->dispatch('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -79,7 +79,10 @@ class GithubPrivateRepository extends Component
                 $this->loadRepositoryByPage();
             }
         }
-        $this->selected_repository_id = $this->repositories[0]['id'];
+        $this->repositories = $this->repositories->sortBy('name');
+        if ($this->repositories->count() > 0) {
+            $this->selected_repository_id = data_get($this->repositories->first(), 'id');
+        }
         $this->current_step = 'repository';
     }
 

app/Livewire/Project/Service/Configuration.php

@@ -17,9 +17,8 @@ class Configuration extends Component
     {
         $userId = auth()->user()->id;
         return [
-            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
+            "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status',
-            "refreshStacks",
+            "check_status"
-            "checkStatus",
         ];
     }
     public function render()
@@ -37,21 +36,10 @@ class Configuration extends Component
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
-    public function checkStatus()
+    public function check_status()
     {
         dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->refreshStacks();
+        $this->dispatch('refresh')->self();
         $this->dispatch('serviceStatusChanged');
     }
-    public function refreshStacks()
-    {
-        $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();
-        });
-    }
 }

app/Livewire/Project/Service/Navbar.php

@@ -6,7 +6,6 @@ use App\Actions\Shared\PullImage;
 use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
 use App\Events\ServiceStatusChanged;
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
@@ -17,7 +16,24 @@ class Navbar extends Component
     public array $parameters;
     public array $query;
     public $isDeploymentProgress = false;
-
+    public function getListeners()
+    {
+        return [
+            "serviceStatusChanged"
+        ];
+    }
+    public function serviceStatusChanged()
+    {
+        $this->dispatch('refresh')->self();
+    }
+    public function check_status() {
+        $this->dispatch('check_status');
+        $this->dispatch('success', 'Service status updated.');
+    }
+    public function render()
+    {
+        return view('livewire.project.service.navbar');
+    }
     public function checkDeployments()
     {
         $activity = Activity::where('properties->type_uuid', $this->service->uuid)->latest()->first();
@@ -28,26 +44,6 @@ class Navbar extends Component
             $this->isDeploymentProgress = false;
         }
     }
-    public function getListeners()
-    {
-        return [
-            "serviceStatusChanged"
-        ];
-    }
-    public function serviceStatusChanged()
-    {
-        $this->service->refresh();
-    }
-    public function render()
-    {
-        return view('livewire.project.service.navbar');
-    }
-    public function check_status($showNotification = false)
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->destination->server));
-        $this->service->refresh();
-        if ($showNotification) $this->dispatch('success', 'Service status updated.');
-    }
     public function deploy()
     {
         $this->checkDeployments();
@@ -62,7 +58,6 @@ class Navbar extends Component
     public function stop(bool $forceCleanup = false)
     {
         StopService::run($this->service);
-        $this->service->refresh();
         if ($forceCleanup) {
             $this->dispatch('success', 'Containers cleaned up.');
         } else {

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -18,6 +18,7 @@ class ServiceApplicationView extends Component
         'application.required_fqdn' => 'required|boolean',
         'application.is_log_drain_enabled' => 'nullable|boolean',
         'application.is_gzip_enabled' => 'nullable|boolean',
+        'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
     public function render()
     {

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -10,29 +10,21 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
 {
     public string $command;
     public string $container;
-    public $containers;
+    public Collection $containers;
     public $parameters;
     public $resource;
     public string $type;
     public string $workDir = '';
     public Server $server;
-    public $servers = [];
+    public Collection $servers;
-    public function getListeners()
+
-    {
-        return [
-            "serviceStatusChanged",
-        ];
-    }
-    public function serviceStatusChanged()
-    {
-        $this->getContainers();
-    }
     protected $rules = [
         'server' => 'required',
         'container' => 'required',
@@ -43,20 +35,18 @@ class ExecuteContainerCommand extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->getContainers();
-    }
-    public function getContainers()
-    {
         $this->containers = collect();
+        $this->servers = collect();
         if (data_get($this->parameters, 'application_uuid')) {
             $this->type = 'application';
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->server = $this->resource->destination->server;
+            if ($this->resource->destination->server->isFunctional()) {
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+                $this->servers = $this->servers->push($this->resource->destination->server);
-            if ($containers->count() > 0) {
+            }
-                $containers->each(function ($container) {
+            foreach ($this->resource->additional_servers as $server) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
+                if ($server->isFunctional()) {
-                });
+                    $this->servers = $this->servers->push($server);
+                }
             }
         } else if (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
@@ -77,47 +67,85 @@ class ExecuteContainerCommand extends Component
                 }
             }
             $this->resource = $resource;
-            $this->server = $this->resource->destination->server;
+            if ($this->resource->destination->server->isFunctional()) {
+                $this->servers = $this->servers->push($this->resource->destination->server);
+            }
             $this->container = $this->resource->uuid;
-            // if (!str(data_get($this,'resource.status'))->startsWith('exited')) {
+            $this->containers->push($this->container);
-                $this->containers->push($this->container);
-            // }
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                // if (str(data_get($application, 'status'))->contains('running')) {
+                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
             });
             $this->resource->databases()->get()->each(function ($database) {
-                // if (str(data_get($database, 'status'))->contains('running')) {
+                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
             });
-
+            if ($this->resource->server->isFunctional()) {
-            $this->server = $this->resource->server;
+                $this->servers = $this->servers->push($this->resource->server);
+            }
         }
         if ($this->containers->count() > 0) {
             $this->container = $this->containers->first();
         }
     }
+    public function loadContainers()
+    {
+        foreach ($this->servers as $server) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                if ($server->isSwarm()) {
+                    $containers = collect([
+                        [
+                            'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
+                        ]
+                    ]);
+                } else {
+                    $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
+                }
+                foreach ($containers as $container) {
+                    $payload = [
+                        'server' => $server,
+                        'container' => $container,
+                    ];
+                    $this->containers = $this->containers->push($payload);
+                }
+            } 
+        }
+        if ($this->containers->count() > 0) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->container = data_get($this->containers->first(), 'container.Names');
+            } elseif (data_get($this->parameters, 'database_uuid')) {
+                $this->container = $this->containers->first();
+            } elseif (data_get($this->parameters, 'service_uuid')) {
+                $this->container = $this->containers->first();
+            }
+        }
+    }
 
     public function runCommand()
     {
-        $this->validate();
         try {
-            if ($this->server->isForceDisabled()) {
+            if (data_get($this->parameters, 'application_uuid')) {
+                $container = $this->containers->where('container.Names', $this->container)->first();
+                $container_name = data_get($container, 'container.Names');
+                if (is_null($container)) {
+                    throw new \RuntimeException('Container not found.');
+                }
+                $server = data_get($container, 'server');
+            } else {
+                $container_name = $this->container;
+                $server = $this->servers->first();
+            }
+            if ($server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }
-            // Wrap command to prevent escaped execution in the host.
             $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
-                $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
+                $exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}";
             } else {
-                $exec = "docker exec {$this->container} {$cmd}";
+                $exec = "docker exec {$container_name} {$cmd}";
             }
-            $activity = remote_process([$exec], $this->server, ignore_errors: true);
+            $activity = remote_process([$exec], $server, ignore_errors: true);
             $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Project/Shared/Logs.php

@@ -10,84 +10,99 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Logs extends Component
 {
     public ?string $type = null;
     public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
-    public Server $server;
+    public Collection $servers;
+    public Collection $containers;
     public $container = [];
-    public $containers;
     public $parameters;
     public $query;
     public $status;
     public $serviceSubType;
 
-    public function mount()
+    public function loadContainers($server_id)
     {
-        $this->containers = collect();
+        try {
-        $this->parameters = get_route_parameters();
+            $server = $this->servers->firstWhere('id', $server_id);
-        $this->query = request()->query();
+            if ($server->isSwarm()) {
-        if (data_get($this->parameters, 'application_uuid')) {
-            $this->type = 'application';
-            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            $this->server = $this->resource->destination->server;
-            if ($this->server->isSwarm()) {
                 $containers = collect([
                     [
                         'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
                     ]
                 ]);
             } else {
-                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, includePullrequests: true);
+                $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
             }
-            if ($containers->count() > 0) {
+            $server->containers = $containers;
-                $containers->each(function ($container) {
+        } catch (\Exception $e) {
-                    $this->containers->push(str_replace('/', '', $container['Names']));
+            return handleError($e, $this);
-                });
+        }
-            }
+    }
-            $this->containers = $this->containers->sortByDesc(function ($container) {
+    public function mount()
-                if (str_contains($container, '-pr-')) {
+    {
-                    return explode('-pr-', $container)[1];
+        try {
+            $this->containers = collect();
+            $this->servers = collect();
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->type = 'application';
+                $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
                 }
-                return $container;
+                foreach ($this->resource->additional_servers as $server) {
-            });
+                    if ($server->isFunctional()) {
-        } else if (data_get($this->parameters, 'database_uuid')) {
+                        $this->servers = $this->servers->push($server);
-            $this->type = 'database';
+                    }
-            $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
+                }
-            if (is_null($resource)) {
+            } else if (data_get($this->parameters, 'database_uuid')) {
-                $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+                $this->type = 'database';
+                $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
                 if (is_null($resource)) {
-                    $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                    $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
                     if (is_null($resource)) {
-                        $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                        $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
                         if (is_null($resource)) {
-                            $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                            $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
                             if (is_null($resource)) {
-                                abort(404);
+                                $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                                if (is_null($resource)) {
+                                    abort(404);
+                                }
                             }
                         }
                     }
                 }
-            }
+                $this->resource = $resource;
-            $this->resource = $resource;
+                $this->status = $this->resource->status;
-            $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
-            $this->server = $this->resource->destination->server;
+                    $this->servers = $this->servers->push($this->resource->destination->server);
-            $this->container = $this->resource->uuid;
+                }
-            $this->containers->push($this->container);
+                $this->container = $this->resource->uuid;
-        } else if (data_get($this->parameters, 'service_uuid')) {
+                $this->containers->push($this->container);
-            $this->type = 'service';
+            } else if (data_get($this->parameters, 'service_uuid')) {
-            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+                $this->type = 'service';
-            $this->resource->applications()->get()->each(function ($application) {
+                $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
+                $this->resource->applications()->get()->each(function ($application) {
-            });
+                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-            $this->resource->databases()->get()->each(function ($database) {
+                });
-                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
+                $this->resource->databases()->get()->each(function ($database) {
-            });
+                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
+                });
 
-            $this->server = $this->resource->server;
+                if ($this->resource->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->server);
+                }
+            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
     }
 

app/Livewire/Server/Proxy.php

@@ -4,6 +4,7 @@ namespace App\Livewire\Server;
 
 use App\Actions\Proxy\CheckConfiguration;
 use App\Actions\Proxy\SaveConfiguration;
+use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
 use Illuminate\Support\Str;
@@ -26,7 +27,7 @@ class Proxy extends Component
 
     public function proxyStatusUpdated()
     {
-        $this->server->refresh();
+        $this->dispatch('refresh')->self();
     }
 
     public function change_proxy()
@@ -41,6 +42,9 @@ class Proxy extends Component
         $this->server->proxy->set('type', $proxy_type);
         $this->server->save();
         $this->selectedProxy = $this->server->proxy->type;
+        if ($this->selectedProxy !== 'NONE') {
+            StartProxy::run($this->server, false);
+        }
         $this->dispatch('proxyStatusUpdated');
     }
 

app/Livewire/Server/Resources.php

@@ -55,7 +55,6 @@ class Resources extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-        // $this->loadUnmanagedContainers();
     }
     public function render()
     {

app/Models/Application.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
 use RuntimeException;
+use Symfony\Component\Yaml\Yaml;
 use Visus\Cuid2\Cuid2;
 
 class Application extends BaseModel
@@ -65,6 +66,13 @@ class Application extends BaseModel
         return $this->belongsToMany(StandaloneDocker::class, 'additional_destinations')
             ->withPivot('server_id', 'status');
     }
+    public function is_public_repository(): bool
+    {
+        if (data_get($this, 'source.is_public')) {
+            return true;
+        }
+        return false;
+    }
     public function is_github_based(): bool
     {
         if (data_get($this, 'source')) {
@@ -72,6 +80,18 @@ class Application extends BaseModel
         }
         return false;
     }
+    public function isForceHttpsEnabled()
+    {
+        return data_get($this, 'settings.is_force_https_enabled', false);
+    }
+    public function isStripprefixEnabled()
+    {
+        return data_get($this, 'settings.is_stripprefix_enabled', true);
+    }
+    public function isGzipEnabled()
+    {
+        return data_get($this, 'settings.is_gzip_enabled', true);
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
@@ -395,7 +415,10 @@ class Application extends BaseModel
         }
         return false;
     }
-
+    public function get_last_days_deployments()
+    {
+        return ApplicationDeploymentQueue::where('application_id', $this->id)->where('created_at', '>=', now()->subDays(7))->orderBy('created_at', 'desc')->get();
+    }
     public function deployments(int $skip = 0, int $take = 10)
     {
         $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->orderBy('created_at', 'desc');
@@ -466,6 +489,10 @@ class Application extends BaseModel
         }
         return false;
     }
+    public function workdir()
+    {
+        return application_configuration_dir() . "/{$this->uuid}";
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'settings.is_log_drain_enabled', false);
@@ -700,6 +727,64 @@ class Application extends BaseModel
             ];
         }
     }
+    function parseRawCompose()
+    {
+        try {
+            $yaml = Yaml::parse($this->docker_compose_raw);
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        }
+        $services = data_get($yaml, 'services');
+        $commands = collect([]);
+        $services = collect($services)->map(function ($service) use ($commands) {
+            $serviceVolumes = collect(data_get($service, 'volumes', []));
+            if ($serviceVolumes->count() > 0) {
+                foreach ($serviceVolumes as $volume) {
+                    $workdir = $this->workdir();
+                    $type = null;
+                    $source = null;
+                    if (is_string($volume)) {
+                        $source = Str::of($volume)->before(':');
+                        if ($source->startsWith('./') || $source->startsWith('/') || $source->startsWith('~')) {
+                            $type = Str::of('bind');
+                        }
+                    } else if (is_array($volume)) {
+                        $type = data_get_str($volume, 'type');
+                        $source = data_get_str($volume, 'source');
+                    }
+                    if ($type->value() === 'bind') {
+                        if ($source->value() === "/var/run/docker.sock") {
+                            continue;
+                        }
+                        if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
+                            continue;
+                        }
+                        if ($source->startsWith('.')) {
+                            $source = $source->after('.');
+                            $source = $workdir . $source;
+                        }
+                        $commands->push("mkdir -p $source > /dev/null 2>&1 || true");
+                    }
+                }
+            }
+            $labels = collect(data_get($service, 'labels', []));
+            if (!$labels->contains('coolify.managed')) {
+                $labels->push('coolify.managed=true');
+            }
+            if (!$labels->contains('coolify.applicationId')) {
+                $labels->push('coolify.applicationId=' . $this->id);
+            }
+            if (!$labels->contains('coolify.type')) {
+                $labels->push('coolify.type=application');
+            }
+            data_set($service, 'labels', $labels->toArray());
+            return $service;
+        });
+        data_set($yaml, 'services', $services->toArray());
+        $this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
+
+        instant_remote_process($commands, $this->destination->server, false);
+    }
     function parseCompose(int $pull_request_id = 0)
     {
         if ($this->docker_compose_raw) {

app/Models/LocalFileVolume.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Str;
 
 class LocalFileVolume extends BaseModel
 {

app/Models/ScheduledDatabaseBackup.php

@@ -30,4 +30,8 @@ class ScheduledDatabaseBackup extends BaseModel
     {
         return $this->belongsTo(S3Storage::class, 's3_storage_id');
     }
+    public function get_last_days_backup_status($days = 7)
+    {
+        return $this->hasMany(ScheduledDatabaseBackupExecution::class)->where('created_at', '>=', now()->subDays($days))->get();
+    }
 }

app/Models/Server.php

@@ -275,6 +275,8 @@ class Server extends BaseModel
             });
             $containers = $containers->filter();
             return collect($containers);
+        } else {
+            return collect([]);
         }
     }
     public function hasDefinedResources()
@@ -363,8 +365,9 @@ class Server extends BaseModel
     {
         $standalone_docker = $this->hasMany(StandaloneDocker::class)->get();
         $swarm_docker = $this->hasMany(SwarmDocker::class)->get();
-        $asd = $this->belongsToMany(StandaloneDocker::class, 'additional_destinations')->withPivot('server_id')->get();
+        // $additional_dockers = $this->belongsToMany(StandaloneDocker::class, 'additional_destinations')->withPivot('server_id')->get();
-        return $standalone_docker->concat($swarm_docker)->concat($asd);
+        // return $standalone_docker->concat($swarm_docker)->concat($additional_dockers);
+        return $standalone_docker->concat($swarm_docker);
     }
 
     public function standaloneDockers()

app/Models/Service.php

@@ -102,6 +102,32 @@ class Service extends BaseModel
         foreach ($applications as $application) {
             $image = str($application->image)->before(':')->value();
             switch ($image) {
+                case str($image)?->contains('directus'):
+                    $data = collect([]);
+                    $admin_email = $this->environment_variables()->where('key', 'ADMIN_EMAIL')->first();
+                    $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_ADMIN')->first();
+
+                    if ($admin_email) {
+                        $data = $data->merge([
+                            'Admin Email' => [
+                                'key' => data_get($admin_email, 'key'),
+                                'value' => data_get($admin_email, 'value'),
+                                'rules' => 'required|email',
+                            ],
+                        ]);
+                    }
+                    if ($admin_password) {
+                        $data = $data->merge([
+                            'Admin Password' => [
+                                'key' => data_get($admin_password, 'key'),
+                                'value' => data_get($admin_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    $fields->put('Directus', $data);
+                    break;
                 case str($image)?->contains('kong'):
                     $data = collect([]);
                     $dashboard_user = $this->environment_variables()->where('key', 'SERVICE_USER_ADMIN')->first();

app/Models/ServiceApplication.php

@@ -23,6 +23,10 @@ class ServiceApplication extends BaseModel
     {
         return data_get($this, 'is_log_drain_enabled', false);
     }
+    public function isStripprefixEnabled()
+    {
+        return data_get($this, 'is_stripprefix_enabled', true);
+    }
     public function isGzipEnabled()
     {
         return data_get($this, 'is_gzip_enabled', true);

app/Models/ServiceDatabase.php

@@ -21,9 +21,13 @@ class ServiceDatabase extends BaseModel
     {
         return data_get($this, 'is_log_drain_enabled', false);
     }
+    public function isStripprefixEnabled()
+    {
+        return data_get($this, 'is_stripprefix_enabled', true);
+    }
     public function isGzipEnabled()
     {
-        return true;
+        return data_get($this, 'is_gzip_enabled', true);
     }
     public function type()
     {

app/Models/StandaloneMariadb.php

@@ -126,7 +126,7 @@ class StandaloneMariadb extends BaseModel
         );
     }
 
-    public function getDbUrl(bool $useInternal = false): string
+    public function get_db_url(bool $useInternal = false): string
     {
         if ($this->is_public && !$useInternal) {
             return "mysql://{$this->mariadb_user}:{$this->mariadb_password}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mariadb_database}";

app/Models/StandaloneMongodb.php

@@ -142,7 +142,7 @@ class StandaloneMongodb extends BaseModel
     {
         return 'standalone-mongodb';
     }
-    public function getDbUrl(bool $useInternal = false)
+    public function get_db_url(bool $useInternal = false)
     {
         if ($this->is_public && !$useInternal) {
             return "mongodb://{$this->mongo_initdb_root_username}:{$this->mongo_initdb_root_password}@{$this->destination->server->getIp}:{$this->public_port}/?directConnection=true";

app/Models/StandaloneMysql.php

@@ -127,7 +127,7 @@ class StandaloneMysql extends BaseModel
         );
     }
 
-    public function getDbUrl(bool $useInternal = false): string
+    public function get_db_url(bool $useInternal = false): string
     {
         if ($this->is_public && !$useInternal) {
             return "mysql://{$this->mysql_user}:{$this->mysql_password}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mysql_database}";

app/Models/StandalonePostgresql.php

@@ -126,7 +126,7 @@ class StandalonePostgresql extends BaseModel
     {
         return 'standalone-postgresql';
     }
-    public function getDbUrl(bool $useInternal = false): string
+    public function get_db_url(bool $useInternal = false): string
     {
         if ($this->is_public && !$useInternal) {
             return "postgres://{$this->postgres_user}:{$this->postgres_password}@{$this->destination->server->getIp}:{$this->public_port}/{$this->postgres_db}";

app/Models/StandaloneRedis.php

@@ -122,7 +122,7 @@ class StandaloneRedis extends BaseModel
     {
         return 'standalone-redis';
     }
-    public function getDbUrl(bool $useInternal = false): string
+    public function get_db_url(bool $useInternal = false): string
     {
         if ($this->is_public && !$useInternal) {
             return "redis://:{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";

app/Models/Team.php

@@ -62,6 +62,9 @@ class Team extends Model implements SendsDiscord, SendsEmail
     }
     static public function serverLimit()
     {
+        if (currentTeam()->id === 0 && isDev()) {
+            return 9999999;
+        }
         return Team::find(currentTeam()->id)->limits['serverLimit'];
     }
     public function limits(): Attribute
@@ -141,7 +144,6 @@ class Team extends Model implements SendsDiscord, SendsEmail
         $sources = collect([]);
         $github_apps = $this->hasMany(GithubApp::class)->whereisPublic(false)->get();
         $gitlab_apps = $this->hasMany(GitlabApp::class)->whereisPublic(false)->get();
-        // $bitbucket_apps = $this->hasMany(BitbucketApp::class)->get();
         $sources = $sources->merge($github_apps)->merge($gitlab_apps);
         return $sources;
     }

app/Models/TeamInvitation.php

@@ -26,6 +26,7 @@ class TeamInvitation extends Model
             return true;
         } else {
             $this->delete();
+            return false;
         }
     }
 }

app/Models/User.php

@@ -50,6 +50,21 @@ class User extends Authenticatable implements SendsEmail
             $user->teams()->attach($new_team, ['role' => 'owner']);
         });
     }
+    public function recreate_personal_team()
+    {
+        $team = [
+            'name' => $this->name . "'s Team",
+            'personal_team' => true,
+            'show_boarding' => true
+        ];
+        if ($this->id === 0) {
+            $team['id'] = 0;
+            $team['name'] = 'Root Team';
+        }
+        $new_team = Team::create($team);
+        $this->teams()->attach($new_team, ['role' => 'owner']);
+        return $new_team;
+    }
     public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
     {
         $plainTextToken = sprintf(
@@ -143,7 +158,7 @@ class User extends Authenticatable implements SendsEmail
     public function currentTeam()
     {
         return Cache::remember('team:' . auth()->user()->id, 3600, function () {
-            if (is_null(data_get(session('currentTeam'), 'id'))) {
+            if (is_null(data_get(session('currentTeam'), 'id')) && auth()->user()->teams->count() > 0){
                 return auth()->user()->teams[0];
             }
             return Team::find(session('currentTeam')->id);

app/Notifications/Application/DeploymentSuccess.php

@@ -43,7 +43,13 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        return setNotificationChannels($notifiable, 'deployments');
+        $channels = setNotificationChannels($notifiable, 'deployments');
+        if (isCloud()) {
+            $channels = array_filter($channels, function ($channel) {
+                return $channel !== 'App\Notifications\Channels\EmailChannel';
+            });
+        }
+        return $channels;
     }
 
     public function toMail(): MailMessage
@@ -69,7 +75,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue
     public function toDiscord(): string
     {
         if ($this->preview) {
-            $message = 'Coolify:  New PR' . $this->preview->pull_request_id . ' version successfully deployed of ' . $this->application_name . '
+            $message = 'Coolify: New PR' . $this->preview->pull_request_id . ' version successfully deployed of ' . $this->application_name . '
 
 ';
             if ($this->preview->fqdn) {

app/Notifications/Database/DailyBackup.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Notifications\Database;
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Channels\MailChannel;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class DailyBackup extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+
+    public function __construct(public $databases)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        return [DiscordChannel::class, TelegramChannel::class, MailChannel::class];
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Daily backup statuses");
+        $mail->view('emails.daily-backup', [
+            'databases' => $this->databases,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        return "Coolify: Daily backup statuses";
+    }
+    public function toTelegram(): array
+    {
+        $message = "Coolify: Daily backup statuses";
+        return [
+            "message" => $message,
+        ];
+    }
+}

app/Notifications/Server/DockerCleanup.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class DockerCleanup extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server, public string $message)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        // $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        // if ($isEmailEnabled) {
+        //     $channels[] = EmailChannel::class;
+        // }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    // public function toMail(): MailMessage
+    // {
+    //     $mail = new MailMessage();
+    //     $mail->subject("Coolify: Server ({$this->server->name}) high disk usage detected!");
+    //     $mail->view('emails.high-disk-usage', [
+    //         'name' => $this->server->name,
+    //         'disk_usage' => $this->disk_usage,
+    //         'threshold' => $this->cleanup_after_percentage,
+    //     ]);
+    //     return $mail;
+    // }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server '{$this->server->name}' cleanup job done!\n\n{$this->message}";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server '{$this->server->name}' cleanup job done!\n\n{$this->message}"
+        ];
+    }
+}

app/Providers/EventServiceProvider.php

@@ -2,13 +2,21 @@
 
 namespace App\Providers;
 
-use Illuminate\Auth\Events\Registered;
+use App\Listeners\MaintenanceModeDisabledNotification;
-use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
+use App\Listeners\MaintenanceModeEnabledNotification;
+use Illuminate\Foundation\Events\MaintenanceModeDisabled;
+use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider
 {
     protected $listen = [
+        MaintenanceModeEnabled::class => [
+            MaintenanceModeEnabledNotification::class,
+        ],
+        MaintenanceModeDisabled::class => [
+            MaintenanceModeDisabledNotification::class,
+        ],
         // Registered::class => [
         //     SendEmailVerificationNotification::class,
         // ],

app/Providers/FortifyServiceProvider.php

@@ -8,14 +8,12 @@ use App\Actions\Fortify\UpdateUserPassword;
 use App\Actions\Fortify\UpdateUserProfileInformation;
 use App\Models\InstanceSettings;
 use App\Models\User;
-use App\Models\Waitlist;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Fortify\Contracts\RegisterResponse;
-use Laravel\Fortify\Features;
 use Laravel\Fortify\Fortify;
 
 class FortifyServiceProvider extends ServiceProvider
@@ -76,7 +74,11 @@ class FortifyServiceProvider extends ServiceProvider
             ) {
                 $user->updated_at = now();
                 $user->save();
-                session(['currentTeam' => $user->currentTeam = $user->teams->firstWhere('personal_team', true)]);
+                $user->currentTeam = $user->teams->firstWhere('personal_team', true);
+                if (!$user->currentTeam) {
+                    $user->currentTeam = $user->recreate_personal_team();
+                }
+                session(['currentTeam' => $user->currentTeam]);
                 return $user;
             }
         });

bootstrap/helpers/docker.php

@@ -215,7 +215,7 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource,
     }
     return $payload;
 }
-function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?string $service_name = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -281,8 +281,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
+                    if ($is_stripprefix_enabled) {
-                    $middlewares = collect(["{$https_label}-stripprefix"]);
+                        $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
+                        $middlewares = collect(["{$https_label}-stripprefix"]);
+                    }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
@@ -334,8 +336,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
+                    if ($is_stripprefix_enabled) {
-                    $middlewares = collect(["{$http_label}-stripprefix"]);
+                        $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
+                        $middlewares = collect(["{$http_label}-stripprefix"]);
+                    }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
@@ -392,7 +396,14 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
             $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
         }
         // Add Traefik labels no matter which proxy is selected
-        $labels = $labels->merge(fqdnLabelsForTraefik($appUuid, $domains, $application->settings->is_force_https_enabled, $onlyPort));
+        $labels = $labels->merge(fqdnLabelsForTraefik(
+            uuid: $appUuid,
+            domains: $domains,
+            onlyPort: $onlyPort,
+            is_force_https_enabled: $application->isForceHttpsEnabled(),
+            is_gzip_enabled: $application->isGzipEnabled(),
+            is_stripprefix_enabled: $application->isStripprefixEnabled()
+        ));
     }
     return $labels->all();
 }

bootstrap/helpers/shared.php

@@ -1047,7 +1047,15 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 $serviceLabels = $serviceLabels->merge($defaultLabels);
                 if (!$isDatabase && $fqdns->count() > 0) {
                     if ($fqdns) {
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($resource->uuid, $fqdns, true, serviceLabels: $serviceLabels, is_gzip_enabled: $savedService->isGzipEnabled(), service_name: $serviceName));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
+                            uuid: $resource->uuid,
+                            domains: $fqdns,
+                            is_force_https_enabled: true,
+                            serviceLabels: $serviceLabels,
+                            is_gzip_enabled: $savedService->isGzipEnabled(),
+                            is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
+                            service_name: $serviceName
+                        ));
                     }
                 }
                 if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
@@ -1249,7 +1257,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             // Collect/create/update networks
             if ($serviceNetworks->count() > 0) {
                 foreach ($serviceNetworks as $networkName => $networkDetails) {
-                    ray($networkDetails);
                     $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
                         return $value == $networkName || $key == $networkName;
                     });
@@ -1405,7 +1412,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 ]);
                             }
                         } else {
-                            $generatedValue = generateEnvValue($command, $service);
+                            $generatedValue = generateEnvValue($command);
                             if (!$foundEnv) {
                                 EnvironmentVariable::create([
                                     'key' => $key,
@@ -1581,7 +1588,7 @@ function parseEnvVariable(Str|string $value)
         'port' => $port,
     ];
 }
-function generateEnvValue(string $command, Service $service)
+function generateEnvValue(string $command, ?Service $service = null)
 {
     switch ($command) {
         case 'PASSWORD':
@@ -1590,6 +1597,7 @@ function generateEnvValue(string $command, Service $service)
         case 'PASSWORD_64':
             $generatedValue = Str::password(length: 64, symbols: false);
             break;
+            // This is not base64, it's just a random string
         case 'BASE64_64':
             $generatedValue = Str::random(64);
             break;
@@ -1597,8 +1605,20 @@ function generateEnvValue(string $command, Service $service)
             $generatedValue = Str::random(128);
             break;
         case 'BASE64':
+        case 'BASE64_32':
             $generatedValue = Str::random(32);
             break;
+            // This is base64,
+        case 'REALBASE64_64':
+            $generatedValue = base64_encode(Str::random(64));
+            break;
+        case 'REALBASE64_128':
+            $generatedValue = base64_encode(Str::random(128));
+            break;
+        case 'REALBASE64':
+        case 'REALBASE64_32':
+            $generatedValue = base64_encode(Str::random(32));
+            break;
         case 'USER':
             $generatedValue = Str::random(16);
             break;

config/filesystems.php

@@ -35,6 +35,13 @@ return [
             'throw' => false,
         ],
 
+        'webhooks-during-maintenance' => [
+            'driver' => 'local',
+            'root' => storage_path('app/webhooks-during-maintenance'),
+            'visibility' => 'private',
+            'throw' => false,
+        ],
+
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // 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.228',
+    'release' => '4.0.0-beta.236',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.228';
+return '4.0.0-beta.236';

database/migrations/2024_03_04_092244_add_gzip_enabled_and_stripprefix_settings.php

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

database/seeders/DatabaseSeeder.php

@@ -18,7 +18,6 @@ class DatabaseSeeder extends Seeder
             ProjectSeeder::class,
             ProjectSettingSeeder::class,
             EnvironmentSeeder::class,
-            TeamEnvironmentVariableSeeder::class,
             StandaloneDockerSeeder::class,
             SwarmDockerSeeder::class,
             KubernetesSeeder::class,

docker-compose.prod.yml

@@ -12,6 +12,7 @@ services:
       - /data/coolify/databases:/var/www/html/storage/app/databases
       - /data/coolify/services:/var/www/html/storage/app/services
       - /data/coolify/backups:/var/www/html/storage/app/backups
+      - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
       - APP_ID
       - APP_ENV=production

docker-compose.windows.yml

@@ -26,6 +26,7 @@ services:
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
+      - ./webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     env_file:
       - .env
     environment:

package-lock.json

@@ -13,15 +13,15 @@
             },
             "devDependencies": {
                 "@vitejs/plugin-vue": "4.5.1",
-                "autoprefixer": "10.4.17",
+                "autoprefixer": "10.4.18",
                 "axios": "1.6.7",
-                "laravel-echo": "1.15.3",
+                "laravel-echo": "1.16.0",
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.35",
                 "pusher-js": "8.4.0-rc2",
                 "tailwindcss": "3.4.1",
                 "vite": "4.5.2",
-                "vue": "3.4.19"
+                "vue": "3.4.21"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -36,9 +36,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.23.9",
+            "version": "7.24.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
-            "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+            "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -524,77 +524,77 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
-            "integrity": "sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==",
+            "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.23.9",
-                "@vue/shared": "3.4.19",
+                "@vue/shared": "3.4.21",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
-            "integrity": "sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==",
+            "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.19",
+                "@vue/compiler-core": "3.4.21",
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
-            "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==",
+            "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.23.9",
-                "@vue/compiler-core": "3.4.19",
+                "@vue/compiler-core": "3.4.21",
-                "@vue/compiler-dom": "3.4.19",
+                "@vue/compiler-dom": "3.4.21",
-                "@vue/compiler-ssr": "3.4.19",
+                "@vue/compiler-ssr": "3.4.21",
-                "@vue/shared": "3.4.19",
+                "@vue/shared": "3.4.21",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.6",
+                "magic-string": "^0.30.7",
-                "postcss": "^8.4.33",
+                "postcss": "^8.4.35",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
-            "integrity": "sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==",
+            "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.19",
+                "@vue/compiler-dom": "3.4.21",
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -606,64 +606,64 @@
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
-            "integrity": "sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==",
+            "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.4.19",
+                "@vue/reactivity": "3.4.21",
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
-            "integrity": "sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==",
+            "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
-            "integrity": "sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==",
+            "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.4.19",
+                "@vue/runtime-core": "3.4.21",
-                "@vue/shared": "3.4.19",
+                "@vue/shared": "3.4.21",
                 "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
-            "integrity": "sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==",
+            "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.4.19",
+                "@vue/compiler-ssr": "3.4.21",
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             },
             "peerDependencies": {
-                "vue": "3.4.19"
+                "vue": "3.4.21"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -708,9 +708,9 @@
             "dev": true
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.17",
+            "version": "10.4.18",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
-            "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+            "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
             "dev": true,
             "funding": [
                 {
@@ -727,8 +727,8 @@
                 }
             ],
             "dependencies": {
-                "browserslist": "^4.22.2",
+                "browserslist": "^4.23.0",
-                "caniuse-lite": "^1.0.30001578",
+                "caniuse-lite": "^1.0.30001591",
                 "fraction.js": "^4.3.7",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
@@ -789,9 +789,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.22.2",
+            "version": "4.23.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-            "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+            "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
             "dev": true,
             "funding": [
                 {
@@ -808,8 +808,8 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001565",
+                "caniuse-lite": "^1.0.30001587",
-                "electron-to-chromium": "^1.4.601",
+                "electron-to-chromium": "^1.4.668",
                 "node-releases": "^2.0.14",
                 "update-browserslist-db": "^1.0.13"
             },
@@ -829,9 +829,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001580",
+            "version": "1.0.30001594",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz",
-            "integrity": "sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==",
+            "integrity": "sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==",
             "dev": true,
             "funding": [
                 {
@@ -1014,9 +1014,9 @@
             "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.647",
+            "version": "1.4.692",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.647.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.692.tgz",
-            "integrity": "sha512-Z/fTNGwc45WrYQhPaEcz5tAJuZZ8G7S/DBnhS6Kgp4BxnS40Z/HqlJ0hHg3Z79IGVzuVartIlTcjw/cQbPLgOw==",
+            "integrity": "sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA==",
             "dev": true
         },
         "node_modules/entities": {
@@ -1069,9 +1069,9 @@
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.1",
+            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
             "dev": true,
             "engines": {
                 "node": ">=6"
@@ -1347,9 +1347,9 @@
             }
         },
         "node_modules/laravel-echo": {
-            "version": "1.15.3",
+            "version": "1.16.0",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.3.tgz",
+            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.0.tgz",
-            "integrity": "sha512-SRXzccaat6w4qKgZ4/rjFKr3nJfVxB+ly4V0MEJNIF1/TpERNXepo3uk7NnOjBGsiV/np1fl2XitAzW4Sa1s/w==",
+            "integrity": "sha512-BJGUa4tcKvYmTkzTmcBGMHiO2tq+k7Do5wPmLbRswWfzKwyfZEUR+J5iwBTPEfLLwNPZlA9Kjo6R/NV6pmyIpg==",
             "dev": true,
             "engines": {
                 "node": ">=10"
@@ -1410,9 +1410,9 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
         "node_modules/magic-string": {
-            "version": "0.30.7",
+            "version": "0.30.8",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-            "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
+            "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
@@ -2106,16 +2106,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
-            "integrity": "sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==",
+            "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.19",
+                "@vue/compiler-dom": "3.4.21",
-                "@vue/compiler-sfc": "3.4.19",
+                "@vue/compiler-sfc": "3.4.21",
-                "@vue/runtime-dom": "3.4.19",
+                "@vue/runtime-dom": "3.4.21",
-                "@vue/server-renderer": "3.4.19",
+                "@vue/server-renderer": "3.4.21",
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2127,9 +2127,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.4.19",
+            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -7,15 +7,15 @@
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "4.5.1",
-        "autoprefixer": "10.4.17",
+        "autoprefixer": "10.4.18",
         "axios": "1.6.7",
-        "laravel-echo": "1.15.3",
+        "laravel-echo": "1.16.0",
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.35",
         "pusher-js": "8.4.0-rc2",
         "tailwindcss": "3.4.1",
         "vite": "4.5.2",
-        "vue": "3.4.19"
+        "vue": "3.4.21"
     },
     "dependencies": {
         "@tailwindcss/typography": "0.5.10",

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

@@ -1,8 +1,10 @@
 <div class="group">
-    @if (data_get($application, 'fqdn') ||
+    @if (
+        (data_get($application, 'fqdn') ||
             collect(json_decode($this->application->docker_compose_domains))->count() > 0 ||
             data_get($application, 'previews', collect([]))->count() > 0 ||
-            data_get($application, 'ports_mappings_array'))
+            data_get($application, 'ports_mappings_array')) &&
+            data_get($application, 'settings.is_raw_compose_deployment_enabled') !== true)
         <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Open Application
             <x-chevron-down />
         </label>

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

@@ -5,27 +5,6 @@
     </a>
     <x-services.links />
     <div class="flex-1"></div>
-    @if (str($service->status())->contains('degraded'))
-        <button wire:click='deploy' onclick="startService.showModal()"
-            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                    <path d="M20 4v5h-5" />
-                </g>
-            </svg>
-            Restart Degraded Services
-        </button>
-        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
-                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-            </svg>
-            Stop
-        </button>
-    @endif
     @if (str($service->status())->contains('running'))
         <button wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -45,8 +24,27 @@
             </svg>
             Stop
         </button>
-    @endif
+    @elseif (str($service->status())->contains('degraded'))
-    @if (str($service->status())->contains('exited'))
+        <button wire:click='deploy' onclick="startService.showModal()"
+            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                    <path d="M20 4v5h-5" />
+                </g>
+            </svg>
+            Restart Degraded Services
+        </button>
+        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+            </svg>
+            Stop
+        </button>
+    @elseif (str($service->status())->contains('exited'))
         <button wire:click='stop(true)'
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
@@ -65,6 +63,25 @@
             </svg>
             Deploy
         </button>
+    @else
+        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+            </svg>
+            Stop
+        </button>
+        <button wire:click='deploy' onclick="startService.showModal()"
+            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-warning" viewBox="0 0 24 24" stroke-width="1.5"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                <path d="M7 4v16l13 -8z" />
+            </svg>
+            Deploy
+        </button>
     @endif
 </div>
 

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

@@ -1,8 +1,8 @@
-@if (Str::of($complexStatus)->startsWith('running'))
+@if (str($complexStatus)->contains('running'))
     <x-status.running :status="$complexStatus" />
-@elseif(Str::of($complexStatus)->startsWith('restarting'))
+@elseif(str($complexStatus)->contains('restarting'))
     <x-status.restarting :status="$complexStatus" />
-@elseif(Str::of($complexStatus)->startsWith('degraded'))
+@elseif(str($complexStatus)->contains('degraded'))
     <x-status.degraded :status="$complexStatus" />
 @else
     <x-status.stopped :status="$complexStatus" />

resources/views/emails/daily-backup.blade.php

@@ -0,0 +1,19 @@
+<x-emails.layout>
+@foreach ($databases as $database_name => $databases)
+
+@if(data_get($databases,'failed_count') > 0)
+
+<div style="color:red">
+
+"{{ $database_name }}" backups: There were some failed backups. Please login and check the logs for more details.
+
+</div>
+
+@else
+
+"{{ $database_name }}" backups: All backups were successful.
+
+@endif
+
+@endforeach
+</x-emails.layout>

resources/views/layouts/base.blade.php

@@ -5,6 +5,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="preconnect" href="https://api.fonts.coollabs.io" crossorigin>
+    <link rel="dns-prefetch" href="https://api.fonts.coollabs.io" />
+    <link rel="preload" href="https://api.fonts.coollabs.io/css2?family=Inter&display=swap" as="style" />
+    <link rel="preload" href="https://cdn.fonts.coollabs.io/inter/normal/400.woff2" as="style" />
     <link href="https://api.fonts.coollabs.io/css2?family=Inter&display=swap" rel="stylesheet">
     <meta name="robots" content="noindex">
     <title>Coolify</title>

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

@@ -4,8 +4,8 @@
             <h2>Advanced</h2>
         </div>
         <div>Advanced configuration for your application.</div>
-        <div class="flex flex-col pt-4 ">
+        <div class="flex flex-col pt-4 w-96">
-            <h4>General</h4>
+            <h3>General</h3>
             @if ($application->git_based())
                 <x-forms.checkbox helper="Automatically deploy new commits based on Git webhooks." instantSave
                     id="application.settings.is_auto_deploy_enabled" label="Auto Deploy" />
@@ -20,50 +20,57 @@
                 helper="The deployed container will have the same name ({{ $application->uuid }}). <span class='font-bold text-warning'>You will lose the rolling update feature!</span>"
                 instantSave id="application.settings.is_consistent_container_name_enabled"
                 label="Consistent Container Names" />
-            <h4>Logs</h4>
+            <x-forms.checkbox label="Enable gzip compression"
+                helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this."
+                instantSave id="is_gzip_enabled" />
+            <x-forms.checkbox helper="Strip Prefix is used to remove prefixes from paths. Like /api/ to /api."
+                instantSave id="is_stripprefix_enabled" label="Strip Prefixes" />
+            <h3>Logs</h3>
             @if (!$application->settings->is_raw_compose_deployment_enabled)
                 <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
                     instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
             @endif
 
             @if ($application->git_based())
-                <h4>Git</h4>
+                <h3>Git</h3>
-                <x-forms.checkbox instantSave id="application.settings.is_git_submodules_enabled" label="Git Submodules"
+                <x-forms.checkbox instantSave id="application.settings.is_git_submodules_enabled" label="Submodules"
                     helper="Allow Git Submodules during build process." />
-                <x-forms.checkbox instantSave id="application.settings.is_git_lfs_enabled" label="Git LFS"
+                <x-forms.checkbox instantSave id="application.settings.is_git_lfs_enabled" label="LFS"
                     helper="Allow Git LFS during build process." />
             @endif
-            <h4>GPU</h4>
-            <form wire:submit="submit">
-                @if ($application->build_pack !== 'dockercompose')
-                    <div class="flex gap-2">
-                        <x-forms.checkbox
-                            helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>."
-                            instantSave id="application.settings.is_gpu_enabled" label="Attach GPU" />
-                        @if ($application->settings->is_gpu_enabled)
-                            <x-forms.button type="submiot">Save</x-forms.button>
-                        @endif
-                    </div>
-                @endif
-                @if ($application->settings->is_gpu_enabled)
-                    <div class="flex flex-col w-full gap-2 p-2 xl:flex-row">
-                        <x-forms.input label="GPU Driver" id="application.settings.gpu_driver"> </x-forms.input>
-                        <x-forms.input label="GPU Count" placeholder="empty means use all GPUs"
-                            id="application.settings.gpu_count"> </x-forms.input>
-                        <x-forms.input label="GPU Device Ids" placeholder="0,2"
-                            helper="Comma separated list of device ids. More info <a href='https://docs.docker.com/compose/gpu-support/#access-specific-devices' class='text-white underline' target='_blank'>here</a>."
-                            id="application.settings.gpu_device_ids"> </x-forms.input>
-
-                    </div>
-                    <div class="px-2">
-                        <x-forms.textarea label="GPU Options" id="application.settings.gpu_options">
-                        </x-forms.textarea>
-                    </div>
-                @endif
-            </form>
             {{-- <x-forms.checkbox disabled instantSave id="is_dual_cert" label="Dual Certs?" />
             <x-forms.checkbox disabled instantSave id="is_custom_ssl" label="Is Custom SSL?" />
             <x-forms.checkbox disabled instantSave id="is_http2" label="Is Http2?" /> --}}
         </div>
+        <h3>GPU</h3>
+        <form wire:submit="submit">
+            @if ($application->build_pack !== 'dockercompose')
+                <div class="w-96">
+                    <x-forms.checkbox
+                        helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>."
+                        instantSave id="application.settings.is_gpu_enabled" label="Attach GPU" />
+                    @if ($application->settings->is_gpu_enabled)
+                        <h5>GPU Settings</h5>
+
+                        <x-forms.button type="submit">Save</x-forms.button>
+                    @endif
+                </div>
+            @endif
+            @if ($application->settings->is_gpu_enabled)
+                <div class="flex flex-col w-full gap-2 p-2 xl:flex-row">
+                    <x-forms.input label="GPU Driver" id="application.settings.gpu_driver"> </x-forms.input>
+                    <x-forms.input label="GPU Count" placeholder="empty means use all GPUs"
+                        id="application.settings.gpu_count"> </x-forms.input>
+                    <x-forms.input label="GPU Device Ids" placeholder="0,2"
+                        helper="Comma separated list of device ids. More info <a href='https://docs.docker.com/compose/gpu-support/#access-specific-devices' class='text-white underline' target='_blank'>here</a>."
+                        id="application.settings.gpu_device_ids"> </x-forms.input>
+
+                </div>
+                <div class="px-2">
+                    <x-forms.textarea label="GPU Options" id="application.settings.gpu_options">
+                    </x-forms.textarea>
+                </div>
+            @endif
+        </form>
     </div>
 </div>

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

@@ -27,10 +27,17 @@
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
             @endif
-            <a :class="activeTab === 'servers' && 'text-white'"
+            <a :class="activeTab === 'servers' && 'text-white'" class="flex items-center gap-2"
                 @click.prevent="activeTab = 'servers'; window.location.hash = 'servers'" href="#">Servers
+                @if (str($application->status)->contains('degraded'))
+                    <span title="Some servers are unavailable">
+                        <svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
+                        </svg>
+                    </span>
+                @endif
             </a>
-
             <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
                 @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
                 href="#">Scheduled Tasks

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

@@ -8,7 +8,8 @@
             @if ($isConfigurationChanged && !is_null($application->config_hash) && !$application->isExited())
                 <div title="Configuration not applied to the running application. You need to redeploy.">
                     <svg class="w-6 h-6 text-warning" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor" d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16"/>
+                        <path fill="currentColor"
+                            d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
                     </svg>
                 </div>
             @endif
@@ -44,9 +45,11 @@
                         </div>
                     @endif
                     @if ($application->build_pack === 'dockercompose')
+                    <div class="w-96">
                         <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
                             label="Raw Compose Deployment"
                             helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
+                    </div>
                         @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
@@ -100,11 +103,15 @@
                             <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
                         @endif
                     @else
-                        @if ($application->destination->server->isSwarm() || $application->additional_servers->count() > 0)
+                        @if (
-                            <x-forms.input id="application.docker_registry_image_name" required label="Docker Image" />
+                            $application->destination->server->isSwarm() ||
+                                $application->additional_servers->count() > 0 ||
+                                $application->settings->is_build_server_enabled)
+                            <x-forms.input id="application.docker_registry_image_name" required label="Docker Image"
+                                placeholder="Required!" />
                             <x-forms.input id="application.docker_registry_image_tag"
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
-                                label="Docker Image Tag" />
+                                placeholder="Empty means latest will be used." label="Docker Image Tag" />
                         @else
                             <x-forms.input id="application.docker_registry_image_name"
                                 helper="Empty means it won't push the image to a docker registry."
@@ -202,7 +209,11 @@
                         placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k"
                         id="application.custom_docker_run_options" label="Custom Docker Options" />
                 @endif
-
+            @else
+            <x-forms.input
+                helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='text-white underline' href='https://coolify.io/docs/custom-docker-options'>docs.</a>"
+                placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k"
+                id="application.custom_docker_run_options" label="Custom Docker Options" />
             @endif
             @if ($application->build_pack === 'dockercompose')
                 <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>

resources/views/livewire/project/database/heading.blade.php

@@ -1,4 +1,4 @@
-<nav wire:poll.30000ms="check_status">
+<nav wire:poll.5000ms="check_status">
     <x-resources.breadcrumbs :resource="$database" :parameters="$parameters" />
     <x-databases.navbar :database="$database" :parameters="$parameters" />
 </nav>

resources/views/livewire/project/new/public-git-repository.blade.php

@@ -12,12 +12,23 @@
                 </div>
                 @if (!$branch_found)
                     <div class="px-2 pt-4">
-                        <p>Public repositories: <span class='text-helper'>https://...</span></p>
+                        <div class="flex gap-1">
-                        <p>Private repositories: <span class='text-helper'>git@...</span></p>
+                            <div>Public:</div>
-                        <p>Preselect branch: <span
+                            <div class='text-helper'>https://..</div>
-                                class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</span> to
+                        </div>
-                            select 'static' branch.</p>
+                        <div class="flex gap-1">
-                    </div>
+                            <div>Private:</div>
+                            <div class='text-helper'>git@..</div>
+                        </div>
+                        <div class="flex gap-1">
+                            <div>Preselect branch (eg: static):</div>
+                            <div class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</div>
+                        </div>
+                        <div>
+                            For example application deployments, checkout <a class="text-white underline"
+                                href="https://github.com/coollabsio/coolify-examples/" target="_blank">Coolify
+                                Examples</a>.
+                        </div>
                 @endif
                 @if ($branch_found)
                     @if ($rate_limit_remaining && $rate_limit_reset)

resources/views/livewire/project/resource/index.blade.php

@@ -45,7 +45,7 @@
             class="items-center justify-center box">+ Add New Resource</a>
     @else
         <div x-data="searchComponent()">
-            <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
+            <x-forms.input autofocus="true" placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
             <div class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                 <template x-for="item in filteredApplications" :key="item.id">
                     <span>

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

@@ -1,4 +1,4 @@
-<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus">
+<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status" wire:poll.5000ms="check_status">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">

resources/views/livewire/project/service/service-application-view.blade.php

@@ -34,7 +34,9 @@
         <h3 class="pt-2">Advanced</h3>
         <div class="w-96">
             <x-forms.checkbox instantSave id="application.is_gzip_enabled" label="Enable gzip compression"
-            helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this." />
+                helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this." />
+            <x-forms.checkbox instantSave id="application.is_stripprefix_enabled" label="Strip Prefixes"
+                helper="Strip Prefix is used to remove prefixes from paths. Like /api/ to /api." />
             <x-forms.checkbox instantSave label="Exclude from service status"
                 helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
                 id="application.exclude_from_status"></x-forms.checkbox>

resources/views/livewire/project/shared/execute-container-command.blade.php

@@ -12,23 +12,44 @@
     @elseif ($type === 'service')
         <h2>Execute Command</h2>
     @endif
-    @if (count($containers) > 0)
+    <div x-init="$wire.loadContainers">
-        <form class="flex flex-col gap-2 pt-4" wire:submit='runCommand'>
+        <div class="pt-4" wire:loading wire:target='loadContainers'>
-            <div class="flex gap-2">
+            Loading containers...
-                <x-forms.input placeholder="ls -l" autofocus id="command" label="Command" required />
+        </div>
-                <x-forms.input id="workDir" label="Working directory" />
+        <div wire:loading.remove wire:target='loadContainers'>
-            </div>
+            @if (count($containers) > 0)
-            <x-forms.select label="Container" id="container" required>
+                <form class="flex flex-col gap-2 pt-4" wire:submit='runCommand'>
-                <option disabled selected>Select container</option>
+                    <div class="flex gap-2">
-                @foreach ($containers as $container)
+                        <x-forms.input placeholder="ls -l" autofocus id="command" label="Command" required />
-                    <option value="{{ $container }}">{{ $container }}</option>
+                        <x-forms.input id="workDir" label="Working directory" />
-                @endforeach
+                    </div>
-            </x-forms.select>
+                    <x-forms.select label="Container" id="container" required>
-            <x-forms.button type="submit">Run</x-forms.button>
+                        <option disabled selected>Select container</option>
-        </form>
+                        @if (data_get($this->parameters, 'application_uuid'))
-    @else
+                            @foreach ($containers as $container)
-        <div class="pt-4">No containers are not running.</div>
+                                <option value="{{ data_get($container, 'container.Names') }}">
-    @endif
+                                    {{ data_get($container, 'container.Names') }}
+                                </option>
+                            @endforeach
+                        @elseif(data_get($this->parameters, 'service_uuid'))
+                            @foreach ($containers as $container)
+                                <option value="{{ $container }}">
+                                    {{ $container }}
+                                </option>
+                            @endforeach
+                        @else
+                            <option value="{{ $container }}">
+                                {{ $container }}
+                            </option>
+                        @endif
+                    </x-forms.select>
+                    <x-forms.button type="submit">Run</x-forms.button>
+                </form>
+            @else
+                <div class="pt-4">No containers are not running.</div>
+            @endif
+        </div>
+    </div>
     <div class="container w-full pt-10 mx-auto">
         <livewire:activity-monitor header="Command output" />
     </div>

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

@@ -1,7 +1,12 @@
 <div>
     <div x-init="$wire.getLogs" id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }">
         <div class="flex items-center gap-2">
-            <h3>{{ str($container)->beforeLast('-')->headline() }}</h3>
+            @if ($resource?->type() === 'application')
+                <h3>{{ $container }}</h3>
+            @else
+                <h3>{{ str($container)->beforeLast('-')->headline() }}</h3>
+            @endif
+            <div>Server: {{ $server->name }} </div>
             @if ($pull_request)
                 <div>({{ $pull_request }})</div>
             @endif

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

@@ -3,14 +3,20 @@
         <h1>Logs</h1>
         <livewire:project.application.heading :application="$resource" />
         <div class="pt-4">
-            @forelse ($containers as $container)
+            <h2 class="pb-4">Logs</h2>
-                @if ($loop->first)
+            <div class="pt-2" wire:loading wire:target="loadContainers">
-                    <h2 class="pb-4">Logs</h2>
+                Loading containers...
-                @endif
+            </div>
-                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="$container" />
+            @foreach ($servers as $server)
-            @empty
+                <h3 x-init="$wire.loadContainers({{ $server->id }})"></h3>
-                <div>No containers are not running.</div>
+                <div wire:loading.remove wire:target="loadContainers">
-            @endforelse
+                    @forelse (data_get($server,'containers',[]) as $container)
+                        <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="data_get($container,'Names')" />
+                    @empty
+                        <div class="pt-2">No containers are not running on server: {{$server->name}}</div>
+                    @endforelse
+                </div>
+            @endforeach
         </div>
     @elseif ($type === 'database')
         <h1>Logs</h1>
@@ -20,9 +26,9 @@
                 @if ($loop->first)
                     <h2 class="pb-4">Logs</h2>
                 @endif
-                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="$container" />
+                <livewire:project.shared.get-logs :server="$servers[0]" :resource="$resource" :container="$container" />
             @empty
-                <div>No containers are not running.</div>
+                <div class="pt-2">No containers are not running.</div>
             @endforelse
         </div>
     @elseif ($type === 'service')
@@ -31,9 +37,9 @@
                 @if ($loop->first)
                     <h2 class="pb-4">Logs</h2>
                 @endif
-                <livewire:project.shared.get-logs :server="$server" :resource="$resource" :container="$container" />
+                <livewire:project.shared.get-logs :server="$servers[0]" :resource="$resource" :container="$container" />
             @empty
-                <div>No containers are not running.</div>
+                <div class="pt-2">No containers are not running.</div>
             @endforelse
         </div>
     @endif

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

@@ -11,7 +11,7 @@
                 </svg>
             </div>
         @empty
-            <div>No tags yet</div>
+            <div class="py-1">No tags yet</div>
         @endforelse
     </div>
     <form wire:submit='submit' class="flex items-end gap-2 pt-4">
@@ -23,8 +23,7 @@
         <x-forms.button type="submit">Add</x-forms.button>
     </form>
     @if ($tags->count() > 0)
-        <h3 class="pt-4">Already defined tags</h3>
+        <h3 class="pt-4">Quickly Add</h3>
-        <div>Click to quickly add one.</div>
         <div class="flex gap-2 pt-4">
             @foreach ($tags as $tag)
                 <x-forms.button wire:click="addTag('{{ $tag->id }}','{{ $tag->name }}')">

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

@@ -25,7 +25,7 @@
                     </div>
                     <div wire:loading.remove wire:target="loadProxyConfiguration">
                         @if ($proxy_settings)
-                            <div class="flex flex-col gap-2 pt-2">
+                            <div class="flex flex-col gap-2 pt-4">
                                 <x-forms.textarea label="Configuration file: traefik.conf" name="proxy_settings"
                                     wire:model="proxy_settings" rows="30" />
                                 <x-forms.button wire:click.prevent="reset_proxy_configuration">

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

@@ -20,10 +20,11 @@
         <h4 class="pb-4">Delete Team</h4>
         @if (session('currentTeam.id') === 0)
             <div>This is the default team. You can't delete it.</div>
-        @elseif(auth()->user()->teams()->get()->count() === 1)
+        @elseif(auth()->user()->teams()->get()->count() === 1 || auth()->user()->currentTeam()->personal_team)
-            <div>You can't delete your last team.</div>
+            <div>You can't delete your last / personal team.</div>
         @elseif(currentTeam()->subscription && currentTeam()->subscription?->lemon_status !== 'cancelled')
-            <div>Please cancel your subscription <a class="text-white underline" href="{{route('subscription.show')}}">here</a> before delete this team.</div>
+            <div>Please cancel your subscription <a class="text-white underline"
+                    href="{{ route('subscription.show') }}">here</a> before delete this team.</div>
         @else
             @if (currentTeam()->isEmpty())
                 <div class="pb-4">This will delete your team. Beware! There is no coming back!</div>

scripts/install.sh

@@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
 
-VERSION="1.2.0"
+VERSION="1.2.2"
 DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
@@ -27,11 +27,11 @@ if [ $EUID != 0 ]; then
 fi
 
 case "$OS_TYPE" in
-    arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
+arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed | almalinux) ;;
-    *)
+*)
-        echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
+    echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
-        exit
+    exit
-        ;;
+    ;;
 esac
 
 # Overwrite LATEST_VERSION if user pass a version number
@@ -54,27 +54,27 @@ echo -e "-------------"
 echo "Installing required packages..."
 
 case "$OS_TYPE" in
-    arch)
+arch)
-        pacman -Sy >/dev/null 2>&1 || true
+    pacman -Sy >/dev/null 2>&1 || true
-        if ! pacman -Q curl wget git jq >/dev/null 2>&1; then
+    if ! pacman -Q curl wget git jq >/dev/null 2>&1; then
-            pacman -S --noconfirm curl wget git jq >/dev/null 2>&1 || true
+        pacman -S --noconfirm curl wget git jq >/dev/null 2>&1 || true
-        fi
+    fi
-        ;;
+    ;;
-    ubuntu | debian | raspbian)
+ubuntu | debian | raspbian)
-        apt update -y >/dev/null 2>&1
+    apt update -y >/dev/null 2>&1
-            apt install -y curl wget git jq >/dev/null 2>&1
+    apt install -y curl wget git jq >/dev/null 2>&1
-        ;;
+    ;;
-    centos | fedora | rhel | ol | rocky)
+centos | fedora | rhel | ol | rocky | almalinux)
-        dnf install -y curl wget git jq >/dev/null 2>&1
+    dnf install -y curl wget git jq >/dev/null 2>&1
-        ;;
+    ;;
-    sles | opensuse-leap | opensuse-tumbleweed)
+sles | opensuse-leap | opensuse-tumbleweed)
-        zypper refresh >/dev/null 2>&1
+    zypper refresh >/dev/null 2>&1
-        zypper install -y curl wget git jq >/dev/null 2>&1
+    zypper install -y curl wget git jq >/dev/null 2>&1
-        ;;
+    ;;
-    *)
+*)
-        echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
+    echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
-        exit
+    exit
-        ;;
+    ;;
 esac
 
 # Detect OpenSSH server
@@ -113,7 +113,6 @@ if [ "$SSH_PERMIT_ROOT_LOGIN_CONFIG" = "prohibit-password" ] || [ "$SSH_PERMIT_R
     SSH_PERMIT_ROOT_LOGIN=true
 fi
 
-
 if [ "$SSH_PERMIT_ROOT_LOGIN" != "true" ]; then
     echo "###############################################################################"
     echo "WARNING: PermitRootLogin is not enabled in /etc/ssh/sshd_config."
@@ -124,33 +123,48 @@ if [ "$SSH_PERMIT_ROOT_LOGIN" != "true" ]; then
 fi
 
 if ! [ -x "$(command -v docker)" ]; then
-    echo "Docker is not installed. Installing Docker."
+    if [ "$OS_TYPE" == 'almalinux' ]; then
-    if [ "$OS_TYPE" = "arch" ]; then
+        dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-        pacman -Sy docker docker-compose --noconfirm
+        dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-        systemctl enable docker.service
+        if ! [ -x "$(command -v docker)" ]; then
-        if [ -x "$(command -v docker)" ]; then
+            echo "Docker could not be installed automatically. Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
-            echo "Docker installed successfully."
+            exit 1
-        else
-            echo "Failed to install Docker with pacman. Try to install it manually."
-            echo "Please visit https://wiki.archlinux.org/title/docker for more information."
-            exit
         fi
+        systemctl start docker
+        systemctl enable docker
     else
-        curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
+        set +e
-        if [ -x "$(command -v docker)" ]; then
+        if ! [ -x "$(command -v docker)" ]; then
-            echo "Docker installed successfully."
+            echo "Docker is not installed. Installing Docker."
-        else
+            if [ "$OS_TYPE" = "arch" ]; then
-            echo "Docker installation failed with Rancher script. Trying with official script."
+                pacman -Sy docker docker-compose --noconfirm
-            curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
+                systemctl enable docker.service
-            if [ -x "$(command -v docker)" ]; then
+                if [ -x "$(command -v docker)" ]; then
-                echo "Docker installed successfully."
+                    echo "Docker installed successfully."
+                else
+                    echo "Failed to install Docker with pacman. Try to install it manually."
+                    echo "Please visit https://wiki.archlinux.org/title/docker for more information."
+                    exit
+                fi
             else
-                echo "Docker installation failed with official script."
+                curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
-                echo "Maybe your OS is not supported?"
+                if [ -x "$(command -v docker)" ]; then
-                echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+                    echo "Docker installed successfully."
-                exit 1
+                else
+                    echo "Docker installation failed with Rancher script. Trying with official script."
+                    curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
+                    if [ -x "$(command -v docker)" ]; then
+                        echo "Docker installed successfully."
+                    else
+                        echo "Docker installation failed with official script."
+                        echo "Maybe your OS is not supported?"
+                        echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+                        exit 1
+                    fi
+                fi
             fi
         fi
+        set -e
     fi
 fi
 
@@ -198,7 +212,7 @@ fi
 
 echo -e "-------------"
 
-mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy}
+mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance}
 mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic
 

templates/compose/changedetection.yaml

@@ -0,0 +1,32 @@
+# documentation: https://github.com/dgtlmoon/changedetection.io/
+# slogan: Website change detection monitor and notifications.
+# tags: web, alert, monitor
+# logo: svgs/changedetection.png
+
+services:
+  changedetection:
+    image: ghcr.io/dgtlmoon/changedetection.io
+    volumes:
+      - changedetection-data:/datastore
+    environment:
+      - SERVICE_FQDN_CHANGEDETECTION
+      - PUID=1000
+      - PGID=1000
+      - BASE_URL=$SERVICE_FQDN_CHANGEDETECTION
+      - PLAYWRIGHT_DRIVER_URL=ws://playwright-chrome:3000/?stealth=1&--disable-web-security=true
+      # Hides the `Referer` header so that monitored websites can't see the changedetection.io hostname.
+      - HIDE_REFERER=true
+    depends_on:
+      playwright-chrome:
+        condition: service_started
+  playwright-chrome:
+    image: dgtlmoon/sockpuppetbrowser:latest
+    # cap_add:
+    #   - SYS_ADMIN
+    # SYS_ADMIN might be too much, but it can be needed on your platform https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#running-puppeteer-on-gitlabci
+    restart: unless-stopped
+    environment:
+      - SCREEN_WIDTH=1920
+      - SCREEN_HEIGHT=1024
+      - SCREEN_DEPTH=16
+      - MAX_CONCURRENT_CHROME_PROCESSES=10

templates/compose/plausible.yaml

@@ -12,6 +12,7 @@ services:
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible
       - BASE_URL=$SERVICE_FQDN_PLAUSIBLE
       - SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE
+      - TOTP_VAULT_KEY=$SERVICE_REALBASE64_TOTP
     depends_on:
       - plausible_db
       - plausible_events_db

templates/service-templates.json

@@ -51,6 +51,18 @@
         "logo": "svgs\/unknown.svg",
         "minversion": "0.0.0"
     },
+    "changedetection": {
+        "documentation": "https:\/\/github.com\/dgtlmoon\/changedetection.io\/",
+        "slogan": "Website change detection monitor and notifications.",
+        "compose": "c2VydmljZXM6CiAgY2hhbmdlZGV0ZWN0aW9uOgogICAgaW1hZ2U6IGdoY3IuaW8vZGd0bG1vb24vY2hhbmdlZGV0ZWN0aW9uLmlvCiAgICB2b2x1bWVzOgogICAgICAtICdjaGFuZ2VkZXRlY3Rpb24tZGF0YTovZGF0YXN0b3JlJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0NIQU5HRURFVEVDVElPTgogICAgICAtIFBVSUQ9MTAwMAogICAgICAtIFBHSUQ9MTAwMAogICAgICAtIEJBU0VfVVJMPSRTRVJWSUNFX0ZRRE5fQ0hBTkdFREVURUNUSU9OCiAgICAgIC0gJ1BMQVlXUklHSFRfRFJJVkVSX1VSTD13czovL3BsYXl3cmlnaHQtY2hyb21lOjMwMDAvP3N0ZWFsdGg9MSYtLWRpc2FibGUtd2ViLXNlY3VyaXR5PXRydWUnCiAgICAgIC0gSElERV9SRUZFUkVSPXRydWUKICAgIGRlcGVuZHNfb246CiAgICAgIHBsYXl3cmlnaHQtY2hyb21lOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9zdGFydGVkCiAgcGxheXdyaWdodC1jaHJvbWU6CiAgICBpbWFnZTogJ2RndGxtb29uL3NvY2twdXBwZXRicm93c2VyOmxhdGVzdCcKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTQ1JFRU5fV0lEVEg9MTkyMAogICAgICAtIFNDUkVFTl9IRUlHSFQ9MTAyNAogICAgICAtIFNDUkVFTl9ERVBUSD0xNgogICAgICAtIE1BWF9DT05DVVJSRU5UX0NIUk9NRV9QUk9DRVNTRVM9MTAK",
+        "tags": [
+            "web",
+            "alert",
+            "monitor"
+        ],
+        "logo": "svgs\/changedetection.png",
+        "minversion": "0.0.0"
+    },
     "code-server": {
         "documentation": "https:\/\/coder.com\/docs\/code-server\/latest",
         "slogan": "Code-Server is a web-based code editor that enables remote coding and collaboration from any device, anywhere.",

versions.json

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