Merge pull request #2266 from coollabsio/next

v4.0.0-beta.286

README.md

@@ -34,7 +34,12 @@ Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 
 ## Github Sponsors ($40+)
 <a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
+<a href="https://serpapi.com/?utm_source=coolify.io"><img width="60px" alt="SerpAPI" src="https://github.com/serpapi.png"/></a>
 <a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
+<a href="https://www.quantcdn.io/?utm_source=coolify.io"><img src="https://github.com/quantcdn.png" width="60px" alt="QuantCDN"/></a> 
+<a href="https://www.runpod.io/?utm_source=coolify.io">
+<svg style="width:60px;height:60px;background:#fff;" xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 200 200"><g><path d="M74.5 51.1c-25.4 14.9-27 16-29.6 20.2-1.8 3-1.9 5.3-1.9 32.3 0 21.7.3 29.4 1.3 30.6 1.9 2.5 46.7 27.9 48.5 27.6 1.5-.3 1.7-3.1 2-27.7.2-21.9 0-27.8-1.1-29.5-.8-1.2-9.9-6.8-20.2-12.6-10.3-5.8-19.4-11.5-20.2-12.7-1.8-2.6-.9-5.9 1.8-7.4 1.6-.8 6.3 0 21.8 4C87.8 78.7 98 81 99.6 81c4.4 0 49.9-25.9 49.9-28.4 0-1.6-3.4-2.8-24-8.2-13.2-3.5-25.1-6.3-26.5-6.3-1.4.1-12.4 5.9-24.5 13z"></path><path d="m137.2 68.1-3.3 2.1 6.3 3.7c3.5 2 6.3 4.3 6.3 5.1 0 .9-8 6.1-19.4 12.6-10.6 6-20 11.9-20.7 12.9-1.2 1.6-1.4 7.2-1.2 29.4.3 24.8.5 27.6 2 27.9 1.8.3 46.6-25.1 48.6-27.6.9-1.2 1.2-8.8 1.2-30.2s-.3-29-1.2-30.2c-1.6-1.9-12.1-7.8-13.9-7.8-.8 0-2.9 1-4.7 2.1z"></path></g></svg></a>
+<a href="https://www.flint.sh/en/home?utm_source=coolify.io"> <img src="https://github.com/Flint-company.png" width="60px" alt="FlintCompany"/></a>
 <a href="https://americancloud.com/?utm_source=coolify.io"><img src="https://github.com/American-Cloud.png" width="60px" alt="American Cloud"/></a>
 <a href="https://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
 <a href="https://www.uxwizz.com/?utm_source=coolify.io"><img width="60px" alt="UXWizz" src="https://github.com/UXWizz.png"/></a>
@@ -62,6 +67,7 @@ Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
 
+
 ## Individuals
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -60,7 +60,7 @@ class RunRemoteProcess
             $decoded = json_decode(
                 data_get($activity, 'description'),
                 associative: true,
-                flags: JSON_THROW_ON_ERROR
+                flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE
             );
         } catch (\JsonException $exception) {
             return '';
@@ -164,7 +164,7 @@ class RunRemoteProcess
 
     public function encodeOutput($type, $output)
     {
-        $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR);
+        $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
 
         $outputStack[] = [
             'type' => $type,
@@ -174,12 +174,12 @@ class RunRemoteProcess
             'order' => $this->getLatestCounter(),
         ];
 
-        return json_encode($outputStack, flags: JSON_THROW_ON_ERROR);
+        return json_encode($outputStack, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
     }
 
     protected function getLatestCounter(): int
     {
-        $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR);
+        $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
         if ($description === null || count($description) === 0) {
             return 1;
         }

app/Actions/Database/StartMongodb.php

@@ -50,8 +50,9 @@ class StartMongodb
                     ],
                     'healthcheck' => [
                         'test' => [
-                            'CMD-SHELL',
-                            'mongosh --eval "printjson(db.runCommand(\"ping\"))"'
+                            "CMD",
+                            "echo",
+                            "ok"
                         ],
                         'interval' => '5s',
                         'timeout' => '5s',

app/Actions/Docker/GetContainersStatus.php

@@ -6,14 +6,12 @@ use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Actions\Shared\ComplexStatusCheck;
-use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Models\ServiceDatabase;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Log;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GetContainersStatus
@@ -24,9 +22,9 @@ class GetContainersStatus
 
     public function handle(Server $server)
     {
-        if (isDev()) {
-            $server = Server::find(0);
-        }
+        // if (isDev()) {
+        //     $server = Server::find(0);
+        // }
         $this->server = $server;
         if (!$this->server->isFunctional()) {
             return 'Server is not ready.';
@@ -154,7 +152,7 @@ class GetContainersStatus
                                 if ($isPublic) {
                                     $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
                                         if ($this->server->isSwarm()) {
-                                             // TODO: fix this with sentinel
+                                            // TODO: fix this with sentinel
                                             return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
                                         } else {
                                             return data_get($value, 'name') === "$uuid-proxy";
@@ -223,7 +221,19 @@ class GetContainersStatus
                 }
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
-                $containerName = $name ? "$name, available at $fqdn" : $fqdn;
+                if ($name) {
+                    if ($fqdn) {
+                        $containerName = "$name, available at $fqdn";
+                    } else {
+                        $containerName = $name;
+                    }
+                } else {
+                    if ($fqdn) {
+                        $containerName = $fqdn;
+                    } else {
+                        $containerName = null;
+                    }
+                }
                 $projectUuid = data_get($service, 'environment.project.uuid');
                 $serviceUuid = data_get($service, 'uuid');
                 $environmentName = data_get($service, 'environment.name');
@@ -233,7 +243,7 @@ class GetContainersStatus
                 } else {
                     $url = null;
                 }
-                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+                // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
                 $exitedService->update(['status' => 'exited']);
             }
 
@@ -260,7 +270,7 @@ class GetContainersStatus
                     $url = null;
                 }
 
-                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+                // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
             foreach ($notRunningApplicationPreviews as $previewId) {
@@ -285,7 +295,7 @@ class GetContainersStatus
                     $url = null;
                 }
 
-                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+                // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
             foreach ($notRunningDatabases as $database) {
@@ -309,14 +319,14 @@ class GetContainersStatus
                 } else {
                     $url = null;
                 }
-                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+                // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
 
             // Check if proxy is running
             $this->server->proxyType();
             $foundProxyContainer = $containers->filter(function ($value, $key) {
                 if ($this->server->isSwarm()) {
-                     // TODO: fix this with sentinel
+                    // TODO: fix this with sentinel
                     return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
                 } else {
                     return data_get($value, 'name') === 'coolify-proxy';
@@ -339,7 +349,7 @@ class GetContainersStatus
                 instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
             }
         } catch (\Exception $e) {
-            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
+            // send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
             return handleError($e);
         }
@@ -442,19 +452,21 @@ class GetContainersStatus
                         if ($database_id) {
                             $service_db = ServiceDatabase::where('id', $database_id)->first();
                             if ($service_db) {
-                                $uuid = $service_db->service->uuid;
-                                $isPublic = data_get($service_db, 'is_public');
-                                if ($isPublic) {
-                                    $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
-                                        if ($this->server->isSwarm()) {
-                                            return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-                                        } else {
-                                            return data_get($value, 'Name') === "/$uuid-proxy";
+                                $uuid = data_get($service_db, 'service.uuid');
+                                if ($uuid) {
+                                    $isPublic = data_get($service_db, 'is_public');
+                                    if ($isPublic) {
+                                        $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+                                            if ($this->server->isSwarm()) {
+                                                return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+                                            } else {
+                                                return data_get($value, 'Name') === "/$uuid-proxy";
+                                            }
+                                        })->first();
+                                        if (!$foundTcpProxy) {
+                                            StartDatabaseProxy::run($service_db);
+                                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
                                         }
-                                    })->first();
-                                    if (!$foundTcpProxy) {
-                                        StartDatabaseProxy::run($service_db);
-                                        // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
                                     }
                                 }
                             }
@@ -539,7 +551,19 @@ class GetContainersStatus
             }
             $name = data_get($exitedService, 'name');
             $fqdn = data_get($exitedService, 'fqdn');
-            $containerName = $name ? "$name, available at $fqdn" : $fqdn;
+            if ($name) {
+                if ($fqdn) {
+                    $containerName = "$name, available at $fqdn";
+                } else {
+                    $containerName = $name;
+                }
+            } else {
+                if ($fqdn) {
+                    $containerName = $fqdn;
+                } else {
+                    $containerName = null;
+                }
+            }
             $projectUuid = data_get($service, 'environment.project.uuid');
             $serviceUuid = data_get($service, 'uuid');
             $environmentName = data_get($service, 'environment.name');
@@ -549,7 +573,7 @@ class GetContainersStatus
             } else {
                 $url = null;
             }
-            $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             $exitedService->update(['status' => 'exited']);
         }
 
@@ -576,7 +600,7 @@ class GetContainersStatus
                 $url = null;
             }
 
-            $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
         }
         $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
         foreach ($notRunningApplicationPreviews as $previewId) {
@@ -601,7 +625,7 @@ class GetContainersStatus
                 $url = null;
             }
 
-            $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
         }
         $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
         foreach ($notRunningDatabases as $database) {
@@ -625,7 +649,7 @@ class GetContainersStatus
             } else {
                 $url = null;
             }
-            $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
         }
 
         // Check if proxy is running

app/Actions/Proxy/CheckProxy.php

@@ -10,7 +10,18 @@ class CheckProxy
     use AsAction;
     public function handle(Server $server, $fromUI = false)
     {
-        if ($server->proxyType() === 'NONE') {
+        if (!$server->isFunctional()) {
+            return false;
+        }
+        if ($server->isBuildServer()) {
+            if ($server->proxy) {
+                $server->proxy = null;
+                $server->save();
+            }
+            return false;
+        }
+        $proxyType = $server->proxyType();
+        if (is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop) {
             return false;
         }
         ['uptime' => $uptime, 'error' => $error] = $server->validateConnection();

app/Actions/Proxy/StartProxy.php

@@ -15,7 +15,7 @@ class StartProxy
     {
         try {
             $proxyType = $server->proxyType();
-            if (is_null($proxyType) || $proxyType === 'NONE') {
+            if (is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop || $server->isBuildServer()) {
                 return 'OK';
             }
             $commands = collect([]);

app/Actions/Server/UpdateCoolify.php

@@ -27,10 +27,10 @@ class UpdateCoolify
             CleanupDocker::run($this->server, false);
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
-            if ($settings->next_channel) {
-                ray('next channel enabled');
-                $this->latestVersion = 'next';
-            }
+            // if ($settings->next_channel) {
+            //     ray('next channel enabled');
+            //     $this->latestVersion = 'next';
+            // }
             if ($force) {
                 $this->update();
             } else {

app/Console/Commands/AdminRemoveUser.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class AdminRemoveUser extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:remove-user {email}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove User from database';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        try {
+            $email = $this->argument('email');
+            $confirm = $this->confirm('Are you sure you want to remove user with email: ' . $email . '?');
+            if (!$confirm) {
+                $this->info('User removal cancelled.');
+                return;
+            }
+            $this->info("Removing user with email: $email");
+            $user = User::whereEmail($email)->firstOrFail();
+            $teams = $user->teams;
+            foreach ($teams as $team) {
+                if ($team->members->count() > 1) {
+                    $this->error('User is a member of a team with more than one member. Please remove user from team first.');
+                    return;
+                }
+                $team->delete();
+            }
+            $user->delete();
+        } catch (\Exception $e) {
+            $this->error('Failed to remove user.');
+            $this->error($e->getMessage());
+            return;
+        }
+    }
+}

app/Console/Commands/Cloud.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Server;
-use Illuminate\Console\Command;
-
-class Cloud extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'cloud:unused-servers';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Get Unused Servers from Cloud';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended',true)->each(function($server){
-            $this->info($server->name);
-        });
-    }
-}

app/Console/Commands/RootResetPassword.php

@@ -29,7 +29,6 @@ class RootResetPassword extends Command
      */
     public function handle()
     {
-        //
         $this->info('You are about to reset the root password.');
         $password = password('Give me a new password for root user: ');
         $passwordAgain = password('Again');

app/Console/Commands/ServicesGenerate.php

@@ -40,7 +40,7 @@ class ServicesGenerate extends Command
                 $serviceTemplatesJson[$name] = $parsed;
             }
         }
-        $serviceTemplatesJson = json_encode($serviceTemplatesJson, JSON_PRETTY_PRINT);
+        $serviceTemplatesJson = json_encode($serviceTemplatesJson);
         file_put_contents(base_path('templates/service-templates.json'), $serviceTemplatesJson);
     }
 

app/Console/Kernel.php

@@ -10,6 +10,7 @@ use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\PullHelperImageJob;
 use App\Jobs\PullSentinelImageJob;
+use App\Jobs\PullTemplatesAndVersions;
 use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
@@ -21,12 +22,15 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
+    private $all_servers;
     protected function schedule(Schedule $schedule): void
     {
+        $this->all_servers = Server::all();
         if (isDev()) {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
+            $schedule->job(new PullTemplatesAndVersions)->everyTenMinutes()->onOneServer();
             // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
             // Server Jobs
             $this->check_scheduled_backups($schedule);
@@ -39,7 +43,7 @@ class Kernel extends ConsoleKernel
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->command('cleanup:unreachable-servers')->daily();
-
+            $schedule->job(new PullTemplatesAndVersions)->everyTenMinutes()->onOneServer();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
 
@@ -56,7 +60,7 @@ class Kernel extends ConsoleKernel
     }
     private function pull_helper_image($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
+        $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
             if (config('coolify.is_sentinel_enabled')) {
                 $schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer();
@@ -67,12 +71,12 @@ class Kernel extends ConsoleKernel
     private function check_resources($schedule)
     {
         if (isCloud()) {
-            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
+            $servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
             $own = Team::find(0)->servers;
             $servers = $servers->merge($own);
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         } else {
-            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
+            $servers = $this->all_servers->where('ip', '!=', '1.2.3.4');
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
@@ -138,7 +142,16 @@ class Kernel extends ConsoleKernel
                 $scheduled_task->delete();
                 continue;
             }
-
+            if ($application) {
+                if (str($application->status)->contains('running') === false) {
+                    continue;
+                }
+            }
+            if ($service) {
+                if (str($service->status())->contains('running') === false) {
+                    continue;
+                }
+            }
             if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
                 $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
             }

app/Http/Controllers/Webhook/Bitbucket.php

@@ -47,7 +47,7 @@ class Bitbucket extends Controller
             if ($x_bitbucket_event === 'repo:push') {
                 $branch = data_get($payload, 'push.changes.0.new.name');
                 $full_name = data_get($payload, 'repository.full_name');
-
+                $commit = data_get($payload, 'push.changes.0.new.target.hash');
                 if (!$branch) {
                     return response([
                         'status' => 'failed',
@@ -82,7 +82,7 @@ class Bitbucket extends Controller
                     $return_payloads->push([
                         'application' => $application->name,
                         'status' => 'failed',
-                        'message' => 'Invalid token.',
+                        'message' => 'Invalid signature.',
                     ]);
                     ray('Invalid signature');
                     continue;
@@ -104,6 +104,7 @@ class Bitbucket extends Controller
                         queue_application_deployment(
                             application: $application,
                             deployment_uuid: $deployment_uuid,
+                            commit: $commit,
                             force_rebuild: false,
                             is_webhook: true
                         );

app/Http/Controllers/Webhook/Gitea.php

@@ -0,0 +1,222 @@
+<?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 Gitea extends Controller
+{
+    public function manual(Request $request)
+    {
+        try {
+            $return_payloads = collect([]);
+            $x_gitea_delivery = request()->header('X-Gitea-Delivery');
+            if (app()->isDownForMaintenance()) {
+                ray('Maintenance mode is on');
+                $epoch = now()->valueOf();
+                $files = Storage::disk('webhooks-during-maintenance')->files();
+                $gitea_delivery_found = collect($files)->filter(function ($file) use ($x_gitea_delivery) {
+                    return Str::contains($file, $x_gitea_delivery);
+                })->first();
+                if ($gitea_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}_Gitea::manual_{$x_gitea_delivery}", $json);
+                return;
+            }
+            $x_gitea_event = Str::lower($request->header('X-Gitea-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_gitea_event === 'ping') {
+                // Just pong
+                return response('pong');
+            }
+
+            if ($content_type !== 'application/json') {
+                $payload = json_decode(data_get($payload, 'payload'), true);
+            }
+            if ($x_gitea_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/');
+                }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
+                ray($changed_files);
+                ray('Manual Webhook Gitea Push Event with branch: ' . $branch);
+            }
+            if ($x_gitea_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 Gitea 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_gitea_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_gitea_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_gitea');
+                $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 signature.',
+                    ]);
+                    continue;
+                }
+                $isFunctional = $application->destination->server->isFunctional();
+                if (!$isFunctional) {
+                    $return_payloads->push([
+                        'application' => $application->name,
+                        'status' => 'failed',
+                        'message' => 'Server is not functional.',
+                    ]);
+                    continue;
+                }
+                if ($x_gitea_event === 'push') {
+                    if ($application->isDeployable()) {
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                            $deployment_uuid = new Cuid2(7);
+                            queue_application_deployment(
+                                application: $application,
+                                deployment_uuid: $deployment_uuid,
+                                force_rebuild: false,
+                                commit: data_get($payload, 'after', 'HEAD'),
+                                is_webhook: true,
+                            );
+                            $return_payloads->push([
+                                'status' => 'success',
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
+                    } else {
+                        $return_payloads->push([
+                            'status' => 'failed',
+                            'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
+                        ]);
+                    }
+                }
+                if ($x_gitea_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' => 'gitea',
+                                    '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: data_get($payload, 'head.sha', 'HEAD'),
+                                is_webhook: true,
+                                git_type: 'gitea'
+                            );
+                            $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);
+        }
+    }
+}

app/Http/Controllers/Webhook/Github.php

@@ -106,7 +106,7 @@ class Github extends Controller
                     $return_payloads->push([
                         'application' => $application->name,
                         'status' => 'failed',
-                        'message' => 'Invalid token.',
+                        'message' => 'Invalid signature.',
                     ]);
                     continue;
                 }
@@ -129,6 +129,7 @@ class Github extends Controller
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 is_webhook: true,
                             );
                             $return_payloads->push([
@@ -177,6 +178,7 @@ class Github extends Controller
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'head.sha', 'HEAD'),
                                 is_webhook: true,
                                 git_type: 'github'
                             );
@@ -338,6 +340,7 @@ class Github extends Controller
                             queue_application_deployment(
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                             );
@@ -387,6 +390,7 @@ class Github extends Controller
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'head.sha', 'HEAD'),
                                 is_webhook: true,
                                 git_type: 'github'
                             );

app/Http/Controllers/Webhook/Gitlab.php

@@ -38,6 +38,15 @@ class Gitlab extends Controller
             $headers = $request->headers->all();
             $x_gitlab_token = data_get($headers, 'x-gitlab-token.0');
             $x_gitlab_event = data_get($payload, 'object_kind');
+            $allowed_events = ['push', 'merge_request'];
+            if (!in_array($x_gitlab_event, $allowed_events)) {
+                $return_payloads->push([
+                    'status' => 'failed',
+                    'message' => 'Event not allowed. Only push and merge_request events are allowed.',
+                ]);
+                return response($return_payloads);
+            }
+
             if ($x_gitlab_event === 'push') {
                 $branch = data_get($payload, 'ref');
                 $full_name = data_get($payload, 'project.path_with_namespace');
@@ -100,7 +109,7 @@ class Gitlab extends Controller
                     $return_payloads->push([
                         'application' => $application->name,
                         'status' => 'failed',
-                        'message' => 'Invalid token.',
+                        'message' => 'Invalid signature.',
                     ]);
                     ray('Invalid signature');
                     continue;
@@ -124,6 +133,7 @@ class Gitlab extends Controller
                             queue_application_deployment(
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                             );
@@ -173,6 +183,7 @@ class Gitlab extends Controller
                                 application: $application,
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'object_attributes.last_commit.id', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                                 git_type: 'gitlab'

app/Jobs/ApplicationDeploymentJob.php

@@ -107,6 +107,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $fullRepoUrl = null;
     private ?string $branch = null;
 
+    private ?string $coolify_variables = null;
+
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
@@ -182,6 +184,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
+        $this->application_deployment_queue->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
         if (!$this->server->isFunctional()) {
             $this->application_deployment_queue->addLogEntry("Server is not functional.");
             $this->fail("Server is not functional.");
@@ -406,7 +411,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } 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} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
 
@@ -420,7 +425,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             // TODO
         } else {
             $this->execute_remote_command([
-                "docker network create --attachable '{$networkId}' >/dev/null || true", "hidden" => true, "ignore_errors" => true
+                "docker network inspect '{$networkId}' >/dev/null 2>&1 || docker network create --attachable '{$networkId}' >/dev/null || true", "hidden" => true, "ignore_errors" => true
             ], [
                 "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
             ]);
@@ -436,9 +441,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             } else {
                 $this->write_deployment_configurations();
                 $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");
+                ray("{$this->coolify_variables} 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],
+                    ["{$this->coolify_variables} docker compose --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d", "hidden" => true],
                 );
             }
         } else {
@@ -449,7 +454,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->write_deployment_configurations();
             } 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],
+                    [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
                 );
                 $this->write_deployment_configurations();
             }
@@ -711,10 +716,40 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function save_environment_variables()
     {
         $envs = collect([]);
+        $local_branch = $this->branch;
+        if ($this->pull_request_id !== 0) {
+            $local_branch = "pull/{$this->pull_request_id}/head";
+        }
+        $sort = $this->application->settings->is_env_sorting_enabled;
+        if ($sort) {
+            $sorted_environment_variables = $this->application->environment_variables->sortBy('key');
+            $sorted_environment_variables_preview = $this->application->environment_variables_preview->sortBy('key');
+        } else {
+            $sorted_environment_variables = $this->application->environment_variables->sortBy('id');
+            $sorted_environment_variables_preview = $this->application->environment_variables_preview->sortBy('id');
+        }
         $ports = $this->application->main_port();
         if ($this->pull_request_id !== 0) {
             $this->env_filename = ".env-pr-$this->pull_request_id";
-            foreach ($this->application->environment_variables_preview as $env) {
+            // Add SOURCE_COMMIT if not exists
+            if ($this->application->environment_variables_preview->where('key', 'SOURCE_COMMIT')->isEmpty()) {
+                if (!is_null($this->commit)) {
+                    $envs->push("SOURCE_COMMIT={$this->commit}");
+                } else {
+                    $envs->push("SOURCE_COMMIT=unknown");
+                }
+            }
+            if ($this->application->environment_variables_preview->where('key', 'COOLIFY_FQDN')->isEmpty()) {
+                $envs->push("COOLIFY_FQDN={$this->preview->fqdn}");
+            }
+            if ($this->application->environment_variables_preview->where('key', 'COOLIFY_URL')->isEmpty()) {
+                $url = str($this->preview->fqdn)->replace('http://', '')->replace('https://', '');
+                $envs->push("COOLIFY_URL={$url}");
+            }
+            if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
+                $envs->push("COOLIFY_BRANCH={$local_branch}");
+            }
+            foreach ($sorted_environment_variables_preview as $env) {
                 $real_value = $env->real_value;
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
@@ -735,20 +770,27 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) {
                 $envs->push("HOST=0.0.0.0");
             }
+        } else {
+            $this->env_filename = ".env";
             // Add SOURCE_COMMIT if not exists
-            if ($this->application->environment_variables_preview->where('key', 'SOURCE_COMMIT')->isEmpty()) {
+            if ($this->application->environment_variables->where('key', 'SOURCE_COMMIT')->isEmpty()) {
                 if (!is_null($this->commit)) {
                     $envs->push("SOURCE_COMMIT={$this->commit}");
                 } else {
                     $envs->push("SOURCE_COMMIT=unknown");
                 }
             }
-            $envs = $envs->sort(function ($a, $b) {
-                return strpos($a, '$') === false ? -1 : 1;
-            });
-        } else {
-            $this->env_filename = ".env";
-            foreach ($this->application->environment_variables as $env) {
+            if ($this->application->environment_variables->where('key', 'COOLIFY_FQDN')->isEmpty()) {
+                $envs->push("COOLIFY_FQDN={$this->application->fqdn}");
+            }
+            if ($this->application->environment_variables->where('key', 'COOLIFY_URL')->isEmpty()) {
+                $url = str($this->application->fqdn)->replace('http://', '')->replace('https://', '');
+                $envs->push("COOLIFY_URL={$url}");
+            }
+            if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
+                $envs->push("COOLIFY_BRANCH={$local_branch}");
+            }
+            foreach ($sorted_environment_variables as $env) {
                 $real_value = $env->real_value;
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
@@ -769,17 +811,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) {
                 $envs->push("HOST=0.0.0.0");
             }
-            // Add SOURCE_COMMIT if not exists
-            if ($this->application->environment_variables->where('key', 'SOURCE_COMMIT')->isEmpty()) {
-                if (!is_null($this->commit)) {
-                    $envs->push("SOURCE_COMMIT={$this->commit}");
-                } else {
-                    $envs->push("SOURCE_COMMIT=unknown");
-                }
-            }
-            $envs = $envs->sort(function ($a, $b) {
-                return strpos($a, '$') === false ? -1 : 1;
-            });
         }
 
         if ($envs->isEmpty()) {
@@ -935,9 +966,23 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                             "save" => "health_check",
                             "append" => false
                         ],
-
+                        [
+                            "docker inspect --format='{{json .State.Health.Log}}' {$this->container_name}",
+                            "hidden" => true,
+                            "save" => "health_check_logs",
+                            "append" => false
+                        ],
                     );
                     $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
+                    $health_check_logs = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'Output', '(no logs)');
+                    if (empty($health_check_logs)) {
+                        $health_check_logs = '(no logs)';
+                    }
+                    $health_check_return_code = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'ExitCode', '(no return code)');
+                    if ($health_check_logs !== '(no logs)' || $health_check_return_code !== '(no return code)') {
+                        $this->application_deployment_queue->addLogEntry("Healthcheck logs: {$health_check_logs} | Return code: {$health_check_return_code}");
+                    }
+
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
@@ -946,6 +991,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     }
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
                         $this->newVersionIsHealthy = false;
+                        $this->query_logs();
                         break;
                     }
                     $counter++;
@@ -955,9 +1001,25 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         $sleeptime++;
                     }
                 }
+                if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'starting') {
+                    $this->query_logs();
+                }
             }
         }
     }
+    private function query_logs()
+    {
+        $this->application_deployment_queue->addLogEntry("----------------------------------------");
+        $this->application_deployment_queue->addLogEntry("Container logs:");
+        $this->execute_remote_command(
+            [
+                "command" => "docker logs -n 100 {$this->container_name}",
+                "type" => "stderr",
+                "ignore_errors" => true,
+            ],
+        );
+        $this->application_deployment_queue->addLogEntry("----------------------------------------");
+    }
     private function deploy_pull_request()
     {
         if ($this->application->build_pack === 'dockercompose') {
@@ -971,6 +1033,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_image_names();
         $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
         $this->clone_repository();
         $this->set_base_dir();
         $this->cleanup_git();
@@ -1080,9 +1143,30 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->application_deployment_queue->addLogEntry("Setting base directory to {$this->workdir}.");
     }
+    private function set_coolify_variables()
+    {
+        $this->coolify_variables = "SOURCE_COMMIT={$this->commit} ";
+        if ($this->pull_request_id === 0) {
+            $fqdn = $this->application->fqdn;
+        } else {
+            $fqdn = $this->preview->fqdn;
+        }
+        if (isset($fqdn)) {
+            $this->coolify_variables .= "COOLIFY_FQDN={$fqdn} ";
+            $url = str($fqdn)->replace('http://', '')->replace('https://', '');
+            $this->coolify_variables .= "COOLIFY_URL={$url} ";
+        }
+        if (isset($this->application->git_branch)) {
+            $this->coolify_variables .= "COOLIFY_BRANCH={$this->application->git_branch} ";
+        }
+    }
     private function check_git_if_build_needed()
     {
         $this->generate_git_import_commands();
+        $local_branch = $this->branch;
+        if ($this->pull_request_id !== 0) {
+            $local_branch = "pull/{$this->pull_request_id}/head";
+        }
         $private_key = data_get($this->application, 'private_key.private_key');
         if ($private_key) {
             $private_key = base64_encode($private_key);
@@ -1097,7 +1181,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     executeInDocker($this->deployment_uuid, "chmod 600 /root/.ssh/id_rsa")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->fullRepoUrl} {$this->branch}"),
+                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
                     "hidden" => true,
                     "save" => "git_commit_sha"
                 ],
@@ -1105,15 +1189,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         } else {
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->fullRepoUrl} {$this->branch}"),
+                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
                     "hidden" => true,
                     "save" => "git_commit_sha"
                 ],
             );
         }
+        ray("GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->fullRepoUrl} {$local_branch}");
         if ($this->saved_outputs->get('git_commit_sha') && !$this->rollback) {
             $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
+            $this->application_deployment_queue->commit = $this->commit;
+            $this->application_deployment_queue->save();
         }
+        $this->set_coolify_variables();
     }
     private function clone_repository()
     {
@@ -1123,12 +1211,29 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $this->application_deployment_queue->addLogEntry("Checking out tag pull/{$this->pull_request_id}/head.");
         }
+        ray($importCommands);
         $this->execute_remote_command(
             [
                 $importCommands, "hidden" => true
             ]
         );
         $this->create_workdir();
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git log -1 {$this->commit} --pretty=%B"),
+                "hidden" => true,
+                "save" => "commit_message"
+            ]
+        );
+        ray($this->saved_outputs->get('commit_message'));
+        raY($this->commit);
+        if ($this->saved_outputs->get('commit_message')) {
+            $commit_message = str($this->saved_outputs->get('commit_message'))->limit(47);
+            $this->application_deployment_queue->commit_message = $commit_message->value();
+            ApplicationDeploymentQueue::whereCommit($this->commit)->whereApplicationId($this->application->id)->update(
+                ['commit_message' => $commit_message->value()]
+            );
+        }
     }
 
     private function generate_git_import_commands()
@@ -1172,8 +1277,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 // Do any modifications here
                 $this->generate_env_variables();
                 $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
+                $aptPkgs = data_get($parsed, 'phases.setup.aptPkgs', []);
+                if (count($aptPkgs) === 0) {
+                    data_set($parsed, 'phases.setup.aptPkgs', ['curl', 'wget']);
+                } else {
+                    if (!in_array('curl', $aptPkgs)) {
+                        $aptPkgs[] = 'curl';
+                    }
+                    if (!in_array('wget', $aptPkgs)) {
+                        $aptPkgs[] = 'wget';
+                    }
+                    data_set($parsed, 'phases.setup.aptPkgs', $aptPkgs);
+                }
                 data_set($parsed, 'variables', $merged_envs->toArray());
                 $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
+                $this->application_deployment_queue->addLogEntry("Final Nixpacks plan: {$this->nixpacks_plan}", hidden: true);
             }
         }
     }
@@ -1216,6 +1334,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_env_variables()
     {
         $this->env_args = collect([]);
+        $this->env_args->put('SOURCE_COMMIT', $this->commit);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
                 if (!is_null($env->real_value)) {
@@ -1229,7 +1348,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 }
             }
         }
-        $this->env_args->put('SOURCE_COMMIT', $this->commit);
     }
 
     private function generate_compose_file()
@@ -1277,9 +1395,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $labels = collect(generateLabelsApplication($this->application, $this->preview));
         }
-        $labels = $labels->map(function ($value, $key) {
-            return escapeDollarSign($value);
-        });
+        if ($this->application->settings->is_container_label_escape_enabled) {
+            $labels = $labels->map(function ($value, $key) {
+                return escapeDollarSign($value);
+            });
+        }
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
 
         // Check for custom HEALTHCHECK
@@ -1767,11 +1887,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} build"), "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} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New images built.");
@@ -1783,16 +1903,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         } else {
             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],
+                    ["{$this->coolify_variables} 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],
+                    [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
                 );
             }
         }
@@ -1848,16 +1968,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         if ($containers->count() == 0) {
             return;
         }
-        $this->application_deployment_queue->addLogEntry("Executing pre-deployment command (see debug log for output): {$this->application->pre_deployment_command}");
+        $this->application_deployment_queue->addLogEntry("Executing pre-deployment command (see debug log for output).");
 
         foreach ($containers as $container) {
             $containerName = data_get($container, 'Names');
             if ($containers->count() == 1 || str_starts_with($containerName, $this->application->pre_deployment_command_container . '-' . $this->application->uuid)) {
-                $cmd = 'sh -c "' . str_replace('"', '\"', $this->application->pre_deployment_command)  . '"';
+                $cmd = "sh -c '" . str_replace("'", "'\''", $this->application->pre_deployment_command)   . "'";
                 $exec = "docker exec {$containerName} {$cmd}";
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, $exec), 'hidden' => true
+                        'command' => $exec, 'hidden' => true
                     ],
                 );
                 return;
@@ -1871,17 +1991,17 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         if (empty($this->application->post_deployment_command)) {
             return;
         }
-        $this->application_deployment_queue->addLogEntry("Executing post-deployment command (see debug log for output): {$this->application->post_deployment_command}");
+        $this->application_deployment_queue->addLogEntry("Executing post-deployment command (see debug log for output).");
 
         $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
         foreach ($containers as $container) {
             $containerName = data_get($container, 'Names');
             if ($containers->count() == 1 || str_starts_with($containerName, $this->application->post_deployment_command_container . '-' . $this->application->uuid)) {
-                $cmd = 'sh -c "' . str_replace('"', '\"', $this->application->post_deployment_command)  . '"';
+                $cmd = "sh -c '" . str_replace("'", "'\''", $this->application->post_deployment_command)   . "'";
                 $exec = "docker exec {$containerName} {$cmd}";
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, $exec), 'hidden' => true
+                        'command' => $exec, 'hidden' => true
                     ],
                 );
                 return;

app/Jobs/CheckLogDrainContainerJob.php

@@ -70,7 +70,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 if (!$this->server->log_drain_notification_sent) {
                     ray('Log drain container still unhealthy. Sending notification...');
-                    $this->server->team?->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
+                    // $this->server->team?->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
                     $this->server->update(['log_drain_notification_sent' => true]);
                 }
             } else {

app/Jobs/ContainerStatusJob.php

@@ -37,336 +37,5 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         GetContainersStatus::run($this->server);
-        return;
-        // if (!$this->server->isFunctional()) {
-        //     return 'Server is not ready.';
-        // };
-        // $applications = $this->server->applications();
-        // $skip_these_applications = collect([]);
-        // foreach ($applications as $application) {
-        //     if ($application->additional_servers->count() > 0) {
-        //         $skip_these_applications->push($application);
-        //         ComplexStatusCheck::run($application);
-        //         $applications = $applications->filter(function ($value, $key) use ($application) {
-        //             return $value->id !== $application->id;
-        //         });
-        //     }
-        // }
-        // $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
-        //     return !$skip_these_applications->pluck('id')->contains($value->id);
-        // });
-        // try {
-        //     if ($this->server->isSwarm()) {
-        //         $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
-        //         $containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
-        //     } else {
-        //         // Precheck for containers
-        //         $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
-        //         if (!$containers) {
-        //             return;
-        //         }
-        //         $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
-        //         $containerReplicates = null;
-        //     }
-        //     if (is_null($containers)) {
-        //         return;
-        //     }
-
-        //     $containers = format_docker_command_output_to_json($containers);
-        //     if ($containerReplicates) {
-        //         $containerReplicates = format_docker_command_output_to_json($containerReplicates);
-        //         foreach ($containerReplicates as $containerReplica) {
-        //             $name = data_get($containerReplica, 'Name');
-        //             $containers = $containers->map(function ($container) use ($name, $containerReplica) {
-        //                 if (data_get($container, 'Spec.Name') === $name) {
-        //                     $replicas = data_get($containerReplica, 'Replicas');
-        //                     $running = str($replicas)->explode('/')[0];
-        //                     $total = str($replicas)->explode('/')[1];
-        //                     if ($running === $total) {
-        //                         data_set($container, 'State.Status', 'running');
-        //                         data_set($container, 'State.Health.Status', 'healthy');
-        //                     } else {
-        //                         data_set($container, 'State.Status', 'starting');
-        //                         data_set($container, 'State.Health.Status', 'unhealthy');
-        //                     }
-        //                 }
-        //                 return $container;
-        //             });
-        //         }
-        //     }
-        //     $databases = $this->server->databases();
-        //     $services = $this->server->services()->get();
-        //     $previews = $this->server->previews();
-        //     $foundApplications = [];
-        //     $foundApplicationPreviews = [];
-        //     $foundDatabases = [];
-        //     $foundServices = [];
-
-        //     foreach ($containers as $container) {
-        //         if ($this->server->isSwarm()) {
-        //             $labels = data_get($container, 'Spec.Labels');
-        //             $uuid = data_get($labels, 'coolify.name');
-        //         } else {
-        //             $labels = data_get($container, 'Config.Labels');
-        //         }
-        //         $containerStatus = data_get($container, 'State.Status');
-        //         $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
-        //         $containerStatus = "$containerStatus ($containerHealth)";
-        //         $labels = Arr::undot(format_docker_labels_to_json($labels));
-        //         $applicationId = data_get($labels, 'coolify.applicationId');
-        //         if ($applicationId) {
-        //             $pullRequestId = data_get($labels, 'coolify.pullRequestId');
-        //             if ($pullRequestId) {
-        //                 if (str($applicationId)->contains('-')) {
-        //                     $applicationId = str($applicationId)->before('-');
-        //                 }
-        //                 $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
-        //                 if ($preview) {
-        //                     $foundApplicationPreviews[] = $preview->id;
-        //                     $statusFromDb = $preview->status;
-        //                     if ($statusFromDb !== $containerStatus) {
-        //                         $preview->update(['status' => $containerStatus]);
-        //                     }
-        //                 } else {
-        //                     //Notify user that this container should not be there.
-        //                 }
-        //             } else {
-        //                 $application = $applications->where('id', $applicationId)->first();
-        //                 if ($application) {
-        //                     $foundApplications[] = $application->id;
-        //                     $statusFromDb = $application->status;
-        //                     if ($statusFromDb !== $containerStatus) {
-        //                         $application->update(['status' => $containerStatus]);
-        //                     }
-        //                 } else {
-        //                     //Notify user that this container should not be there.
-        //                 }
-        //             }
-        //         } else {
-        //             $uuid = data_get($labels, 'com.docker.compose.service');
-        //             $type = data_get($labels, 'coolify.type');
-
-        //             if ($uuid) {
-        //                 if ($type === 'service') {
-        //                     $database_id = data_get($labels, 'coolify.service.subId');
-        //                     if ($database_id) {
-        //                         $service_db = ServiceDatabase::where('id', $database_id)->first();
-        //                         if ($service_db) {
-        //                             $uuid = $service_db->service->uuid;
-        //                             $isPublic = data_get($service_db, 'is_public');
-        //                             if ($isPublic) {
-        //                                 $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
-        //                                     if ($this->server->isSwarm()) {
-        //                                         return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-        //                                     } else {
-        //                                         return data_get($value, 'Name') === "/$uuid-proxy";
-        //                                     }
-        //                                 })->first();
-        //                                 if (!$foundTcpProxy) {
-        //                                     StartDatabaseProxy::run($service_db);
-        //                                     // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
-        //                                 }
-        //                             }
-        //                         }
-        //                     }
-        //                 } else {
-        //                     $database = $databases->where('uuid', $uuid)->first();
-        //                     if ($database) {
-        //                         $isPublic = data_get($database, 'is_public');
-        //                         $foundDatabases[] = $database->id;
-        //                         $statusFromDb = $database->status;
-        //                         if ($statusFromDb !== $containerStatus) {
-        //                             $database->update(['status' => $containerStatus]);
-        //                         }
-        //                         if ($isPublic) {
-        //                             $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
-        //                                 if ($this->server->isSwarm()) {
-        //                                     return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-        //                                 } else {
-        //                                     return data_get($value, 'Name') === "/$uuid-proxy";
-        //                                 }
-        //                             })->first();
-        //                             if (!$foundTcpProxy) {
-        //                                 StartDatabaseProxy::run($database);
-        //                                 $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
-        //                             }
-        //                         }
-        //                     } else {
-        //                         // Notify user that this container should not be there.
-        //                     }
-        //                 }
-        //             }
-        //             if (data_get($container, 'Name') === '/coolify-db') {
-        //                 $foundDatabases[] = 0;
-        //             }
-        //         }
-        //         $serviceLabelId = data_get($labels, 'coolify.serviceId');
-        //         if ($serviceLabelId) {
-        //             $subType = data_get($labels, 'coolify.service.subType');
-        //             $subId = data_get($labels, 'coolify.service.subId');
-        //             $service = $services->where('id', $serviceLabelId)->first();
-        //             if (!$service) {
-        //                 continue;
-        //             }
-        //             if ($subType === 'application') {
-        //                 $service =  $service->applications()->where('id', $subId)->first();
-        //             } else {
-        //                 $service =  $service->databases()->where('id', $subId)->first();
-        //             }
-        //             if ($service) {
-        //                 $foundServices[] = "$service->id-$service->name";
-        //                 $statusFromDb = $service->status;
-        //                 if ($statusFromDb !== $containerStatus) {
-        //                     // ray('Updating status: ' . $containerStatus);
-        //                     $service->update(['status' => $containerStatus]);
-        //                 }
-        //             }
-        //         }
-        //     }
-        //     $exitedServices = collect([]);
-        //     foreach ($services as $service) {
-        //         $apps = $service->applications()->get();
-        //         $dbs = $service->databases()->get();
-        //         foreach ($apps as $app) {
-        //             if (in_array("$app->id-$app->name", $foundServices)) {
-        //                 continue;
-        //             } else {
-        //                 $exitedServices->push($app);
-        //             }
-        //         }
-        //         foreach ($dbs as $db) {
-        //             if (in_array("$db->id-$db->name", $foundServices)) {
-        //                 continue;
-        //             } else {
-        //                 $exitedServices->push($db);
-        //             }
-        //         }
-        //     }
-        //     $exitedServices = $exitedServices->unique('id');
-        //     foreach ($exitedServices as $exitedService) {
-        //         if (str($exitedService->status)->startsWith('exited')) {
-        //             continue;
-        //         }
-        //         $name = data_get($exitedService, 'name');
-        //         $fqdn = data_get($exitedService, 'fqdn');
-        //         $containerName = $name ? "$name, available at $fqdn" : $fqdn;
-        //         $projectUuid = data_get($service, 'environment.project.uuid');
-        //         $serviceUuid = data_get($service, 'uuid');
-        //         $environmentName = data_get($service, 'environment.name');
-
-        //         if ($projectUuid && $serviceUuid && $environmentName) {
-        //             $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
-        //         } else {
-        //             $url = null;
-        //         }
-        //         $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
-        //         $exitedService->update(['status' => 'exited']);
-        //     }
-
-        //     $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
-        //     foreach ($notRunningApplications as $applicationId) {
-        //         $application = $applications->where('id', $applicationId)->first();
-        //         if (str($application->status)->startsWith('exited')) {
-        //             continue;
-        //         }
-        //         $application->update(['status' => 'exited']);
-
-        //         $name = data_get($application, 'name');
-        //         $fqdn = data_get($application, 'fqdn');
-
-        //         $containerName = $name ? "$name ($fqdn)" : $fqdn;
-
-        //         $projectUuid = data_get($application, 'environment.project.uuid');
-        //         $applicationUuid = data_get($application, 'uuid');
-        //         $environment = data_get($application, 'environment.name');
-
-        //         if ($projectUuid && $applicationUuid && $environment) {
-        //             $url =  base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
-        //         } else {
-        //             $url = null;
-        //         }
-
-        //         $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
-        //     }
-        //     $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
-        //     foreach ($notRunningApplicationPreviews as $previewId) {
-        //         $preview = $previews->where('id', $previewId)->first();
-        //         if (str($preview->status)->startsWith('exited')) {
-        //             continue;
-        //         }
-        //         $preview->update(['status' => 'exited']);
-
-        //         $name = data_get($preview, 'name');
-        //         $fqdn = data_get($preview, 'fqdn');
-
-        //         $containerName = $name ? "$name ($fqdn)" : $fqdn;
-
-        //         $projectUuid = data_get($preview, 'application.environment.project.uuid');
-        //         $environmentName = data_get($preview, 'application.environment.name');
-        //         $applicationUuid = data_get($preview, 'application.uuid');
-
-        //         if ($projectUuid && $applicationUuid && $environmentName) {
-        //             $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
-        //         } else {
-        //             $url = null;
-        //         }
-
-        //         $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
-        //     }
-        //     $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
-        //     foreach ($notRunningDatabases as $database) {
-        //         $database = $databases->where('id', $database)->first();
-        //         if (str($database->status)->startsWith('exited')) {
-        //             continue;
-        //         }
-        //         $database->update(['status' => 'exited']);
-
-        //         $name = data_get($database, 'name');
-        //         $fqdn = data_get($database, 'fqdn');
-
-        //         $containerName = $name;
-
-        //         $projectUuid = data_get($database, 'environment.project.uuid');
-        //         $environmentName = data_get($database, 'environment.name');
-        //         $databaseUuid = data_get($database, 'uuid');
-
-        //         if ($projectUuid && $databaseUuid && $environmentName) {
-        //             $url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
-        //         } else {
-        //             $url = null;
-        //         }
-        //         $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
-        //     }
-
-        //     // Check if proxy is running
-        //     $this->server->proxyType();
-        //     $foundProxyContainer = $containers->filter(function ($value, $key) {
-        //         if ($this->server->isSwarm()) {
-        //             return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
-        //         } else {
-        //             return data_get($value, 'Name') === '/coolify-proxy';
-        //         }
-        //     })->first();
-        //     if (!$foundProxyContainer) {
-        //         try {
-        //             $shouldStart = CheckProxy::run($this->server);
-        //             if ($shouldStart) {
-        //                 StartProxy::run($this->server, false);
-        //                 $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
-        //             }
-        //         } catch (\Throwable $e) {
-        //             ray($e);
-        //         }
-        //     } else {
-        //         $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
-        //         $this->server->save();
-        //         $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-        //         instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-        //     }
-        // } catch (\Throwable $e) {
-        //     send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
-        //     ray($e->getMessage());
-        //     return handleError($e);
-        // }
     }
 }

app/Jobs/PullTemplatesAndVersions.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Http;
+
+class PullTemplatesAndVersions implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 10;
+
+    public function __construct()
+    {
+    }
+    public function handle(): void
+    {
+        try {
+            if (!isDev() && !isCloud()) {
+                ray('PullTemplatesAndVersions versions.json');
+                $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
+                if ($response->successful()) {
+                    $versions = $response->json();
+                    File::put(base_path('versions.json'), json_encode($versions, JSON_PRETTY_PRINT));
+                } else {
+                    send_internal_notification('PullTemplatesAndVersions failed with: ' . $response->status() . ' ' . $response->body());
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('PullTemplatesAndVersions failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+        try {
+            if (!isDev()) {
+                ray('PullTemplatesAndVersions service-templates');
+                $response = Http::retry(3, 1000)->get(config('constants.services.official'));
+                if ($response->successful()) {
+                    $services = $response->json();
+                    File::put(base_path('templates/service-templates.json'), json_encode($services));
+                } else {
+                    send_internal_notification('PullTemplatesAndVersions failed with: ' . $response->status() . ' ' . $response->body());
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('PullTemplatesAndVersions failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+    }
+}

app/Jobs/ScheduledTaskJob.php

@@ -8,14 +8,13 @@ use App\Models\Server;
 use App\Models\Application;
 use App\Models\Service;
 use App\Models\Team;
+use App\Notifications\ScheduledTask\TaskFailed;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
-use Throwable;
 
 class ScheduledTaskJob implements ShouldQueue
 {
@@ -77,8 +76,12 @@ class ScheduledTaskJob implements ShouldQueue
                         $this->containers[] = 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[] = data_get($database, 'name') . '-' . data_get($this->resource, 'uuid');
+                    }
+                });
             }
-
             if (count($this->containers) == 0) {
                 throw new \Exception('ScheduledTaskJob failed: No containers running.');
             }
@@ -89,7 +92,7 @@ class ScheduledTaskJob implements ShouldQueue
 
             foreach ($this->containers as $containerName) {
                 if (count($this->containers) == 1 || str_starts_with($containerName, $this->task->container . '-' . $this->resource->uuid)) {
-                    $cmd = 'sh -c "' . str_replace('"', '\"', $this->task->command)  . '"';
+                    $cmd = "sh -c '" . str_replace("'", "'\''", $this->task->command)   . "'";
                     $exec = "docker exec {$containerName} {$cmd}";
                     $this->task_output = instant_remote_process([$exec], $this->server, true);
                     $this->task_log->update([
@@ -110,6 +113,7 @@ class ScheduledTaskJob implements ShouldQueue
                     'message' => $this->task_output ?? $e->getMessage(),
                 ]);
             }
+            $this->team?->notify(new TaskFailed($this->task, $e->getMessage()));
             // send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
             throw $e;
         }

app/Jobs/SendMessageToDiscordJob.php

@@ -41,7 +41,6 @@ class SendMessageToDiscordJob implements ShouldQueue, ShouldBeEncrypted
         $payload = [
             'content' => $this->text,
         ];
-        ray($payload);
         Http::post($this->webhookUrl, $payload);
     }
 }

app/Jobs/ServerLimitCheckJob.php

@@ -40,7 +40,7 @@ class ServerLimitCheckJob implements ShouldQueue, ShouldBeEncrypted
         try {
             $servers = $this->team->servers;
             $servers_count = $servers->count();
-            $limit = $this->team->limits['serverLimit'];
+            $limit = data_get($this->team->limits, 'serverLimit', 2);
             $number_of_servers_to_disable = $servers_count - $limit;
             ray('ServerLimitCheckJob', $this->team->uuid, $servers_count, $limit, $number_of_servers_to_disable);
             if ($number_of_servers_to_disable > 0) {

app/Jobs/ServerStatusJob.php

@@ -43,10 +43,11 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
         try {
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
-                $this->removeCoolifyYaml();
+                $this->remove_unnecessary_coolify_yaml();
                 if (config('coolify.is_sentinel_enabled')) {
                     $this->server->checkSentinel();
                 }
+                $this->check_docker_engine();
             }
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
@@ -54,7 +55,38 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
             return handleError($e);
         }
     }
-    private function removeCoolifyYaml()
+    private function check_docker_engine()
+    {
+        $version = instant_remote_process([
+            "docker info",
+        ], $this->server, false);
+        if (is_null($version)) {
+            $os = instant_remote_process([
+                "cat /etc/os-release | grep ^ID=",
+            ], $this->server, false);
+            $os = str($os)->after('ID=')->trim();
+            if ($os === 'ubuntu') {
+                try {
+                    instant_remote_process([
+                        "systemctl start docker",
+                    ], $this->server);
+                } catch (\Throwable $e) {
+                    ray($e->getMessage());
+                    return handleError($e);
+                }
+            } else {
+                try {
+                    instant_remote_process([
+                        "service docker start",
+                    ], $this->server);
+                } catch (\Throwable $e) {
+                    ray($e->getMessage());
+                    return handleError($e);
+                }
+            }
+        }
+    }
+    private function remove_unnecessary_coolify_yaml()
     {
         // This will remote the coolify.yaml file from the server as it is not needed on cloud servers
         if (isCloud() && $this->server->id !== 0) {

app/Listeners/ProxyStartedNotification.php

@@ -17,5 +17,7 @@ class ProxyStartedNotification
         $this->server = data_get($event, 'data');
         $this->server->setupDefault404Redirect();
         $this->server->setupDynamicProxyConfiguration();
+        $this->server->proxy->force_stop = false;
+        $this->server->save();
     }
 }

app/Livewire/Boarding/Index.php

@@ -52,6 +52,9 @@ class Index extends Component
 
     public function mount()
     {
+        if (auth()->user()?->isMember() && auth()->user()->currentTeam()->show_boarding === true) {
+            return redirect()->route('dashboard');
+        }
         $this->privateKeyName = generate_random_name();
         $this->remoteServerName = generate_random_name();
         if (isDev()) {

app/Livewire/Dev/Compose.php

@@ -10,7 +10,7 @@ class Compose extends Component
     public string $base64 = '';
     public $services;
     public function mount() {
-        $this->services = getServiceTemplates();
+        $this->services = get_service_templates();
     }
     public function setService(string $selected) {
         $this->base64 = data_get($this->services, $selected . '.compose');

app/Livewire/ForcePasswordReset.php

@@ -24,7 +24,7 @@ class ForcePasswordReset extends Component
     }
     public function render()
     {
-        return view('livewire.force-password-reset');
+        return view('livewire.force-password-reset')->layout('layouts.simple');
     }
     public function submit()
     {

app/Livewire/Notifications/Discord.php

@@ -16,6 +16,7 @@ class Discord extends Component
         'team.discord_notifications_deployments' => 'nullable|boolean',
         'team.discord_notifications_status_changes' => 'nullable|boolean',
         'team.discord_notifications_database_backups' => 'nullable|boolean',
+        'team.discord_notifications_scheduled_tasks' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'team.discord_webhook_url' => 'Discord Webhook',

app/Livewire/Notifications/Email.php

@@ -28,6 +28,7 @@ class Email extends Component
         'team.smtp_notifications_deployments' => 'nullable|boolean',
         'team.smtp_notifications_status_changes' => 'nullable|boolean',
         'team.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.smtp_notifications_scheduled_tasks' => 'nullable|boolean',
         'team.use_instance_email_settings' => 'boolean',
         'team.resend_enabled' => 'nullable|boolean',
         'team.resend_api_key' => 'nullable',

app/Livewire/Notifications/Telegram.php

@@ -18,10 +18,12 @@ class Telegram extends Component
         'team.telegram_notifications_deployments' => 'nullable|boolean',
         'team.telegram_notifications_status_changes' => 'nullable|boolean',
         'team.telegram_notifications_database_backups' => 'nullable|boolean',
+        'team.telegram_notifications_scheduled_tasks' => 'nullable|boolean',
         'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_scheduled_tasks_thread_id' => 'nullable|string',
     ];
     protected $validationAttributes = [
         'team.telegram_token' => 'Token',

app/Livewire/Project/Application/General.php

@@ -22,6 +22,7 @@ class General extends Component
     public ?string $git_commit_sha = null;
     public string $build_pack;
     public ?string $ports_exposes = null;
+    public bool $is_container_label_escape_enabled = true;
 
     public $customLabels;
     public bool $labelsChanged = false;
@@ -30,7 +31,7 @@ class General extends Component
     public ?string $initialDockerComposeLocation = null;
     public ?string $initialDockerComposePrLocation = null;
 
-    public $parsedServices = [];
+    public null|Collection $parsedServices;
     public $parsedServiceDomains = [];
 
     protected $listeners = [
@@ -74,6 +75,7 @@ class General extends Component
         'application.post_deployment_command_container' => 'nullable',
         'application.settings.is_static' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
+        'application.settings.is_container_label_escape_enabled' => 'boolean|required',
         'application.watch_paths' => 'nullable',
     ];
     protected $validationAttributes = [
@@ -109,12 +111,17 @@ class General extends Component
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
         'application.settings.is_static' => 'Is static',
         'application.settings.is_build_server_enabled' => 'Is build server enabled',
+        'application.settings.is_container_label_escape_enabled' => 'Is container label escape enabled',
         'application.watch_paths' => 'Watch paths',
     ];
     public function mount()
     {
         try {
             $this->parsedServices = $this->application->parseCompose();
+            if (is_null($this->parsedServices) || empty($this->parsedServices)) {
+                $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+                return;
+            }
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
         }
@@ -124,6 +131,7 @@ class General extends Component
         }
         $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
         $this->ports_exposes = $this->application->ports_exposes;
+        $this->is_container_label_escape_enabled = $this->application->settings->is_container_label_escape_enabled;
         $this->customLabels = $this->application->parseContainerLabels();
         if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
             $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
@@ -145,7 +153,7 @@ class General extends Component
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
         $this->application->refresh();
-        if ($this->ports_exposes !== $this->application->ports_exposes) {
+        if ($this->ports_exposes !== $this->application->ports_exposes || $this->is_container_label_escape_enabled !== $this->application->settings->is_container_label_escape_enabled) {
             $this->resetDefaultLabels(false);
         }
     }
@@ -156,6 +164,10 @@ class General extends Component
                 return;
             }
             ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation, 'initialDockerComposePrLocation' => $this->initialDockerComposePrLocation] = $this->application->loadComposeFile($isInit);
+            if (is_null($this->parsedServices)) {
+                $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+                return;
+            }
             $compose = $this->application->parseCompose();
             $services = data_get($compose, 'services');
             if ($services) {
@@ -204,6 +216,9 @@ class General extends Component
         $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
         $this->application->save();
         $this->dispatch('success', 'Domain generated.');
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->loadComposeFile();
+        }
         return $domain;
     }
     public function updatedApplicationBaseDirectory()
@@ -257,9 +272,12 @@ class General extends Component
     {
         $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
-
+        $this->is_container_label_escape_enabled = $this->application->settings->is_container_label_escape_enabled;
         $this->application->custom_labels = base64_encode($this->customLabels);
         $this->application->save();
+        if ($this->application->build_pack === 'dockercompose') {
+            $this->loadComposeFile();
+        }
     }
 
     public function checkFqdns($showToaster = true)
@@ -300,11 +318,11 @@ class General extends Component
             if ($this->application->build_pack === 'dockercompose' && $this->initialDockerComposeLocation !== $this->application->docker_compose_location) {
                 $compose_return = $this->loadComposeFile();
                 if ($compose_return instanceof \Livewire\Features\SupportEvents\Event) {
-                   return;
+                    return;
                 }
             }
             $this->validate();
-            if ($this->ports_exposes !== $this->application->ports_exposes) {
+            if ($this->ports_exposes !== $this->application->ports_exposes || $this->is_container_label_escape_enabled !== $this->application->settings->is_container_label_escape_enabled) {
                 $this->resetDefaultLabels();
             }
             if (data_get($this->application, 'build_pack') === 'dockerimage') {

app/Livewire/Project/Application/Heading.php

@@ -5,7 +5,7 @@ namespace App\Livewire\Project\Application;
 use App\Actions\Application\StopApplication;
 use App\Actions\Docker\GetContainersStatus;
 use App\Events\ApplicationStatusChanged;
-    use App\Jobs\ContainerStatusJob;
+use App\Jobs\ContainerStatusJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\Application;
 use Livewire\Component;
@@ -14,6 +14,8 @@ use Visus\Cuid2\Cuid2;
 class Heading extends Component
 {
     public Application $application;
+    public ?string $lastDeploymentInfo = null;
+    public ?string $lastDeploymentLink = null;
     public array $parameters;
 
     protected string $deploymentUuid;
@@ -28,6 +30,9 @@ class Heading extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        $lastDeployment = $this->application->get_last_successful_deployment();
+        $this->lastDeploymentInfo = data_get_str($lastDeployment, 'commit')->limit(7) . ' ' . data_get($lastDeployment, 'commit_message');
+        $this->lastDeploymentLink = $this->application->gitCommitLink(data_get($lastDeployment, 'commit'));
     }
 
     public function check_status($showNotification = false)

app/Livewire/Project/Database/Backup/Execution.php

@@ -2,12 +2,13 @@
 
 namespace App\Livewire\Project\Database\Backup;
 
+use App\Models\ScheduledDatabaseBackup;
 use Livewire\Component;
 
 class Execution extends Component
 {
     public $database;
-    public $backup;
+    public ?ScheduledDatabaseBackup $backup;
     public $executions;
     public $s3s;
     public function mount()

app/Livewire/Project/Database/BackupEdit.php

@@ -2,12 +2,13 @@
 
 namespace App\Livewire\Project\Database;
 
+use App\Models\ScheduledDatabaseBackup;
 use Livewire\Component;
 use Spatie\Url\Url;
 
 class BackupEdit extends Component
 {
-    public $backup;
+    public ?ScheduledDatabaseBackup $backup;
     public $s3s;
     public ?string $status = null;
     public array $parameters;
@@ -35,8 +36,8 @@ class BackupEdit extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        if (is_null($this->backup->s3_storage_id)) {
-            $this->backup->s3_storage_id = 'default';
+        if (is_null(data_get($this->backup, 's3_storage_id'))) {
+            data_set($this->backup, 's3_storage_id', 'default');
         }
     }
 

app/Livewire/Project/Database/BackupExecutions.php

@@ -2,11 +2,12 @@
 
 namespace App\Livewire\Project\Database;
 
+use App\Models\ScheduledDatabaseBackup;
 use Livewire\Component;
 
 class BackupExecutions extends Component
 {
-    public $backup;
+    public ?ScheduledDatabaseBackup $backup = null;
     public $executions = [];
     public $setDeletableBackup;
     public function getListeners()
@@ -20,8 +21,11 @@ class BackupExecutions extends Component
 
     public function cleanupFailed()
     {
-        $this->backup->executions()->where('status', 'failed')->delete();
-        $this->refreshBackupExecutions();
+        if ($this->backup) {
+            $this->backup->executions()->where('status', 'failed')->delete();
+            $this->refreshBackupExecutions();
+            $this->dispatch('success', 'Failed backups cleaned up.');
+        }
     }
     public function deleteBackup($exeuctionId)
     {
@@ -45,6 +49,8 @@ class BackupExecutions extends Component
     }
     public function refreshBackupExecutions(): void
     {
-        $this->executions = $this->backup->executions()->get()->sortByDesc('created_at');
+        if ($this->backup) {
+            $this->executions = $this->backup->executions()->get()->sortByDesc('created_at');
+        }
     }
 }

app/Livewire/Project/Database/CreateScheduledBackup.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Project\Database;
 
 use App\Models\ScheduledDatabaseBackup;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class CreateScheduledBackup extends Component
@@ -12,7 +13,7 @@ class CreateScheduledBackup extends Component
     public bool $enabled = true;
     public bool $save_s3 = false;
     public $s3_storage_id;
-    public $s3s;
+    public Collection $s3s;
 
     protected $rules = [
         'frequency' => 'required|string',

app/Livewire/Project/Database/ScheduledBackups.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Project\Database;
 
+use App\Models\ScheduledDatabaseBackup;
 use Livewire\Component;
 
 class ScheduledBackups extends Component
@@ -9,7 +10,7 @@ class ScheduledBackups extends Component
     public $database;
     public $parameters;
     public $type;
-    public $selectedBackup;
+    public ?ScheduledDatabaseBackup $selectedBackup;
     public $selectedBackupId;
     public $s3s;
     protected $listeners = ['refreshScheduledBackups'];

app/Livewire/Project/New/Select.php

@@ -15,10 +15,10 @@ class Select extends Component
     public string $type;
     public string $server_id;
     public string $destination_uuid;
-    public Countable|array|Server $allServers = [];
-    public Countable|array|Server $servers = [];
-    public Collection|array $standaloneDockers = [];
-    public Collection|array $swarmDockers = [];
+    public Collection|null|Server $allServers;
+    public Collection|null|Server $servers;
+    public ?Collection $standaloneDockers;
+    public ?Collection $swarmDockers;
     public array $parameters;
     public Collection|array $services = [];
     public Collection|array $allServices = [];
@@ -91,7 +91,7 @@ class Select extends Component
                 });
             } else {
                 $this->search = null;
-                $this->allServices = getServiceTemplates();
+                $this->allServices = get_service_templates();
                 $this->services = $this->allServices->filter(function ($service, $key) {
                     return str_contains(strtolower($key), strtolower($this->search));
                 });
@@ -107,7 +107,11 @@ class Select extends Component
         if ($this->includeSwarm) {
             $this->servers = $this->allServers;
         } else {
-            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+            if ($this->allServers instanceof Collection) {
+                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+            } else {
+                $this->servers = $this->allServers;
+            }
         }
     }
     public function setType(string $type)
@@ -126,13 +130,21 @@ class Select extends Component
             case 'mongodb':
                 $this->isDatabase = true;
                 $this->includeSwarm = false;
-                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+                if ($this->allServers instanceof Collection) {
+                    $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+                } else {
+                    $this->servers = $this->allServers;
+                }
                 break;
         }
         if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty')) {
             $this->isDatabase = true;
             $this->includeSwarm = false;
-            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+            if ($this->allServers instanceof Collection) {
+                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
+            } else {
+                $this->servers = $this->allServers;
+            }
         }
         if ($type === "existing-postgresql") {
             $this->current_step = $type;

app/Livewire/Project/Resource/Create.php

@@ -12,7 +12,6 @@ class Create extends Component
     public $type;
     public function mount()
     {
-        $services = getServiceTemplates();
         $type = str(request()->query('type'));
         $destination_uuid = request()->query('destination');
         $server_id = request()->query('server_id');
@@ -25,83 +24,87 @@ class Create extends Component
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        if (in_array($type, DATABASE_TYPES)) {
-            if ($type->value() === "postgresql") {
-                $database = create_standalone_postgresql($environment->id, $destination_uuid);
-            } else if ($type->value() === 'redis') {
-                $database = create_standalone_redis($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mongodb') {
-                $database = create_standalone_mongodb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mysql') {
-                $database = create_standalone_mysql($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mariadb') {
-                $database = create_standalone_mariadb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'keydb') {
-                $database = create_standalone_keydb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'dragonfly') {
-                $database = create_standalone_dragonfly($environment->id, $destination_uuid);
-            } else if ($type->value() === 'clickhouse') {
-                $database = create_standalone_clickhouse($environment->id, $destination_uuid);
-            }
-            return redirect()->route('project.database.configuration', [
-                'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
-                'database_uuid' => $database->uuid,
-            ]);
-        }
-        if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
-            $oneClickServiceName = $type->after('one-click-service-')->value();
-            $oneClickService = data_get($services, "$oneClickServiceName.compose");
-            $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
-            if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
-                    return !empty($value);
-                });
-            }
-            if ($oneClickService) {
-                $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
-                $service_payload = [
-                    'name' => "$oneClickServiceName-" . str()->random(10),
-                    'docker_compose_raw' => base64_decode($oneClickService),
-                    'environment_id' => $environment->id,
-                    'service_type' => $oneClickServiceName,
-                    'server_id' => (int) $server_id,
-                    'destination_id' => $destination->id,
-                    'destination_type' => $destination->getMorphClass(),
-                ];
-                if ($oneClickServiceName === 'cloudflared') {
-                    data_set($service_payload, 'connect_to_docker_network', true);
+        if (isset($type) && isset($destination_uuid) && isset($server_id)) {
+            $services = get_service_templates();
+
+            if (in_array($type, DATABASE_TYPES)) {
+                if ($type->value() === "postgresql") {
+                    $database = create_standalone_postgresql($environment->id, $destination_uuid);
+                } else if ($type->value() === 'redis') {
+                    $database = create_standalone_redis($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mongodb') {
+                    $database = create_standalone_mongodb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mysql') {
+                    $database = create_standalone_mysql($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mariadb') {
+                    $database = create_standalone_mariadb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'keydb') {
+                    $database = create_standalone_keydb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'dragonfly') {
+                    $database = create_standalone_dragonfly($environment->id, $destination_uuid);
+                } else if ($type->value() === 'clickhouse') {
+                    $database = create_standalone_clickhouse($environment->id, $destination_uuid);
                 }
-                $service = Service::create($service_payload);
-                $service->name = "$oneClickServiceName-" . $service->uuid;
-                $service->save();
-                if ($oneClickDotEnvs?->count() > 0) {
-                    $oneClickDotEnvs->each(function ($value) use ($service) {
-                        $key = str()->before($value, '=');
-                        $value = str(str()->after($value, '='));
-                        $generatedValue = $value;
-                        if ($value->contains('SERVICE_')) {
-                            $command = $value->after('SERVICE_')->beforeLast('_');
-                            $generatedValue = generateEnvValue($command->value(), $service);
-                        }
-                        EnvironmentVariable::create([
-                            'key' => $key,
-                            'value' => $generatedValue,
-                            'service_id' => $service->id,
-                            'is_build_time' => false,
-                            'is_preview' => false,
-                        ]);
-                    });
-                }
-                $service->parse(isNew: true);
-                return redirect()->route('project.service.configuration', [
-                    'service_uuid' => $service->uuid,
-                    'environment_name' => $environment->name,
+                return redirect()->route('project.database.configuration', [
                     'project_uuid' => $project->uuid,
+                    'environment_name' => $environment->name,
+                    'database_uuid' => $database->uuid,
                 ]);
             }
+            if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
+                $oneClickServiceName = $type->after('one-click-service-')->value();
+                $oneClickService = data_get($services, "$oneClickServiceName.compose");
+                $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
+                if ($oneClickDotEnvs) {
+                    $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                        return !empty($value);
+                    });
+                }
+                if ($oneClickService) {
+                    $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
+                    $service_payload = [
+                        'name' => "$oneClickServiceName-" . str()->random(10),
+                        'docker_compose_raw' => base64_decode($oneClickService),
+                        'environment_id' => $environment->id,
+                        'service_type' => $oneClickServiceName,
+                        'server_id' => (int) $server_id,
+                        'destination_id' => $destination->id,
+                        'destination_type' => $destination->getMorphClass(),
+                    ];
+                    if ($oneClickServiceName === 'cloudflared') {
+                        data_set($service_payload, 'connect_to_docker_network', true);
+                    }
+                    $service = Service::create($service_payload);
+                    $service->name = "$oneClickServiceName-" . $service->uuid;
+                    $service->save();
+                    if ($oneClickDotEnvs?->count() > 0) {
+                        $oneClickDotEnvs->each(function ($value) use ($service) {
+                            $key = str()->before($value, '=');
+                            $value = str(str()->after($value, '='));
+                            $generatedValue = $value;
+                            if ($value->contains('SERVICE_')) {
+                                $command = $value->after('SERVICE_')->beforeLast('_');
+                                $generatedValue = generateEnvValue($command->value(), $service);
+                            }
+                            EnvironmentVariable::create([
+                                'key' => $key,
+                                'value' => $generatedValue,
+                                'service_id' => $service->id,
+                                'is_build_time' => false,
+                                'is_preview' => false,
+                            ]);
+                        });
+                    }
+                    $service->parse(isNew: true);
+                    return redirect()->route('project.service.configuration', [
+                        'service_uuid' => $service->uuid,
+                        'environment_name' => $environment->name,
+                        'project_uuid' => $project->uuid,
+                    ]);
+                }
+            }
+            $this->type = $type->value();
         }
-        $this->type = $type->value();
     }
     public function render()
     {

app/Livewire/Project/Service/Configuration.php

@@ -3,7 +3,6 @@
 namespace App\Livewire\Project\Service;
 
 use App\Actions\Docker\GetContainersStatus;
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 
@@ -68,7 +67,6 @@ class Configuration extends Component
             GetContainersStatus::run($this->service->server);
             // dispatch_sync(new ContainerStatusJob($this->service->server));
             $this->dispatch('refresh')->self();
-            $this->dispatch('updateStatus');
         } catch (\Exception $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Service/EditCompose.php

@@ -12,6 +12,7 @@ class EditCompose extends Component
     protected $rules = [
         'service.docker_compose_raw' => 'required',
         'service.docker_compose' => 'required',
+        'service.is_container_label_escape_enabled' => 'required',
     ];
     public function mount()
     {
@@ -23,6 +24,14 @@ class EditCompose extends Component
         $this->dispatch('info', "Saving new docker compose...");
         $this->dispatch('saveCompose', $this->service->docker_compose_raw);
     }
+    public function instantSave()
+    {
+        $this->validate([
+            'service.is_container_label_escape_enabled' => 'required',
+        ]);
+        $this->service->save(['is_container_label_escape_enabled' => $this->service->is_container_label_escape_enabled]);
+        $this->dispatch('success', "Service updated successfully");
+    }
     public function render()
     {
         return view('livewire.project.service.edit-compose');

app/Livewire/Project/Service/Navbar.php

@@ -30,7 +30,6 @@ class Navbar extends Component
         $userId = auth()->user()->id;
         return [
             "echo-private:user.{$userId},ServiceStatusChanged" => 'serviceStarted',
-            "updateStatus"=> '$refresh',
         ];
     }
     public function serviceStarted()

app/Livewire/Project/Shared/Danger.php

@@ -24,6 +24,7 @@ class Danger extends Component
     public function delete()
     {
         try {
+            // $this->authorize('delete', $this->resource);
             $this->resource->delete();
             DeleteResourceJob::dispatch($this->resource, $this->delete_configurations);
             return redirect()->route('project.resource.index', [

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

@@ -5,11 +5,11 @@ namespace App\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
-use Illuminate\Support\Str;
 
 class All extends Component
 {
     public $resource;
+    public string $resourceClass;
     public bool $showPreview = false;
     public ?string $modalId = null;
     public ?string $variables = null;
@@ -19,17 +19,44 @@ class All extends Component
         'refreshEnvs',
         'saveKey' => 'submit',
     ];
+    protected $rules = [
+        'resource.settings.is_env_sorting_enabled' => 'required|boolean',
+    ];
+
     public function mount()
     {
-        $resourceClass = get_class($this->resource);
+        $this->resourceClass = get_class($this->resource);
         $resourceWithPreviews = ['App\Models\Application'];
         $simpleDockerfile = !is_null(data_get($this->resource, 'dockerfile'));
-        if (Str::of($resourceClass)->contains($resourceWithPreviews) && !$simpleDockerfile) {
+        if (str($this->resourceClass)->contains($resourceWithPreviews) && !$simpleDockerfile) {
             $this->showPreview = true;
         }
         $this->modalId = new Cuid2(7);
+        $this->sortMe();
         $this->getDevView();
     }
+
+    public function sortMe()
+    {
+        if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose') {
+            if ($this->resource->settings->is_env_sorting_enabled) {
+                $this->resource->environment_variables = $this->resource->environment_variables->sortBy('key');
+                $this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('key');
+            } else {
+                $this->resource->environment_variables = $this->resource->environment_variables->sortBy('id');
+                $this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('id');
+            }
+        }
+        $this->getDevView();
+    }
+    public function instantSave()
+    {
+        if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose') {
+            $this->resource->settings->save();
+            $this->dispatch('success', 'Environment variable settings updated.');
+            $this->sortMe();
+        }
+    }
     public function getDevView()
     {
         $this->variables = $this->resource->environment_variables->map(function ($item) {
@@ -40,7 +67,7 @@ class All extends Component
                 return "$item->key=(multiline, edit in normal view)";
             }
             return "$item->key=$item->value";
-        })->sort()->join('
+        })->join('
 ');
         if ($this->showPreview) {
             $this->variablesPreview = $this->resource->environment_variables_preview->map(function ($item) {
@@ -51,13 +78,18 @@ class All extends Component
                     return "$item->key=(multiline, edit in normal view)";
                 }
                 return "$item->key=$item->value";
-            })->sort()->join('
+            })->join('
 ');
         }
     }
     public function switch()
     {
-        $this->view = $this->view === 'normal' ? 'dev' : 'normal';
+        if ($this->view === 'normal') {
+            $this->view = 'dev';
+        } else {
+            $this->view = 'normal';
+        }
+        $this->sortMe();
     }
     public function saveVariables($isPreview)
     {
@@ -66,6 +98,7 @@ class All extends Component
             $this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete();
         } else {
             $variables = parseEnvFormatToArray($this->variables);
+            ray($variables, $this->variables);
             $this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete();
         }
         foreach ($variables as $key => $variable) {

app/Livewire/Project/Shared/ScheduledTask/Add.php

@@ -2,11 +2,14 @@
 
 namespace App\Livewire\Project\Shared\ScheduledTask;
 
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Add extends Component
 {
     public $parameters;
+    public string $type;
+    public Collection $containerNames;
     public string $name;
     public string $command;
     public string $frequency;
@@ -29,6 +32,9 @@ class Add extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        if ($this->containerNames->count() > 0) {
+            $this->container = $this->containerNames->first();
+        }
     }
 
     public function submit()
@@ -40,6 +46,11 @@ class Add extends Component
                 $this->dispatch('error', 'Invalid Cron / Human expression.');
                 return;
             }
+            if (empty($this->container) || $this->container == 'null') {
+                if ($this->type == 'service') {
+                    $this->container = $this->subServiceName;
+                }
+            }
             $this->dispatch('saveScheduledTask', [
                 'name' => $this->name,
                 'command' => $this->command,

app/Livewire/Project/Shared/ScheduledTask/All.php

@@ -3,14 +3,13 @@
 namespace App\Livewire\Project\Shared\ScheduledTask;
 
 use App\Models\ScheduledTask;
+use Illuminate\Support\Collection;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-use Illuminate\Support\Str;
 
 class All extends Component
 {
     public $resource;
-    public string|null $modalId = null;
+    public Collection $containerNames;
     public ?string $variables = null;
     public array $parameters;
     protected $listeners = ['refreshTasks', 'saveScheduledTask' => 'submit'];
@@ -18,7 +17,18 @@ class All extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->modalId = new Cuid2(7);
+        if ($this->resource->type() == 'service') {
+            $this->containerNames = $this->resource->applications()->pluck('name');
+            $this->containerNames = $this->containerNames->merge($this->resource->databases()->pluck('name'));
+        } elseif ($this->resource->type() == 'application') {
+            if ($this->resource->build_pack === 'dockercompose') {
+                $parsed = $this->resource->parseCompose();
+                $containers = collect(data_get($parsed,'services'))->keys();
+                $this->containerNames = $containers;
+            } else {
+                $this->containerNames = collect([]);
+            }
+        }
     }
     public function refreshTasks()
     {

app/Livewire/Project/Shared/ScheduledTask/Show.php

@@ -17,6 +17,7 @@ class Show extends Component
     public string $type;
 
     protected $rules = [
+        'task.enabled' => 'required|boolean',
         'task.name' => 'required|string',
         'task.command' => 'required|string',
         'task.frequency' => 'required|string',
@@ -45,9 +46,18 @@ class Show extends Component
         $this->task = ModelsScheduledTask::where('uuid', request()->route('task_uuid'))->first();
     }
 
+    public function instantSave()
+    {
+        $this->validateOnly('task.enabled');
+        $this->task->save(['enabled' => $this->task->enabled]);
+        $this->dispatch('success', 'Scheduled task updated.');
+        $this->dispatch('refreshTasks');
+    }
     public function submit()
     {
         $this->validate();
+        $this->task->name = str($this->task->name)->trim()->value();
+        $this->task->container = str($this->task->container)->trim()->value();
         $this->task->save();
         $this->dispatch('success', 'Scheduled task updated.');
         $this->dispatch('refreshTasks');
@@ -60,11 +70,9 @@ class Show extends Component
 
             if ($this->type == 'application') {
                 return redirect()->route('project.application.configuration', $this->parameters);
-            }
-            else {
+            } else {
                 return redirect()->route('project.service.configuration', $this->parameters);
             }
-
         } catch (\Exception $e) {
             return handleError($e);
         }

app/Livewire/Project/Shared/Webhooks.php

@@ -11,10 +11,12 @@ class Webhooks extends Component
     public ?string $githubManualWebhook = null;
     public ?string $gitlabManualWebhook = null;
     public ?string $bitbucketManualWebhook = null;
+    public ?string $giteaManualWebhook = null;
     protected $rules = [
         'resource.manual_webhook_secret_github' => 'nullable|string',
         'resource.manual_webhook_secret_gitlab' => 'nullable|string',
         'resource.manual_webhook_secret_bitbucket' => 'nullable|string',
+        'resource.manual_webhook_secret_gitea' => 'nullable|string',
     ];
     public function saveSecret()
     {
@@ -32,6 +34,7 @@ class Webhooks extends Component
         $this->githubManualWebhook = generateGitManualWebhook($this->resource, 'github');
         $this->gitlabManualWebhook = generateGitManualWebhook($this->resource, 'gitlab');
         $this->bitbucketManualWebhook = generateGitManualWebhook($this->resource, 'bitbucket');
+        $this->giteaManualWebhook = generateGitManualWebhook($this->resource, 'gitea');
     }
     public function render()
     {

app/Livewire/Server/Form.php

@@ -58,6 +58,12 @@ class Form extends Component
         $this->server->refresh();
         $this->server->settings->refresh();
     }
+    public function updatedServerSettingsIsBuildServer()
+    {
+        $this->dispatch('serverInstalled');
+        $this->dispatch('serverRefresh');
+        $this->dispatch('proxyStatusUpdated');
+    }
     public function instantSave()
     {
         try {

app/Livewire/Server/New/ByIp.php

@@ -97,6 +97,9 @@ class ByIp extends Component
             if ($this->is_swarm_worker) {
                 $payload['swarm_cluster'] = $this->selected_swarm_cluster;
             }
+            if ($this->is_build_server) {
+                data_forget($payload, 'proxy');
+            }
             $server = Server::create($payload);
             if ($this->is_build_server) {
                 $this->is_swarm_manager = false;

app/Livewire/Server/Proxy/Deploy.php

@@ -72,6 +72,8 @@ class Deploy extends Component
     public function startProxy()
     {
         try {
+            $this->server->proxy->force_stop = false;
+            $this->server->save();
             $activity = StartProxy::run($this->server);
             $this->dispatch('activityMonitor', $activity->id, ProxyStatusChanged::class);
         } catch (\Throwable $e) {
@@ -86,17 +88,15 @@ class Deploy extends Component
                 instant_remote_process([
                     "docker service rm coolify-proxy_traefik",
                 ], $this->server);
-                $this->server->proxy->status = 'exited';
-                $this->server->save();
-                $this->dispatch('proxyStatusUpdated');
             } else {
                 instant_remote_process([
                     "docker rm -f coolify-proxy",
                 ], $this->server);
-                $this->server->proxy->status = 'exited';
-                $this->server->save();
-                $this->dispatch('proxyStatusUpdated');
             }
+            $this->server->proxy->status = 'exited';
+            $this->server->proxy->force_stop = true;
+            $this->server->save();
+            $this->dispatch('proxyStatusUpdated');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/ValidateAndInstall.php

@@ -129,6 +129,9 @@ class ValidateAndInstall extends Component
             }
         }
 
+        if ($this->server->isBuildServer()) {
+            return;
+        }
         $this->dispatch('startProxy');
     }
     public function render()

app/Livewire/Settings/Backup.php

@@ -36,7 +36,7 @@ class Backup extends Component
 
     public function mount()
     {
-        $this->backup = $this->database?->scheduledBackups->first() ?? [];
+        $this->backup = $this->database?->scheduledBackups->first() ?? null;
         $this->executions = $this->backup?->executions ?? [];
     }
     public function add_coolify_database()

app/Livewire/Settings/Configuration.php

@@ -13,7 +13,7 @@ class Configuration extends Component
     public bool $is_auto_update_enabled;
     public bool $is_registration_enabled;
     public bool $is_dns_validation_enabled;
-    public bool $next_channel;
+    // public bool $next_channel;
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
     protected Server $server;
 
@@ -37,7 +37,7 @@ class Configuration extends Component
         $this->do_not_track = $this->settings->do_not_track;
         $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
         $this->is_registration_enabled = $this->settings->is_registration_enabled;
-        $this->next_channel = $this->settings->next_channel;
+        // $this->next_channel = $this->settings->next_channel;
         $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
     }
 
@@ -47,12 +47,12 @@ class Configuration extends Component
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
         $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
-        if ($this->next_channel) {
-            $this->settings->next_channel = false;
-            $this->next_channel = false;
-        } else {
-            $this->settings->next_channel = $this->next_channel;
-        }
+        // if ($this->next_channel) {
+        //     $this->settings->next_channel = false;
+        //     $this->next_channel = false;
+        // } else {
+        //     $this->settings->next_channel = $this->next_channel;
+        // }
         $this->settings->save();
         $this->dispatch('success', 'Settings updated!');
     }

app/Livewire/Team/AdminView.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Livewire\Team;
+
+use App\Models\Team;
+use App\Models\User;
+use Livewire\Component;
+
+class AdminView extends Component
+{
+    public $users;
+    public ?string $search = "";
+    public bool $lots_of_users = false;
+    private $number_of_users_to_show = 20;
+    public function mount()
+    {
+        if (!isInstanceAdmin()) {
+            return redirect()->route('dashboard');
+        }
+        $this->getUsers();
+    }
+    public function submitSearch()
+    {
+        if ($this->search !== "") {
+            $this->users = User::where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== auth()->id();
+            });
+        } else {
+            $this->getUsers();
+        }
+    }
+    public function getUsers()
+    {
+        $users = User::where('id', '!=', auth()->id())->get();
+        if ($users->count() > $this->number_of_users_to_show) {
+            $this->lots_of_users = true;
+            $this->users = $users->take($this->number_of_users_to_show);
+        } else {
+            $this->lots_of_users = false;
+            $this->users = $users;
+        }
+    }
+    private function finalizeDeletion(User $user, Team $team)
+    {
+        $servers = $team->servers;
+        foreach ($servers as $server) {
+            $resources = $server->definedResources();
+            foreach ($resources as $resource) {
+                ray("Deleting resource: " . $resource->name);
+                $resource->forceDelete();
+            }
+            ray("Deleting server: " . $server->name);
+            $server->forceDelete();
+        }
+
+        $projects = $team->projects;
+        foreach ($projects as $project) {
+            ray("Deleting project: " . $project->name);
+            $project->forceDelete();
+        }
+        $team->members()->detach($user->id);
+        ray('Deleting team: ' . $team->name);
+        $team->delete();
+    }
+    public function delete($id)
+    {
+        if (!auth()->user()->isInstanceAdmin()) {
+            return $this->dispatch('error', 'You are not authorized to delete users');
+        }
+        $user = User::find($id);
+        $teams = $user->teams;
+        foreach ($teams as $team) {
+            ray($team->name);
+            $user_alone_in_team = $team->members->count() === 1;
+            if ($team->id === 0) {
+                if ($user_alone_in_team) {
+                    ray('user is alone in the root team, do nothing');
+                    return $this->dispatch('error', 'User is alone in the root team, cannot delete');
+                }
+            }
+            if ($user_alone_in_team) {
+                ray('user is alone in the team');
+                $this->finalizeDeletion($user, $team);
+                continue;
+            }
+            ray('user is not alone in the team');
+            if ($user->isOwner()) {
+                $found_other_owner_or_admin = $team->members->filter(function ($member) {
+                    return $member->pivot->role === 'owner' || $member->pivot->role === 'admin';
+                })->where('id', '!=', $user->id)->first();
+
+                if ($found_other_owner_or_admin) {
+                    ray('found other owner or admin');
+                    $team->members()->detach($user->id);
+                    continue;
+                } else {
+                    $found_other_member_who_is_not_owner = $team->members->filter(function ($member) {
+                        return $member->pivot->role === 'member';
+                    })->first();
+                    if ($found_other_member_who_is_not_owner) {
+                        ray('found other member who is not owner');
+                        $found_other_member_who_is_not_owner->pivot->role = 'owner';
+                        $found_other_member_who_is_not_owner->pivot->save();
+                        $team->members()->detach($user->id);
+                    } else {
+                        // This should never happen as if the user is the only member in the team, the team should be deleted already.
+                        ray('found no other member who is not owner');
+                        $this->finalizeDeletion($user, $team);
+                    }
+                    continue;
+                }
+            } else {
+                ray('user is not owner');
+                $team->members()->detach($user->id);
+            }
+        }
+        ray("Deleting user: " . $user->name);
+        $user->delete();
+        $this->getUsers();
+    }
+    public function render()
+    {
+        return view('livewire.team.admin-view');
+    }
+}

app/Livewire/Upgrade.php

@@ -3,7 +3,7 @@
 namespace App\Livewire;
 
 use App\Actions\Server\UpdateCoolify;
-use App\Models\InstanceSettings;
+
 use Livewire\Component;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 
@@ -11,6 +11,7 @@ class Upgrade extends Component
 {
     use WithRateLimiting;
     public bool $showProgress = false;
+    public bool $updateInProgress = false;
     public bool $isUpgradeAvailable = false;
     public string $latestVersion = '';
 
@@ -22,23 +23,17 @@ class Upgrade extends Component
         if (isDev()) {
             $this->isUpgradeAvailable = true;
         }
-        $settings = InstanceSettings::get();
-        if ($settings->next_channel) {
-            $this->isUpgradeAvailable = true;
-            $this->latestVersion = 'next';
-        }
     }
 
     public function upgrade()
     {
         try {
-            if ($this->showProgress) {
+            if ($this->updateInProgress) {
                 return;
             }
-            $this->rateLimit(1, 30);
-            $this->showProgress = true;
+            $this->rateLimit(1, 60);
+            $this->updateInProgress = true;
             UpdateCoolify::run(force: true, async: true);
-            $this->dispatch('success', "Updating Coolify to {$this->latestVersion} version...");
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Models/Application.php

@@ -10,6 +10,7 @@ use Illuminate\Support\Collection;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
 use RuntimeException;
+use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Visus\Cuid2\Cuid2;
 
@@ -113,6 +114,18 @@ class Application extends BaseModel
         }
         return null;
     }
+    public function failedTaskLink($task_uuid)
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.application.scheduled-tasks', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'application_uuid' => data_get($this, 'uuid'),
+                'task_uuid' => $task_uuid
+            ]);
+        }
+        return null;
+    }
     public function settings()
     {
         return $this->hasOne(ApplicationSetting::class);
@@ -146,9 +159,13 @@ class Application extends BaseModel
                 if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
                     return "{$this->source->html_url}/{$this->git_repository}/tree/{$this->git_branch}";
                 }
+                // Convert the SSH URL to HTTPS URL
+                if (strpos($this->git_repository, 'git@') === 0) {
+                    $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
+                    return "https://{$git_repository}/tree/{$this->git_branch}";
+                }
                 return $this->git_repository;
             }
-
         );
     }
 
@@ -159,6 +176,11 @@ class Application extends BaseModel
                 if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
                     return "{$this->source->html_url}/{$this->git_repository}/settings/hooks";
                 }
+                // Convert the SSH URL to HTTPS URL
+                if (strpos($this->git_repository, 'git@') === 0) {
+                    $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
+                    return "https://{$git_repository}/settings/hooks";
+                }
                 return $this->git_repository;
             }
         );
@@ -171,10 +193,36 @@ class Application extends BaseModel
                 if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
                     return "{$this->source->html_url}/{$this->git_repository}/commits/{$this->git_branch}";
                 }
+                // Convert the SSH URL to HTTPS URL
+                if (strpos($this->git_repository, 'git@') === 0) {
+                    $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
+                    return "https://{$git_repository}/commits/{$this->git_branch}";
+                }
                 return $this->git_repository;
             }
         );
     }
+    public function gitCommitLink($link): string
+    {
+        if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
+            if (str($this->source->html_url)->contains('bitbucket')) {
+                return "{$this->source->html_url}/{$this->git_repository}/commits/{$link}";
+            }
+            return "{$this->source->html_url}/{$this->git_repository}/commit/{$link}";
+        }
+        if (strpos($this->git_repository, 'git@') === 0) {
+            $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
+            return "https://{$git_repository}/commit/{$link}";
+        }
+        if (str($this->git_repository)->contains('bitbucket')) {
+            $git_repository = str_replace('.git', '', $this->git_repository);
+            $url = Url::fromString($git_repository);
+            $url = $url->withUserInfo('');
+            $url = $url->withPath($url->getPath() . '/commits/' . $link);
+            return $url->__toString();
+        }
+        return $this->git_repository;
+    }
     public function dockerfileLocation(): Attribute
     {
         return Attribute::make(
@@ -429,6 +477,10 @@ class Application extends BaseModel
         }
         return false;
     }
+    public function get_last_successful_deployment()
+    {
+        return ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'finished')->where('pull_request_id', 0)->orderBy('created_at', 'desc')->first();
+    }
     public function get_last_days_deployments()
     {
         return ApplicationDeploymentQueue::where('application_id', $this->id)->where('created_at', '>=', now()->subDays(7))->orderBy('created_at', 'desc')->get();
@@ -847,7 +899,7 @@ class Application extends BaseModel
         if (!$composeFileContent) {
             $this->docker_compose_location = $initialDockerComposeLocation;
             $this->save();
-            throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile");
+            throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
         } else {
             $this->docker_compose_raw = $composeFileContent;
             $this->save();
@@ -964,7 +1016,8 @@ class Application extends BaseModel
         getFilesystemVolumesFromServer($this, $isInit);
     }
 
-    public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false) {
+    public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false)
+    {
         if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) {
             $healthcheckCommand = null;
             $lines = $dockerfile->toArray();

app/Models/ApplicationDeploymentQueue.php

@@ -9,7 +9,8 @@ class ApplicationDeploymentQueue extends Model
 {
     protected $guarded = [];
 
-    public function setStatus(string $status) {
+    public function setStatus(string $status)
+    {
         $this->update([
             'status' => $status,
         ]);
@@ -21,7 +22,13 @@ class ApplicationDeploymentQueue extends Model
         }
         return collect(json_decode($this->logs))->where('name', $name)->first()?->output ?? null;
     }
-
+    public function commitMessage()
+    {
+        if (empty($this->commit_message) || is_null($this->commit_message)) {
+            return null;
+        }
+        return str($this->commit_message)->trim()->limit(50)->value();
+    }
     public function addLogEntry(string $message, string $type = 'stdout', bool $hidden = false)
     {
         if ($type === 'error') {

app/Models/Environment.php

@@ -8,6 +8,18 @@ use Illuminate\Database\Eloquent\Model;
 class Environment extends Model
 {
     protected $guarded = [];
+
+    protected static function booted()
+    {
+        static::deleting(function ($environment) {
+            $shared_variables = $environment->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting environment shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
+
+        });
+    }
     public function isEmpty()
     {
         return $this->applications()->count() == 0 &&

app/Models/Project.php

@@ -25,6 +25,11 @@ class Project extends BaseModel
         static::deleting(function ($project) {
             $project->environments()->delete();
             $project->settings()->delete();
+            $shared_variables = $project->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting project shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
         });
     }
     public function environment_variables()
@@ -55,6 +60,7 @@ class Project extends BaseModel
         return $this->hasManyThrough(Application::class, Environment::class);
     }
 
+
     public function postgresqls()
     {
         return $this->hasManyThrough(StandalonePostgresql::class, Environment::class);
@@ -91,4 +97,7 @@ class Project extends BaseModel
     {
         return $this->applications()->count() + $this->postgresqls()->count() + $this->redis()->count() + $this->mongodbs()->count() + $this->mysqls()->count() + $this->mariadbs()->count() + $this->keydbs()->count() + $this->dragonflies()->count()  + $this->services()->count() + $this->clickhouses()->count();
     }
+    public function databases() {
+        return $this->postgresqls()->get()->merge($this->redis()->get())->merge($this->mongodbs()->get())->merge($this->mysqls()->get())->merge($this->mariadbs()->get())->merge($this->keydbs()->get())->merge($this->dragonflies()->get())->merge($this->clickhouses()->get());
+    }
 }

app/Models/Server.php

@@ -525,7 +525,7 @@ $schema://$host {
                 // Reached max number of retries
                 if ($this->unreachable_notification_sent === false) {
                     ray('Server unreachable, sending notification...');
-                    $this->team?->notify(new Unreachable($this));
+                    // $this->team?->notify(new Unreachable($this));
                     $this->update(['unreachable_notification_sent' => true]);
                 }
                 if ($this->settings->is_reachable === true) {
@@ -825,7 +825,7 @@ $schema://$host {
                 'unreachable_count' => 0,
             ]);
             if (data_get($server, 'unreachable_notification_sent') === true) {
-                $server->team?->notify(new Revived($server));
+                // $server->team?->notify(new Revived($server));
                 $server->update(['unreachable_notification_sent' => false]);
             }
             return ['uptime' => true, 'error' => null];
@@ -927,4 +927,7 @@ $schema://$host {
         }
         return $this->user !== 'root';
     }
+    public function isBuildServer() {
+        return $this->settings->is_build_server;
+    }
 }

app/Models/Service.php

@@ -450,14 +450,16 @@ class Service extends BaseModel
                     $data = collect([]);
                     $admin_user = $this->environment_variables()->where('key', 'SERVICE_USER_ADMIN')->first();
                     $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_ADMIN')->first();
-                    $data = $data->merge([
-                        'User' => [
-                            'key' => 'SERVICE_USER_ADMIN',
-                            'value' => data_get($admin_user, 'value', 'admin'),
-                            'readonly' => true,
-                            'rules' => 'required',
-                        ],
-                    ]);
+                    if ($admin_user) {
+                        $data = $data->merge([
+                            'User' => [
+                                'key' => 'SERVICE_USER_ADMIN',
+                                'value' => data_get($admin_user, 'value', 'admin'),
+                                'readonly' => true,
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
                     if ($admin_password) {
                         $data = $data->merge([
                             'Password' => [
@@ -651,9 +653,21 @@ class Service extends BaseModel
         }
         return null;
     }
+    public function failedTaskLink($task_uuid)
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.service.scheduled-tasks', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'service_uuid' => data_get($this, 'uuid'),
+                'task_uuid' => $task_uuid
+            ]);
+        }
+        return null;
+    }
     public function documentation()
     {
-        $services = getServiceTemplates();
+        $services = get_service_templates();
         $service = data_get($services, str($this->name)->beforeLast('-')->value, []);
         return data_get($service, 'documentation', config('constants.docs.base_url'));
     }
@@ -677,6 +691,17 @@ class Service extends BaseModel
     {
         return $this->belongsTo(Server::class);
     }
+    public function byUuid(string $uuid) {
+        $app = $this->applications()->whereUuid($uuid)->first();
+        if ($app) {
+            return $app;
+        }
+        $db = $this->databases()->whereUuid($uuid)->first();
+        if ($db) {
+            return $db;
+        }
+        return null;
+    }
     public function byName(string $name)
     {
         $app = $this->applications()->whereName($name)->first();

app/Models/ServiceApplication.php

@@ -40,6 +40,9 @@ class ServiceApplication extends BaseModel
     {
         return 'service';
     }
+    public function workdir() {
+        return service_configuration_dir() . "/{$this->service->uuid}";
+    }
     public function serviceType()
     {
         $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {

app/Models/ServiceDatabase.php

@@ -59,6 +59,9 @@ class ServiceDatabase extends BaseModel
         }
         return "{$realIp}:{$port}";
     }
+    public function workdir() {
+        return service_configuration_dir() . "/{$this->service->uuid}";
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);

app/Models/Team.php

@@ -26,6 +26,34 @@ class Team extends Model implements SendsDiscord, SendsEmail
                 throw new \Exception('You are not allowed to update this team.');
             }
         });
+
+        static::deleting(function ($team) {
+            $keys = $team->privateKeys;
+            foreach ($keys as $key) {
+                ray('Deleting key: ' . $key->name);
+                $key->delete();
+            }
+            $sources = $team->sources();
+            foreach ($sources as $source) {
+                ray('Deleting source: ' . $source->name);
+                $source->delete();
+            }
+            $tags = Tag::whereTeamId($team->id)->get();
+            foreach ($tags as $tag) {
+                ray('Deleting tag: ' . $tag->name);
+                $tag->delete();
+            }
+            $shared_variables = $team->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting team shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
+            $s3s = $team->s3s;
+            foreach ($s3s as $s3) {
+                ray('Deleting s3: ' . $s3->name);
+                $s3->delete();
+            }
+        });
     }
 
     public function routeNotificationForDiscord()

app/Models/User.php

@@ -183,6 +183,7 @@ class User extends Authenticatable implements SendsEmail
         if (data_get($this, 'pivot')) {
             return $this->pivot->role;
         }
-        return auth()->user()->teams->where('id', currentTeam()->id)->first()->pivot->role;
+        $user = auth()->user()->teams->where('id', currentTeam()->id)->first();
+        return data_get($user, 'pivot.role');
     }
 }

app/Notifications/Application/DeploymentSuccess.php

@@ -43,7 +43,12 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        return setNotificationChannels($notifiable, 'deployments');
+        $channels = setNotificationChannels($notifiable, 'deployments');
+        if (isCloud()) {
+            // TODO: Make batch notifications work with email
+            $channels = array_diff($channels, ['App\Notifications\Channels\EmailChannel']);
+        }
+        return $channels;
     }
     public function toMail(): MailMessage
     {

app/Notifications/Channels/TelegramChannel.php

@@ -14,22 +14,27 @@ class TelegramChannel
         $buttons = data_get($data, 'buttons', []);
         $telegramToken = data_get($telegramData, 'token');
         $chatId = data_get($telegramData, 'chat_id');
-        $topicId  = null;
+        $topicId = null;
         $topicsInstance = get_class($notification);
 
         switch ($topicsInstance) {
-            case 'App\Notifications\StatusChange':
-                $topicId = data_get($notifiable, 'telegram_notifications_status_changes_message_thread_id');
-                break;
             case 'App\Notifications\Test':
                 $topicId = data_get($notifiable, 'telegram_notifications_test_message_thread_id');
                 break;
-            case 'App\Notifications\Deployment':
+            case 'App\Notifications\Application\StatusChanged':
+                $topicId = data_get($notifiable, 'telegram_notifications_status_changes_message_thread_id');
+                break;
+            case 'App\Notifications\Application\DeploymentSuccess':
+            case 'App\Notifications\Application\DeploymentFailed':
                 $topicId = data_get($notifiable, 'telegram_notifications_deployments_message_thread_id');
                 break;
-            case 'App\Notifications\DatabaseBackup':
+            case 'App\Notifications\Database\BackupSuccess':
+            case 'App\Notifications\Database\BackupFailed':
                 $topicId = data_get($notifiable, 'telegram_notifications_database_backups_message_thread_id');
                 break;
+            case 'App\Notifications\ScheduledTask\TaskFailed':
+                $topicId = data_get($notifiable, 'telegram_notifications_scheduled_tasks_thread_id');
+                break;
         }
         if (!$telegramToken || !$chatId || !$message) {
             return;

app/Notifications/Container/ContainerRestarted.php

@@ -31,7 +31,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
         $mail->view('emails.container-restarted', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
-            'url' => $this->url ,
+            'url' => $this->url,
         ]);
         return $mail;
     }

app/Notifications/ScheduledTask/TaskFailed.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Notifications\ScheduledTask;
+
+use App\Models\ScheduledTask;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class TaskFailed extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $backoff = 10;
+    public $tries = 2;
+
+    public ?string $url = null;
+
+    public function __construct(public ScheduledTask $task, public string $output)
+    {
+        if ($task->application) {
+            $this->url = $task->application->failedTaskLink($task->uuid);
+        } else if ($task->service) {
+            $this->url = $task->service->failedTaskLink($task->uuid);
+        }
+    }
+
+    public function via(object $notifiable): array
+    {
+
+        return setNotificationChannels($notifiable, 'scheduled_tasks');
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: [ACTION REQUIRED] Scheduled task ({$this->task->name}) failed.");
+        $mail->view('emails.scheduled-task-failed', [
+            'task' => $this->task,
+            'url' => $this->url,
+            'output' => $this->output,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        return "Coolify: Scheduled task ({$this->task->name}, [link]({$this->url})) failed with output: {$this->output}";
+    }
+    public function toTelegram(): array
+    {
+        $message = "Coolify: Scheduled task ({$this->task->name}) failed with output: {$this->output}";
+        if ($this->url) {
+            $buttons[] = [
+                "text" => "Open task in Coolify",
+                "url" => (string) $this->url
+            ];
+        }
+        return [
+            "message" => $message,
+        ];
+    }
+}

app/Policies/ApplicationPolicy.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Application;
+use App\Models\User;
+use Illuminate\Auth\Access\Response;
+
+class ApplicationPolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Application $application): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Application $application): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Application $application): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Application $application): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Application $application): bool
+    {
+        return true;
+    }
+}

app/Policies/ServicePolicy.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Service;
+use App\Models\User;
+use Illuminate\Auth\Access\Response;
+
+class ServicePolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Service $service): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Service $service): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Service $service): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Service $service): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Service $service): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return false;
+    }
+    public function stop(User $user, Service $service): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return false;
+    }
+}

bootstrap/helpers/applications.php

@@ -6,7 +6,6 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
-use Illuminate\Support\Collection;
 use Spatie\Url\Url;
 
 function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null, bool $only_this_server = false, bool $rollback = false)
@@ -44,16 +43,10 @@ function queue_application_deployment(Application $application, string $deployme
     ]);
 
     if ($no_questions_asked) {
-        $deployment->update([
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $deployment->id,
         ));
     } else if (next_queuable($server_id, $application_id)) {
-        $deployment->update([
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $deployment->id,
         ));

bootstrap/helpers/docker.php

@@ -173,14 +173,14 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
 function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
 {
     if ($resource->getMorphClass() === 'App\Models\ServiceApplication') {
-        $uuid = $resource->uuid;
-        $server = $resource->service->server;
-        $environment_variables = $resource->service->environment_variables;
+        $uuid = data_get($resource, 'uuid');
+        $server = data_get($resource, 'service.server');
+        $environment_variables = data_get($resource, 'service.environment_variables');
         $type = $resource->serviceType();
     } else if ($resource->getMorphClass() === 'App\Models\Application') {
-        $uuid = $resource->uuid;
-        $server = $resource->destination->server;
-        $environment_variables = $resource->environment_variables;
+        $uuid = data_get($resource, 'uuid');
+        $server = data_get($resource, 'destination.server');
+        $environment_variables = data_get($resource, 'environment_variables');
         $type = $resource->serviceType();
     }
     if (is_null($server) || is_null($type)) {
@@ -234,7 +234,7 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
     }
     return $payload;
 }
-function fqdnLabelsForCaddy(string $network, 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)
+function fqdnLabelsForCaddy(string $network, 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, ?string $image = null)
 {
     $labels = collect([]);
     if ($serviceLabels) {
@@ -247,7 +247,6 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
         $url = Url::fromString($domain);
         $host = $url->getHost();
         $path = $url->getPath();
-        // $stripped_path = str($path)->replaceEnd('/', '');
 
         $schema = $url->getScheme();
         $port = $url->getPort();
@@ -273,7 +272,7 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
     }
     return $labels->sort();
 }
-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, bool $generate_unique_uuid = false)
+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, bool $generate_unique_uuid = false, ?string $image = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -331,7 +330,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 $http_label = "http-{$loop}-{$uuid}-{$service_name}";
                 $https_label = "https-{$loop}-{$uuid}-{$service_name}";
             }
-
+            if (str($image)->contains('ghost')) {
+                $labels->push("traefik.http.middlewares.redir-ghost.redirectregex.regex=^{$path}/(.*)");
+                $labels->push("traefik.http.middlewares.redir-ghost.redirectregex.replacement=/$1");
+            }
             if ($schema === 'https') {
                 // Set labels for https
                 $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
@@ -341,9 +343,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
-                    if ($is_stripprefix_enabled) {
+                    $middlewares = collect([]);
+                    if ($is_stripprefix_enabled && !str($image)->contains('ghost')) {
                         $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
-                        $middlewares = collect(["{$https_label}-stripprefix"]);
+                        $middlewares->push("{$https_label}-stripprefix");
                     }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
@@ -354,6 +357,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($redirect && $redirect_middleware) {
                         $middlewares->push($redirect_middleware);
                     }
+                    if (str($image)->contains('ghost')) {
+                        $middlewares->push('redir-ghost');
+                    }
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -369,6 +375,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($redirect && $redirect_middleware) {
                         $middlewares->push($redirect_middleware);
                     }
+                    if (str($image)->contains('ghost')) {
+                        $middlewares->push('redir-ghost');
+                    }
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -396,9 +405,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($path !== '/') {
-                    if ($is_stripprefix_enabled) {
+                    $middlewares = collect([]);
+                    if ($is_stripprefix_enabled && !str($image)->contains('ghost')) {
                         $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
-                        $middlewares = collect(["{$http_label}-stripprefix"]);
+                        $middlewares->push("{$https_label}-stripprefix");
                     }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
@@ -409,6 +419,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($redirect && $redirect_middleware) {
                         $middlewares->push($redirect_middleware);
                     }
+                    if (str($image)->contains('ghost')) {
+                        $middlewares->push('redir-ghost');
+                    }
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
@@ -424,6 +437,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($redirect && $redirect_middleware) {
                         $middlewares->push($redirect_middleware);
                     }
+                    if (str($image)->contains('ghost')) {
+                        $middlewares->push('redir-ghost');
+                    }
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");

bootstrap/helpers/services.php

@@ -110,16 +110,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                 $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
                 $fqdn = Url::fromString($resourceFqdns);
                 $port = $fqdn->getPort();
+                $path = $fqdn->getPath();
                 $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
                 if ($generatedEnv) {
-                    $generatedEnv->value = $fqdn;
+                    $generatedEnv->value = $fqdn . $path;
                     $generatedEnv->save();
                 }
                 if ($port) {
                     $variableName = $variableName . "_$port";
                     $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                    // ray($generatedEnv);
                     if ($generatedEnv) {
-                        $generatedEnv->value = $fqdn . ':' . $port;
+                        $generatedEnv->value = $fqdn . ':' . $port . $path;
                         $generatedEnv->save();
                     }
                 }
@@ -127,17 +129,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                 $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
                 $url = Url::fromString($fqdn);
                 $port = $url->getPort();
+                $path = $url->getPath();
                 $url = $url->getHost();
                 if ($generatedEnv) {
                     $url = Str::of($fqdn)->after('://');
-                    $generatedEnv->value = $url;
+                    $generatedEnv->value = $url . $path;
                     $generatedEnv->save();
                 }
                 if ($port) {
                     $variableName = $variableName . "_$port";
                     $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
                     if ($generatedEnv) {
-                        $generatedEnv->value = $url . ':' . $port;
+                        $generatedEnv->value = $url . ':' . $port . $path;
                         $generatedEnv->save();
                     }
                 }
@@ -146,6 +149,7 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                     $host = Url::fromString($fqdn);
                     $port = $host->getPort();
                     $url = $host->getHost();
+                    $path = $host->getPath();
                     $host = $host->getScheme() . '://' . $host->getHost();
                     if ($port) {
                         $port_envs = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_FQDN_%_$port")->get();
@@ -153,10 +157,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                             $service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_');
                             $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_' . $service_fqdn)->first();
                             if ($env) {
-                                $env->value = $host;
+                                $env->value = $host . $path;
                                 $env->save();
                             }
-                            $port_env->value = $host . ':' . $port;
+                            $port_env->value = $host . ':' . $port . $path;
                             $port_env->save();
                         }
                         $port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get();
@@ -164,17 +168,17 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                             $service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_');
                             $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_' . $service_url)->first();
                             if ($env) {
-                                $env->value = $url;
+                                $env->value = $url . $path;
                                 $env->save();
                             }
-                            $port_env_url->value = $url . ':' . $port;
+                            $port_env_url->value = $url . ':' . $port . $path;
                             $port_env_url->save();
                         }
                     } else {
                         $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper()->replace('-', '');
                         $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
                         $fqdn = Url::fromString($fqdn);
-                        $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
+                        $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost() . $fqdn->getPath();
                         if ($generatedEnv) {
                             $generatedEnv->value = $fqdn;
                             $generatedEnv->save();
@@ -182,7 +186,7 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                         $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper()->replace('-', '');
                         $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
                         $url = Url::fromString($fqdn);
-                        $url = $url->getHost();
+                        $url = $url->getHost() . $url->getPath();
                         if ($generatedEnv) {
                             $url = Str::of($fqdn)->after('://');
                             $generatedEnv->value = $url;

bootstrap/helpers/shared.php

@@ -95,6 +95,9 @@ function currentTeam()
 
 function showBoarding(): bool
 {
+    if (auth()->user()?->isMember()) {
+        return false;
+    }
     return currentTeam()->show_boarding ?? false;
 }
 function refreshSession(?Team $team = null): void
@@ -162,9 +165,12 @@ function get_latest_sentinel_version(): string
 function get_latest_version_of_coolify(): string
 {
     try {
-        $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
-        $versions = $response->json();
+        $versions = File::get(base_path('versions.json'));
+        $versions = json_decode($versions, true);
         return data_get($versions, 'coolify.v4.version');
+        // $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
+        // $versions = $response->json();
+        // return data_get($versions, 'coolify.v4.version');
     } catch (\Throwable $e) {
         //throw $e;
         ray($e->getMessage());
@@ -459,24 +465,25 @@ function sslip(Server $server)
     return "http://{$server->ip}.sslip.io";
 }
 
-function getServiceTemplates()
+function get_service_templates()
 {
-    if (isDev()) {
-        $services = File::get(base_path('templates/service-templates.json'));
-        $services = collect(json_decode($services))->sortKeys();
-    } else {
-        try {
-            $response = Http::retry(3, 50)->get(config('constants.services.official'));
-            if ($response->failed()) {
-                return collect([]);
-            }
-            $services = $response->json();
-            $services = collect($services)->sortKeys();
-        } catch (\Throwable $e) {
-            $services = collect([]);
-        }
-    }
-    return $services;
+    // if (isDev()) {
+    //      $services = File::get(base_path('templates/service-templates.json'));
+    //      $services = collect(json_decode($services))->sortKeys();
+    // } else {
+    //     try {
+    //         $response = Http::retry(3, 50)->get(config('constants.services.official'));
+    //         if ($response->failed()) {
+    //             return collect([]);
+    //         }
+    //         $services = $response->json();
+    //         $services = collect($services)->sortKeys();
+    //     } catch (\Throwable $e) {
+    //         $services = collect([]);
+    //     }
+    // }
+    $services = File::get(base_path('templates/service-templates.json'));
+    return collect(json_decode($services))->sortKeys();
 }
 
 function getResourceByUuid(string $uuid, ?int $teamId = null)
@@ -646,7 +653,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             } catch (\Exception $e) {
                 throw new \Exception($e->getMessage());
             }
-            $allServices = getServiceTemplates();
+            $allServices = get_service_templates();
             $topLevelVolumes = collect(data_get($yaml, 'volumes', []));
             $topLevelNetworks = collect(data_get($yaml, 'networks', []));
             $services = data_get($yaml, 'services');
@@ -1004,7 +1011,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 'service_id' => $resource->id,
                             ])->first();
                             if ($env) {
-
                                 $env_url = Url::fromString($savedService->fqdn);
                                 $env_port = $env_url->getPort();
                                 if ($env_port !== $predefinedPort) {
@@ -1046,6 +1052,17 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                     }
                                     if ($foundEnv) {
                                         $fqdn = data_get($foundEnv, 'value');
+                                        // if ($savedService->fqdn) {
+                                        //     $savedServiceFqdn = Url::fromString($savedService->fqdn);
+                                        //     $parsedFqdn = Url::fromString($fqdn);
+                                        //     $savedServicePath = $savedServiceFqdn->getPath();
+                                        //     $parsedFqdnPath = $parsedFqdn->getPath();
+                                        //     if ($savedServicePath != $parsedFqdnPath) {
+                                        //         $fqdn = $parsedFqdn->withPath($savedServicePath)->__toString();
+                                        //         $foundEnv->value = $fqdn;
+                                        //         $foundEnv->save();
+                                        //     }
+                                        // }
                                     } else {
                                         if ($command->value() === 'URL') {
                                             $fqdn = Str::of($fqdn)->after('://')->value();
@@ -1150,7 +1167,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             serviceLabels: $serviceLabels,
                             is_gzip_enabled: $savedService->isGzipEnabled(),
                             is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
-                            service_name: $serviceName
+                            service_name: $serviceName,
+                            image: data_get($service, 'image')
                         ));
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
                             network: $resource->destination->network,
@@ -1160,7 +1178,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             serviceLabels: $serviceLabels,
                             is_gzip_enabled: $savedService->isGzipEnabled(),
                             is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
-                            service_name: $serviceName
+                            service_name: $serviceName,
+                            image: data_get($service, 'image')
                         ));
                     }
                 }
@@ -1174,18 +1193,26 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         ]
                     ]);
                 }
+                if ($serviceLabels->count() > 0) {
+                    if ($resource->is_container_label_escape_enabled) {
+                        $serviceLabels = $serviceLabels->map(function ($value, $key) {
+                            return escapeDollarSign($value);
+                        });
+                    }
+                }
                 data_set($service, 'labels', $serviceLabels->toArray());
                 data_forget($service, 'is_database');
                 if (!data_get($service, 'restart')) {
                     data_set($service, 'restart', RESTART_MODE);
                 }
-                if (data_get($service, 'restart') === 'no') {
+                if (data_get($service, 'restart') === 'no' || data_get($service, 'exclude_from_hc')) {
                     $savedService->update(['exclude_from_status' => true]);
                 }
                 data_set($service, 'container_name', $containerName);
                 data_forget($service, 'volumes.*.content');
                 data_forget($service, 'volumes.*.isDirectory');
                 data_forget($service, 'volumes.*.is_directory');
+                data_forget($service, 'exclude_from_hc');
 
                 // Remove unnecessary variables from service.environment
                 // $withoutServiceEnvs = collect([]);
@@ -1207,6 +1234,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 'volumes' => $topLevelVolumes->toArray(),
                 'networks' => $topLevelNetworks->toArray(),
             ];
+            $yaml = data_forget($yaml, 'services.*.volumes.*.content');
             $resource->docker_compose_raw = Yaml::dump($yaml, 10, 2);
             $resource->docker_compose = Yaml::dump($finalServices, 10, 2);
             $resource->save();
@@ -1225,13 +1253,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             try {
                 $yaml = Yaml::parse($resource->docker_compose_pr_raw);
             } catch (\Exception $e) {
-                throw new \Exception($e->getMessage());
+                return;
             }
         } else {
             try {
                 $yaml = Yaml::parse($resource->docker_compose_raw);
             } catch (\Exception $e) {
-                throw new \Exception($e->getMessage());
+                return;
             }
         }
         $server = $resource->destination->server;
@@ -1259,6 +1287,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             $servicePorts = collect(data_get($service, 'ports', []));
             $serviceNetworks = collect(data_get($service, 'networks', []));
             $serviceVariables = collect(data_get($service, 'environment', []));
+            $serviceDependencies = collect(data_get($service, 'depends_on', []));
             $serviceLabels = collect(data_get($service, 'labels', []));
             $serviceBuildVariables = collect(data_get($service, 'build.args', []));
             $serviceVariables = $serviceVariables->merge($serviceBuildVariables);
@@ -1275,11 +1304,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     $serviceLabels->push("$removedLabelName=$removedLabel");
                 }
             }
-            if ($serviceLabels->count() > 0) {
-                $serviceLabels = $serviceLabels->map(function ($value, $key) {
-                    return escapeDollarSign($value);
-                });
-            }
+
             $baseName = generateApplicationContainerName($resource, $pull_request_id);
             $containerName = "$serviceName-$baseName";
             if (count($serviceVolumes) > 0) {
@@ -1370,6 +1395,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 data_set($service, 'volumes', $serviceVolumes->toArray());
             }
 
+            if ($pull_request_id !== 0 && count($serviceDependencies) > 0) {
+                $serviceDependencies = $serviceDependencies->map(function ($dependency) use ($pull_request_id) {
+                    return $dependency . "-pr-$pull_request_id";
+                });
+                data_set($service, 'depends_on', $serviceDependencies->toArray());
+            }
+
             // Decide if the service is a database
             $isDatabase = isDatabaseImage(data_get_str($service, 'image'));
             data_set($service, 'is_database', $isDatabase);
@@ -1628,13 +1660,15 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             uuid: $resource->uuid,
                             domains: $fqdns,
                             serviceLabels: $serviceLabels,
-                            generate_unique_uuid: $resource->build_pack === 'dockercompose'
+                            generate_unique_uuid: $resource->build_pack === 'dockercompose',
+                            image: data_get($service, 'image')
                         ));
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
                             network: $resource->destination->network,
                             uuid: $resource->uuid,
                             domains: $fqdns,
-                            serviceLabels: $serviceLabels
+                            serviceLabels: $serviceLabels,
+                            image: data_get($service, 'image')
                         ));
                     }
                 }
@@ -1652,6 +1686,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     ]
                 ]);
             }
+            if ($serviceLabels->count() > 0) {
+                if ($resource->settings->is_container_label_escape_enabled) {
+                    $serviceLabels = $serviceLabels->map(function ($value, $key) {
+                        return escapeDollarSign($value);
+                    });
+                }
+            }
             data_set($service, 'labels', $serviceLabels->toArray());
             data_forget($service, 'is_database');
             if (!data_get($service, 'restart')) {

composer.json

@@ -14,7 +14,7 @@
         "guzzlehttp/guzzle": "^7.5.0",
         "laravel/fortify": "^v1.16.0",
         "laravel/framework": "^v10.7.1",
-        "laravel/horizon": "^5.15",
+        "laravel/horizon": "^5.23.1",
         "laravel/prompts": "^0.1.6",
         "laravel/sanctum": "^v3.2.1",
         "laravel/socialite": "^5.12",
@@ -23,7 +23,7 @@
         "lcobucci/jwt": "^5.0.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-sftp-v3": "^3.0",
-        "livewire/livewire": "^3.0",
+        "livewire/livewire": "3.4.9",
         "lorisleiva/laravel-actions": "^2.7",
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",

config/constants.php

@@ -21,8 +21,8 @@ return [
     ],
     'services' => [
         // Temporary disabled until cache is implemented
-        // 'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
-        'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
+        'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
+        // 'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
     ],
     'limits' => [
         'trial_period' => 0,

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

database/migrations/2024_05_10_085215_make_stripe_comment_longer.php

@@ -0,0 +1,28 @@
+<?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('subscriptions', function (Blueprint $table) {
+            $table->longText('stripe_comment')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->string('stripe_comment')->change();
+        });
+    }
+};

database/migrations/2024_05_15_091757_add_commit_message_to_app_deployment_queue.php

@@ -0,0 +1,28 @@
+<?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_deployment_queues', function (Blueprint $table) {
+            $table->string('commit_message', 50)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('commit_message');
+        });
+    }
+};

database/migrations/2024_05_15_151236_add_container_escape_toggle.php

@@ -0,0 +1,34 @@
+<?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_container_label_escape_enabled')->default(true);
+        });
+        Schema::table('services', function (Blueprint $table) {
+            $table->boolean('is_container_label_escape_enabled')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_container_label_escape_enabled');
+        });
+        Schema::table('services', function (Blueprint $table) {
+            $table->dropColumn('is_container_label_escape_enabled');
+        });
+    }
+};

database/migrations/2024_05_17_082012_add_env_sorting_toggle.php

@@ -0,0 +1,28 @@
+<?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_env_sorting_enabled')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_env_sorting_enabled');
+        });
+    }
+};

database/migrations/2024_05_21_125739_add_scheduled_tasks_notification_to_teams.php

@@ -0,0 +1,34 @@
+<?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('teams', function (Blueprint $table) {
+            $table->boolean('telegram_notifications_scheduled_tasks')->default(true);
+            $table->boolean('smtp_notifications_scheduled_tasks')->default(false)->after('smtp_notifications_status_changes');
+            $table->boolean('discord_notifications_scheduled_tasks')->default(true)->after('discord_notifications_status_changes');
+            $table->text('telegram_notifications_scheduled_tasks_thread_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('telegram_notifications_scheduled_tasks');
+            $table->dropColumn('smtp_notifications_scheduled_tasks');
+            $table->dropColumn('discord_notifications_scheduled_tasks');
+            $table->dropColumn('telegram_notifications_scheduled_tasks_thread_id');
+        });
+    }
+};

database/migrations/2024_05_22_103942_change_pre_post_deployment_commands_length_in_applications.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->text('post_deployment_command')->nullable()->change();
+            $table->text('pre_deployment_command')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('post_deployment_command')->nullable()->change();
+            $table->string('pre_deployment_command')->nullable()->change();
+        });
+    }
+};

database/migrations/2024_05_23_091713_add_gitea_webhook_to_applications.php

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

database/seeders/TestTeamSeeder.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+class TestTeamSeeder extends Seeder
+{
+    public function run(): void
+    {
+        // User has 2 teams, 1 personal, 1 other where it is the owner and no other members are in the team
+        $user = User::factory()->create([
+            'name' => '1 personal, 1 other team, owner, no other members',
+            'email' => '1@example.com',
+        ]);
+        $team = Team::create([
+            'name' => "1@example.com",
+            'personal_team' => false,
+            'show_boarding' => true
+        ]);
+        $user->teams()->attach($team, ['role' => 'owner']);
+
+        // User has 2 teams, 1 personal, 1 other where it is the owner and 1 other member is in the team
+        $user = User::factory()->create([
+            'name' => 'owner: 1 personal, 1 other team, owner, 1 other member',
+            'email' => '2@example.com',
+        ]);
+        $team = Team::create([
+            'name' => "2@example.com",
+            'personal_team' => false,
+            'show_boarding' => true
+        ]);
+        $user->teams()->attach($team, ['role' => 'owner']);
+        $user = User::factory()->create([
+            'name' => 'member: 1 personal, 1 other team, owner, 1 other member',
+            'email' => '3@example.com',
+        ]);
+        $team->members()->attach($user, ['role' => 'member']);
+    }
+}

docker/coolify-helper/Dockerfile

@@ -2,15 +2,15 @@ FROM alpine:3.17
 
 ARG TARGETPLATFORM
 # https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=24.0.9
+ARG DOCKER_VERSION=26.1.2
 # https://github.com/docker/compose/releases
-ARG DOCKER_COMPOSE_VERSION=2.25.0
+ARG DOCKER_COMPOSE_VERSION=2.27.0
 # https://github.com/docker/buildx/releases
-ARG DOCKER_BUILDX_VERSION=0.13.1
+ARG DOCKER_BUILDX_VERSION=0.14.0
 # https://github.com/buildpacks/pack/releases
 ARG PACK_VERSION=0.33.2
 # https://github.com/railwayapp/nixpacks/releases
-ARG NIXPACKS_VERSION=1.21.2
+ARG NIXPACKS_VERSION=1.21.3
 
 USER root
 WORKDIR /artifacts

docker/dev-ssu/Dockerfile

@@ -2,7 +2,7 @@ FROM serversideup/php:8.2-fpm-nginx-v2.2.1
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases
-ARG CLOUDFLARED_VERSION=2024.2.1
+ARG CLOUDFLARED_VERSION=2024.4.1
 
 ARG POSTGRES_VERSION=15
 RUN apt-get update

docker/prod-ssu/Dockerfile

@@ -15,7 +15,7 @@ FROM serversideup/php:8.2-fpm-nginx-v2.2.1
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases
-ARG CLOUDFLARED_VERSION=2024.2.1
+ARG CLOUDFLARED_VERSION=2024.4.1
 ARG POSTGRES_VERSION=15
 
 WORKDIR /var/www/html

docker/testing-host/Dockerfile

@@ -2,11 +2,11 @@ FROM debian:12-slim
 
 ARG TARGETPLATFORM
 # https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=24.0.5
+ARG DOCKER_VERSION=26.1.2
 # https://github.com/docker/compose/releases
-ARG DOCKER_COMPOSE_VERSION=2.21.0
+ARG DOCKER_COMPOSE_VERSION=2.27.0
 # https://github.com/docker/buildx/releases
-ARG DOCKER_BUILDX_VERSION=0.11.2
+ARG DOCKER_BUILDX_VERSION=0.14.0
 
 USER root
 WORKDIR /root

package-lock.json

@@ -6,22 +6,22 @@
         "": {
             "dependencies": {
                 "@tailwindcss/forms": "0.5.7",
-                "@tailwindcss/typography": "0.5.12",
-                "alpinejs": "3.13.8",
-                "ioredis": "5.3.2",
+                "@tailwindcss/typography": "0.5.13",
+                "alpinejs": "3.14.0",
+                "ioredis": "5.4.1",
                 "tailwindcss-scrollbar": "0.1.0"
             },
             "devDependencies": {
                 "@vitejs/plugin-vue": "4.5.1",
                 "autoprefixer": "10.4.19",
-                "axios": "1.6.8",
-                "laravel-echo": "1.16.0",
+                "axios": "1.7.2",
+                "laravel-echo": "1.16.1",
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.38",
                 "pusher-js": "8.4.0-rc2",
                 "tailwindcss": "3.4.3",
                 "vite": "4.5.3",
-                "vue": "3.4.21"
+                "vue": "3.4.27"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -36,9 +36,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.24.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
-            "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
+            "version": "7.24.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+            "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -496,9 +496,9 @@
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.12",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.12.tgz",
-            "integrity": "sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg==",
+            "version": "0.5.13",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.13.tgz",
+            "integrity": "sha512-ADGcJ8dX21dVVHIwTRgzrcunY6YY9uSlAHHGVKvkA+vLc5qLwEszvKts40lx7z0qc4clpjclwLeK5rVCV2P/uw==",
             "dependencies": {
                 "lodash.castarray": "^4.4.0",
                 "lodash.isplainobject": "^4.0.6",
@@ -535,77 +535,77 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
-            "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.9",
-                "@vue/shared": "3.4.21",
+                "@babel/parser": "^7.24.4",
+                "@vue/shared": "3.4.27",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
-                "source-map-js": "^1.0.2"
+                "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
-            "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.21",
-                "@vue/shared": "3.4.21"
+                "@vue/compiler-core": "3.4.27",
+                "@vue/shared": "3.4.27"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
-            "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+            "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.9",
-                "@vue/compiler-core": "3.4.21",
-                "@vue/compiler-dom": "3.4.21",
-                "@vue/compiler-ssr": "3.4.21",
-                "@vue/shared": "3.4.21",
+                "@babel/parser": "^7.24.4",
+                "@vue/compiler-core": "3.4.27",
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.7",
-                "postcss": "^8.4.35",
-                "source-map-js": "^1.0.2"
+                "magic-string": "^0.30.10",
+                "postcss": "^8.4.38",
+                "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
-            "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+            "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.21",
-                "@vue/shared": "3.4.21"
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/shared": "3.4.27"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -617,64 +617,64 @@
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
-            "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+            "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.4.21",
-                "@vue/shared": "3.4.21"
+                "@vue/reactivity": "3.4.27",
+                "@vue/shared": "3.4.27"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
-            "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz",
+            "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.4.21"
+                "@vue/shared": "3.4.27"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
-            "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+            "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.4.21",
-                "@vue/shared": "3.4.21",
+                "@vue/runtime-core": "3.4.27",
+                "@vue/shared": "3.4.27",
                 "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
-            "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+            "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.4.21",
-                "@vue/shared": "3.4.21"
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27"
             },
             "peerDependencies": {
-                "vue": "3.4.21"
+                "vue": "3.4.27"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -683,9 +683,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/alpinejs": {
-            "version": "3.13.8",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.8.tgz",
-            "integrity": "sha512-XolbBJryCndomtaHd/KHQjQeD/L72FJxy/YhLLFD4Lr7zzGcpcbg+UgXteMR2pYg1KhRUr6V4O3GfN1zJAmRWw==",
+            "version": "3.14.0",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.0.tgz",
+            "integrity": "sha512-YCWF95PMJqePe9ll6KMyDt/nLhh2R7RhqBf4loEmLzIskcHque4Br/9UgAa6cw13H0Cm3FM9e1hzDwP5z5wlDA==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -756,9 +756,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.8",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-            "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
+            "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
             "dev": true,
             "dependencies": {
                 "follow-redirects": "^1.15.6",
@@ -1238,9 +1238,9 @@
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
         "node_modules/ioredis": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz",
-            "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==",
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.4.1.tgz",
+            "integrity": "sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==",
             "dependencies": {
                 "@ioredis/commands": "^1.1.1",
                 "cluster-key-slot": "^1.1.0",
@@ -1318,9 +1318,9 @@
             }
         },
         "node_modules/laravel-echo": {
-            "version": "1.16.0",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.0.tgz",
-            "integrity": "sha512-BJGUa4tcKvYmTkzTmcBGMHiO2tq+k7Do5wPmLbRswWfzKwyfZEUR+J5iwBTPEfLLwNPZlA9Kjo6R/NV6pmyIpg==",
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.1.tgz",
+            "integrity": "sha512-++Ylb6M3ariC9Rk5WE5gZjj6wcEV5kvLF8b+geJ5/rRIfdoOA+eG6b9qJPrarMD9rY28Apx+l3eelIrCc2skVg==",
             "dev": true,
             "engines": {
                 "node": ">=10"
@@ -1381,15 +1381,12 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
         "node_modules/magic-string": {
-            "version": "0.30.8",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-            "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+            "version": "0.30.10",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+            "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
-            },
-            "engines": {
-                "node": ">=12"
             }
         },
         "node_modules/merge2": {
@@ -2085,16 +2082,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
-            "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz",
+            "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.21",
-                "@vue/compiler-sfc": "3.4.21",
-                "@vue/runtime-dom": "3.4.21",
-                "@vue/server-renderer": "3.4.21",
-                "@vue/shared": "3.4.21"
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-sfc": "3.4.27",
+                "@vue/runtime-dom": "3.4.27",
+                "@vue/server-renderer": "3.4.27",
+                "@vue/shared": "3.4.27"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2106,9 +2103,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.4.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+            "version": "3.4.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -8,20 +8,20 @@
     "devDependencies": {
         "@vitejs/plugin-vue": "4.5.1",
         "autoprefixer": "10.4.19",
-        "axios": "1.6.8",
-        "laravel-echo": "1.16.0",
+        "axios": "1.7.2",
+        "laravel-echo": "1.16.1",
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.38",
         "pusher-js": "8.4.0-rc2",
         "tailwindcss": "3.4.3",
         "vite": "4.5.3",
-        "vue": "3.4.21"
+        "vue": "3.4.27"
     },
     "dependencies": {
         "@tailwindcss/forms": "0.5.7",
-        "@tailwindcss/typography": "0.5.12",
-        "alpinejs": "3.13.8",
-        "ioredis": "5.3.2",
+        "@tailwindcss/typography": "0.5.13",
+        "alpinejs": "3.14.0",
+        "ioredis": "5.4.1",
         "tailwindcss-scrollbar": "0.1.0"
     }
 }

public/svgs/chatwoot.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 550 500" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="on_white" fill-rule="nonzero">
+            <g id="woot-log">
+                <circle id="Oval" fill="#47A7F6" cx="256" cy="256" r="256"></circle>
+                <path d="M362.807947,368.807947 L244.122956,368.807947 C178.699407,368.807947 125.456954,315.561812 125.456954,250.12177 C125.456954,184.703089 178.699407,131.456954 244.124143,131.456954 C309.565494,131.456954 362.807947,184.703089 362.807947,250.12177 L362.807947,368.807947 Z" id="Fill-1" stroke="#FFFFFF" stroke-width="6" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

public/svgs/twenty.svg

@@ -0,0 +1 @@
+<svg fill="none" height="136" viewBox="0 0 136 136" width="136" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><rect height="136" rx="16" width="136"/></clipPath><g clip-path="url(#a)"><path d="m136 .00002289h-136l.00014448 135.99997711h135.99985552zm-108.73 50.64007711c0-7.43 6.03-13.46 13.46-13.46h25.91c.38 0 .73.23.89.58s.09.76-.17 1.05l-5.68 6.17c-.99 1.07-2.38 1.69-3.84 1.69h-17.04c-2.23 0-4.04 1.81-4.04 4.04v10.18c0 1.31-1.06 2.37-2.37 2.37h-4.74c-1.31 0-2.37-1.06-2.37-2.37v-10.25zm80.61 34.72c0 7.43-6.03 13.4599-13.46 13.4599h-11.01c-7.43 0-13.46-6.0299-13.46-13.4599v-19.27c0-1.31.49-2.57 1.38-3.54l6.42-6.97c.27-.29.69-.39 1.07-.25.37.15.62.4999.62.8999v29.0701c0 2.23 1.81 4.04 4.04 4.04h10.88c2.23 0 4.04-1.81 4.04-4.04v-34.59c0-2.23-1.81-4.04-4.04-4.04h-12.65c-1.45 0-2.83.61-3.82 1.67l-37.73 41h22.67c1.31 0 2.37 1.06 2.37 2.37v4.74c0 1.31-1.06 2.3699-2.37 2.3699h-30.55c-2.77 0-5.02-2.2499-5.02-5.0199v-2.5101c0-1.26.47-2.4699 1.33-3.3999l42.3-45.95c2.8-3.04 6.73-4.76 10.86-4.76h12.66c7.43 0 13.46 6.03 13.46 13.46v34.72z" fill="#000"/><g fill="#fff"><path d="m27.27 50.6401c0-7.43 6.03-13.46 13.46-13.46h25.91c.38 0 .73.23.89.58s.09.76-.17 1.05l-5.68 6.17c-.99 1.07-2.38 1.69-3.84 1.69h-17.04c-2.23 0-4.04 1.81-4.04 4.04v10.18c0 1.31-1.06 2.37-2.37 2.37h-4.74c-1.31 0-2.37-1.06-2.37-2.37v-10.25z"/><path d="m107.88 85.3601c0 7.43-6.03 13.4599-13.46 13.4599h-11.01c-7.43 0-13.46-6.0299-13.46-13.4599v-19.27c0-1.31.49-2.57 1.38-3.54l6.42-6.97c.27-.29.69-.39 1.07-.25.37.15.62.4999.62.8999v29.0701c0 2.23 1.81 4.04 4.04 4.04h10.88c2.23 0 4.04-1.81 4.04-4.04v-34.59c0-2.23-1.81-4.04-4.04-4.04h-12.65c-1.45 0-2.83.61-3.82 1.67l-37.73 41h22.67c1.31 0 2.37 1.06 2.37 2.37v4.74c0 1.31-1.06 2.3699-2.37 2.3699h-30.55c-2.77 0-5.02-2.2499-5.02-5.0199v-2.5101c0-1.26.47-2.4699 1.33-3.3999l42.3-45.95c2.8-3.04 6.73-4.76 10.86-4.76h12.66c7.43 0 13.46 6.03 13.46 13.46v34.72z"/></g></g></svg>