Merge pull request #1650 from coollabsio/next

v4.0.0-beta.191

README.md

@@ -31,7 +31,7 @@ Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and
 <a href="https://github.com/whitesidest"><img src="https://avatars.githubusercontent.com/u/12365916?s=52&v=4" width="60px" alt="Tyler Whitesides" /></a>
 <a href="https://github.com/aniftyco"><img src="https://github.com/aniftyco.png" width="60px" alt="NiftyCo" /></a>
 <a href="https://github.com/iujlaki"><img src="https://github.com/iujlaki.png" width="60px" alt="Imre Ujlaki" /></a>
-<a href="https://github.com/Illyism"><img src="https://github.com/Illyism.png" width="60px" alt="Ilias Ism" /></a>
+<a href="https://il.ly"><img src="https://github.com/Illyism.png" width="60px" alt="Ilias Ism" /></a>
 <a href="https://github.com/urtho"><img src="https://github.com/urtho.png" width="60px" alt="Paweł Pierścionek" /></a>
 <a href="https://github.com/monocursive"><img src="https://github.com/monocursive.png" width="60px" alt="Michael Mazurczak" /></a>
 

app/Actions/Database/StartMariadb.php

@@ -57,7 +57,6 @@ class StartMariadb
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -69,6 +68,9 @@ class StartMariadb
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',

app/Actions/Database/StartMongodb.php

@@ -64,7 +64,6 @@ class StartMongodb
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -76,6 +75,9 @@ class StartMongodb
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
@@ -121,7 +123,7 @@ class StartMongodb
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo '{$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()

app/Actions/Database/StartMysql.php

@@ -57,7 +57,6 @@ class StartMysql
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -69,6 +68,9 @@ class StartMysql
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',

app/Actions/Database/StartPostgresql.php

@@ -50,12 +50,8 @@ class StartPostgresql
                     ],
                     'healthcheck' => [
                         'test' => [
-                            'CMD-SHELL',
-                            'pg_isready',
-                            '-d',
-                            $this->database->postgres_db,
-                            '-U',
-                            $this->database->postgres_user,
+                            "CMD-SHELL",
+                            "psql -U {$this->database->postgres_user} -d {$this->database->postgres_db} -c 'SELECT 1' || exit 1"
                         ],
                         'interval' => '5s',
                         'timeout' => '5s',
@@ -67,7 +63,6 @@ class StartPostgresql
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -79,6 +74,9 @@ class StartPostgresql
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             ray('Log Drain Enabled');
             $docker_compose['services'][$container_name]['logging'] = [

app/Actions/Database/StartRedis.php

@@ -66,7 +66,6 @@ class StartRedis
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -78,6 +77,9 @@ class StartRedis
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',

app/Actions/Server/CleanupDocker.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Actions\Server;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Server;
+
+class CleanupDocker
+{
+    use AsAction;
+    public function handle(Server $server, bool $force = true)
+    {
+        if ($force) {
+            instant_remote_process(['docker image prune -af'], $server, false);
+            instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false);
+            instant_remote_process(['docker builder prune -af'], $server, false);
+        } else {
+            instant_remote_process(['docker image prune -f'], $server, false);
+            instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false);
+            instant_remote_process(['docker builder prune -f'], $server, false);
+        }
+    }
+}

app/Actions/Server/UpdateCoolify.php

@@ -22,6 +22,7 @@ class UpdateCoolify
             if (!$this->server) {
                 return;
             }
+            CleanupDocker::run($this->server, false);
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
             ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);

app/Console/Commands/Init.php

@@ -99,7 +99,7 @@ class Init extends Command
             return;
         }
         try {
-            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
+            Http::get("https://undead.coolify.io/v4/alive?appId=$id&version=$version");
             echo "I am alive!\n";
         } catch (\Throwable $e) {
             echo "Error in alive: {$e->getMessage()}\n";
@@ -142,83 +142,83 @@ class Init extends Command
         try {
             $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($applications as $application) {
-                echo "Deleting stucked application: {$application->name}\n";
+                echo "Deleting stuck application: {$application->name}\n";
                 $application->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked application: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck application: {$e->getMessage()}\n";
         }
         try {
             $postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($postgresqls as $postgresql) {
-                echo "Deleting stucked postgresql: {$postgresql->name}\n";
+                echo "Deleting stuck postgresql: {$postgresql->name}\n";
                 $postgresql->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked postgresql: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n";
         }
         try {
             $redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($redis as $redis) {
-                echo "Deleting stucked redis: {$redis->name}\n";
+                echo "Deleting stuck redis: {$redis->name}\n";
                 $redis->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked redis: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
         }
         try {
             $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($mongodbs as $mongodb) {
-                echo "Deleting stucked mongodb: {$mongodb->name}\n";
+                echo "Deleting stuck mongodb: {$mongodb->name}\n";
                 $mongodb->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked mongodb: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n";
         }
         try {
             $mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($mysqls as $mysql) {
-                echo "Deleting stucked mysql: {$mysql->name}\n";
+                echo "Deleting stuck mysql: {$mysql->name}\n";
                 $mysql->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked mysql: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck mysql: {$e->getMessage()}\n";
         }
         try {
             $mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($mariadbs as $mariadb) {
-                echo "Deleting stucked mariadb: {$mariadb->name}\n";
+                echo "Deleting stuck mariadb: {$mariadb->name}\n";
                 $mariadb->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked mariadb: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n";
         }
         try {
             $services = Service::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($services as $service) {
-                echo "Deleting stucked service: {$service->name}\n";
+                echo "Deleting stuck service: {$service->name}\n";
                 $service->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked service: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck service: {$e->getMessage()}\n";
         }
         try {
             $serviceApps = ServiceApplication::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($serviceApps as $serviceApp) {
-                echo "Deleting stucked serviceapp: {$serviceApp->name}\n";
+                echo "Deleting stuck serviceapp: {$serviceApp->name}\n";
                 $serviceApp->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
         }
         try {
             $serviceDbs = ServiceDatabase::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($serviceDbs as $serviceDb) {
-                echo "Deleting stucked serviceapp: {$serviceDb->name}\n";
+                echo "Deleting stuck serviceapp: {$serviceDb->name}\n";
                 $serviceDb->forceDelete();
             }
         } catch (\Throwable $e) {
-            echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n";
+            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
         }
 
         // Cleanup any resources that are not attached to any environment or destination or server

app/Console/Commands/ServicesDelete.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\DeleteResourceJob;
 use App\Models\Application;
 use App\Models\Server;
 use App\Models\Service;
@@ -91,7 +92,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     break;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -115,7 +116,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -139,7 +140,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }

app/Console/Kernel.php

@@ -5,12 +5,14 @@ namespace App\Console;
 use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
+use App\Jobs\ScheduledTaskJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\PullHelperImageJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledTask;
 use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
@@ -30,6 +32,7 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->check_scheduled_backups($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
@@ -41,6 +44,7 @@ class Kernel extends ConsoleKernel
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         }
     }
     private function pull_helper_image($schedule)
@@ -68,7 +72,7 @@ class Kernel extends ConsoleKernel
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyFiveMinutes()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)
@@ -107,6 +111,32 @@ class Kernel extends ConsoleKernel
         }
     }
 
+    private function check_scheduled_tasks($schedule) {
+        $scheduled_tasks = ScheduledTask::all();
+        if ($scheduled_tasks->isEmpty()) {
+            ray('no scheduled tasks');
+            return;
+        }
+        foreach ($scheduled_tasks as $scheduled_task) {
+            $service = $scheduled_task->service()->get();
+            $application = $scheduled_task->application()->get();
+
+            if (!$application && !$service) {
+                ray('application/service attached to scheduled task does not exist');
+                $scheduled_task->delete();
+                continue;
+            }
+
+            if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
+                $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
+            }
+            $schedule->job(new ScheduledTaskJob(
+                task: $scheduled_task
+            ))->cron($scheduled_task->frequency)->onOneServer();
+        }
+
+    }
+
     protected function commands(): void
     {
         $this->load(__DIR__ . '/Commands');

app/Http/Controllers/Controller.php

@@ -2,23 +2,68 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\InstanceSettings;
-use App\Models\S3Storage;
-use App\Models\StandalonePostgresql;
+use App\Events\TestEvent;
 use App\Models\TeamInvitation;
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Contracts\FailedPasswordResetLinkRequestResponse;
+use Laravel\Fortify\Contracts\SuccessfulPasswordResetLinkRequestResponse;
+use Illuminate\Support\Facades\Password;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 
+    public function realtime_test() {
+        if (auth()->user()?->currentTeam()->id !== 0) {
+            return redirect(RouteServiceProvider::HOME);
+        }
+        TestEvent::dispatch();
+        return 'Look at your other tab.';
+    }
+    public function verify() {
+        return view('auth.verify-email');
+    }
+    public function email_verify(EmailVerificationRequest $request) {
+        $request->fulfill();
+        $name = request()->user()?->name;
+        send_internal_notification("User {$name} verified their email address.");
+        return redirect(RouteServiceProvider::HOME);
+    }
+    public function forgot_password(Request $request) {
+        if (is_transactional_emails_active()) {
+            $arrayOfRequest = $request->only(Fortify::email());
+            $request->merge([
+                'email' => Str::lower($arrayOfRequest['email']),
+            ]);
+            $type = set_transanctional_email_settings();
+            if (!$type) {
+                return response()->json(['message' => 'Transactional emails are not active'], 400);
+            }
+            $request->validate([Fortify::email() => 'required|email']);
+            $status = Password::broker(config('fortify.passwords'))->sendResetLink(
+                $request->only(Fortify::email())
+            );
+            if ($status == Password::RESET_LINK_SENT) {
+                return app(SuccessfulPasswordResetLinkRequestResponse::class, ['status' => $status]);
+            }
+            if ($status == Password::RESET_THROTTLED) {
+                return response('Already requested a password reset in the past minutes.', 400);
+            }
+            return app(FailedPasswordResetLinkRequestResponse::class, ['status' => $status]);
+        }
+        return response()->json(['message' => 'Transactional emails are not active'], 400);
+    }
     public function link()
     {
         $token = request()->get('token');
@@ -51,90 +96,7 @@ class Controller extends BaseController
         return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
 
-    public function license()
-    {
-        if (!isCloud()) {
-            abort(404);
-        }
-        return view('settings.license', [
-            'settings' => InstanceSettings::get(),
-        ]);
-    }
-
-    public function force_passoword_reset()
-    {
-        return view('auth.force-password-reset');
-    }
-    public function boarding()
-    {
-        if (currentTeam()->boarding || isDev()) {
-            return view('boarding');
-        } else {
-            return redirect()->route('dashboard');
-        }
-    }
-
-    public function settings()
-    {
-        if (isInstanceAdmin()) {
-            $settings = InstanceSettings::get();
-            $database = StandalonePostgresql::whereName('coolify-db')->first();
-            if ($database) {
-                if ($database->status !== 'running') {
-                    $database->status = 'running';
-                    $database->save();
-                }
-                $s3s = S3Storage::whereTeamId(0)->get();
-            }
-            return view('settings.configuration', [
-                'settings' => $settings,
-                'database' => $database,
-                's3s' => $s3s ?? [],
-            ]);
-        } else {
-            return redirect()->route('dashboard');
-        }
-    }
-
-    public function team()
-    {
-        $invitations = [];
-        if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
-        }
-        return view('team.index', [
-            'invitations' => $invitations,
-        ]);
-    }
-
-    public function storages()
-    {
-        $s3 = S3Storage::ownedByCurrentTeam()->get();
-        return view('team.storages.all', [
-            's3' => $s3,
-        ]);
-    }
-
-    public function storages_show()
-    {
-        $storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->firstOrFail();
-        return view('team.storages.show', [
-            'storage' => $storage,
-        ]);
-    }
-
-    public function members()
-    {
-        $invitations = [];
-        if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
-        }
-        return view('team.members', [
-            'invitations' => $invitations,
-        ]);
-    }
-
-    public function acceptInvitation()
+    public function accept_invitation()
     {
         try {
             $resetPassword = request()->query('reset-password');
@@ -169,7 +131,7 @@ class Controller extends BaseController
         }
     }
 
-    public function revokeInvitation()
+    public function revoke_invitation()
     {
         try {
             $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();

app/Http/Controllers/DatabaseController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-
-class DatabaseController extends Controller
-{
-    use AuthorizesRequests, ValidatesRequests;
-
-    public function configuration()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.database.configuration', ['database' => $database]);
-    }
-
-    public function executions()
-    {
-        $backup_uuid = request()->route('backup_uuid');
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        $backup = $database->scheduledBackups->where('uuid', $backup_uuid)->first();
-        if (!$backup) {
-            return redirect()->route('dashboard');
-        }
-        $executions = collect($backup->executions)->sortByDesc('created_at');
-        return view('project.database.backups.executions', [
-            'database' => $database,
-            'backup' => $backup,
-            'executions' => $executions,
-            's3s' => currentTeam()->s3s,
-        ]);
-    }
-
-    public function backups()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        // No backups for redis
-        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
-            return redirect()->route('project.database.configuration', [
-                'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
-                'database_uuid' => $database->uuid,
-            ]);
-        }
-        return view('project.database.backups.all', [
-            'database' => $database,
-            's3s' => currentTeam()->s3s,
-        ]);
-    }
-}

app/Jobs/ApplicationDeploymentJob.php

@@ -30,6 +30,7 @@ use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Throwable;
 use Visus\Cuid2\Cuid2;
+use Yosymfony\Toml\Toml;
 
 class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -71,8 +72,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private bool $is_debug_enabled;
     private $build_args;
     private $env_args;
+    private $env_nixpacks_args;
     private $docker_compose;
     private $docker_compose_base64;
+    private ?string $nixpacks_plan = null;
+    private ?string $nixpacks_type = null;
     private string $dockerfile_location = '/Dockerfile';
     private string $docker_compose_location = '/docker-compose.yml';
     private ?string $docker_compose_custom_start_command = null;
@@ -170,7 +174,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     if ($containerName === 'coolify-proxy') {
                         continue;
                     }
-                    if (preg_match('/-(\d{12})/',$containerName)) {
+                    if (preg_match('/-(\d{12})/', $containerName)) {
                         continue;
                     }
                     $containerIp = data_get($container, 'IPv4Address');
@@ -199,7 +203,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     dispatch(new ContainerStatusJob($this->server));
                 }
                 $this->next(ApplicationDeploymentStatus::FINISHED->value);
-                $this->application->isConfigurationChanged(true);
+                $this->application->isConfigurationChanged(false);
                 return;
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -347,6 +351,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_image_names();
         $this->check_image_locally_or_remotely();
         if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
+            $this->execute_remote_command([
+                "echo 'Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.'",
+            ]);
             $this->create_workdir();
             $this->generate_compose_file();
             $this->rolling_update();
@@ -579,7 +586,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_nixpacks_confs();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
+        // $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
         $this->rolling_update();
     }
@@ -601,6 +608,24 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->rolling_update();
     }
 
+    private function framework_based_notification()
+    {
+        // Laravel old env variables
+        if ($this->pull_request_id === 0) {
+            $nixpacks_php_fallback_path = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
+            $nixpacks_php_root_dir = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
+        } else {
+            $nixpacks_php_fallback_path = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
+            $nixpacks_php_root_dir = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
+        }
+        if ($nixpacks_php_fallback_path?->value === '/index.php' && $nixpacks_php_root_dir?->value === '/app/public' && $this->newVersionIsHealthy === false) {
+            $this->execute_remote_command(
+                [
+                    "echo 'There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements'", 'type' => 'err'
+                ],
+            );
+        }
+    }
     private function rolling_update()
     {
         if ($this->server->isSwarm()) {
@@ -637,6 +662,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->application_deployment_queue->addLogEntry("Rolling update completed.");
             }
         }
+        $this->framework_based_notification();
     }
     private function health_check()
     {
@@ -667,7 +693,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         [
                             "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
                             "hidden" => true,
-                            "save" => "health_check"
+                            "save" => "health_check",
+                            "append" => false
                         ],
 
                     );
@@ -676,7 +703,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                             "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
                         ],
                     );
-                    if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
+                    if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
                         $this->execute_remote_command(
@@ -686,6 +713,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         );
                         break;
                     }
+                    if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
+                        $this->newVersionIsHealthy = false;
+                        break;
+                    }
                     $counter++;
                     sleep($this->application->health_check_interval);
                 }
@@ -707,13 +738,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->generate_nixpacks_confs();
         }
         $this->generate_compose_file();
+
         // Needs separate preview variables
         $this->generate_build_env_variables();
+        if ($this->application->build_pack !== 'nixpacks') {
             $this->add_build_env_variables_to_dockerfile();
+        }
         $this->build_image();
         $this->stop_running_container();
         if ($this->application->destination->server->isSwarm()) {
-            ray("{$this->workdir}{$this->docker_compose_location}");
             $this->push_to_docker_registry();
             $this->execute_remote_command(
                 [
@@ -825,7 +858,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ],
             );
         }
-
         if ($this->saved_outputs->get('git_commit_sha')) {
             $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
         }
@@ -870,20 +902,29 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [
                 "echo -n 'Generating nixpacks configuration with: $nixpacks_command'",
             ],
-            [executeInDocker($this->deployment_uuid, $nixpacks_command)],
-            [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
-            [executeInDocker($this->deployment_uuid, "rm -f {$this->workdir}/.nixpacks/Dockerfile")]
+            [executeInDocker($this->deployment_uuid, $nixpacks_command), "save" => "nixpacks_plan", "hidden" => true],
+            [executeInDocker($this->deployment_uuid, "nixpacks detect {$this->workdir}"), "save" => "nixpacks_type", "hidden" => true],
         );
+        if ($this->saved_outputs->get('nixpacks_type')) {
+            $this->nixpacks_type = $this->saved_outputs->get('nixpacks_type');
+        }
+        if ($this->saved_outputs->get('nixpacks_plan')) {
+            $this->nixpacks_plan = $this->saved_outputs->get('nixpacks_plan');
+            if ($this->nixpacks_plan) {
+                $parsed = Toml::Parse($this->nixpacks_plan);
+                // Do any modifications here
+                $this->generate_env_variables();
+                $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
+                data_set($parsed, 'variables', $merged_envs->toArray());
+                $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
+            }
+        }
     }
 
     private function nixpacks_build_cmd()
     {
-        $this->generate_env_variables();
-        // $cacheKey = $this->application->uuid;
-        // if ($this->pull_request_id !== 0) {
-            // $cacheKey = "{$this->application->uuid}-pr-{$this->pull_request_id}";
-        // }
-        $nixpacks_command = "nixpacks build {$this->env_args} --no-error-without-start";
+        $this->generate_nixpacks_env_variables();
+        $nixpacks_command = "nixpacks plan -f toml {$this->env_nixpacks_args}";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -893,24 +934,36 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->install_command) {
             $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
         }
-        $nixpacks_command .= " -o {$this->workdir} {$this->workdir}";
+        $nixpacks_command .= " {$this->workdir}";
         return $nixpacks_command;
     }
+    private function generate_nixpacks_env_variables()
+    {
+        $this->env_nixpacks_args = collect([]);
+        if ($this->pull_request_id === 0) {
+            foreach ($this->application->nixpacks_environment_variables as $env) {
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+            }
+        } else {
+            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+            }
+        }
 
+        $this->env_nixpacks_args = $this->env_nixpacks_args->implode(' ');
+    }
     private function generate_env_variables()
     {
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
-            foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_args->push("--env {$env->key}={$env->value}");
+            foreach ($this->application->build_environment_variables as $env) {
+                $this->env_args->put($env->key, $env->value);
             }
         } else {
-            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_args->push("--env {$env->key}={$env->value}");
+            foreach ($this->application->build_environment_variables_preview as $env) {
+                $this->env_args->put($env->key, $env->value);
             }
         }
-
-        $this->env_args = $this->env_args->implode(' ');
     }
 
     private function generate_compose_file()
@@ -963,7 +1016,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
                     'cpus' => (float) $this->application->limits_cpus,
-                    'cpuset' => $this->application->limits_cpuset,
                     'cpu_shares' => $this->application->limits_cpu_shares,
                 ]
             ],
@@ -975,6 +1027,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if (!is_null($this->application->limits_cpuset)) {
+            data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
+        }
         if ($this->server->isSwarm()) {
             data_forget($docker_compose, 'services.' . $this->container_name . '.container_name');
             data_forget($docker_compose, 'services.' . $this->container_name . '.expose');
@@ -1231,22 +1286,35 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             }");
             } else {
                 if ($this->application->build_pack === 'nixpacks') {
-                    $this->execute_remote_command(
-                        [
-                            executeInDocker($this->deployment_uuid, "cp {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
-                        ],
-                    );
-                }
+                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d > /artifacts/thegameplan.json"), "hidden" => true]);
                     if ($this->force_rebuild) {
                         $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "docker build --no-cache $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), "hidden" => true
                         ]);
                     } else {
                         $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), "hidden" => true
                         ]);
                     }
-                // }
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "rm /artifacts/thegameplan.json"), "hidden" => true]);
+                } else {
+                    if ($this->force_rebuild) {
+                        $build_command = "docker build --no-cache {$this->buildTarget} --network {$this->destination->network} -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    } else {
+                        $build_command =  "docker build {$this->buildTarget} --network {$this->destination->network} -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    }
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                        ]
+                    );
+                }
 
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
@@ -1271,6 +1339,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }");
             }
+            $build_command = "docker build {$this->addHosts} --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+            $base64_build_command = base64_encode($build_command);
             $this->execute_remote_command(
                 [
                     executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile")
@@ -1279,33 +1349,56 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
                 ]
             );
         } else {
             // Pure Dockerfile based deployment
             if ($this->application->dockerfile) {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-                ]);
-            } else {
-                if ($this->application->build_pack === 'nixpacks') {
+                $build_command = "docker build --pull {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                $base64_build_command = base64_encode($build_command);
                 $this->execute_remote_command(
                     [
-                            executeInDocker($this->deployment_uuid, "cp {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
                     ],
+                    [
+                        executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                    ]
                 );
-                }
-
+            } else {
+                if ($this->application->build_pack === 'nixpacks') {
+                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d > /artifacts/thegameplan.json"), "hidden" => true]);
                     if ($this->force_rebuild) {
                         $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "docker build --no-cache $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), "hidden" => true
                         ]);
                     } else {
                         $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), "hidden" => true
                         ]);
                     }
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "rm /artifacts/thegameplan.json"), "hidden" => true]);
+                } else {
+                    if ($this->force_rebuild) {
+                        $build_command = "docker build --no-cache {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    } else {
+                        $build_command = "docker build {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    }
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                        ]
+                    );
+                }
             }
         }
         $this->execute_remote_command([
@@ -1384,11 +1477,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $this->build_args = collect(["--build-arg SOURCE_COMMIT=\"{$this->commit}\""]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
+                $value = escapeshellarg($env->value);
+                $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
+                $value = escapeshellarg($env->value);
+                $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         }
 

app/Jobs/ContainerStatusJob.php

@@ -162,6 +162,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                             // 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) {
@@ -212,7 +216,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
-                $containerName = $name ? "$name ($fqdn)" : $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');

app/Jobs/DockerCleanupJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -43,9 +44,7 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
             ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
                 ray('Cleaning up ' . $this->server->name);
-                instant_remote_process(['docker image prune -af'], $this->server, false);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server, false);
-                instant_remote_process(['docker builder prune -af'], $this->server, false);
+                CleanupDocker::run($this->server);
                 $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
                     ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);

app/Jobs/ScheduledTaskJob.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledTask;
+use App\Models\ScheduledTaskExecution;
+use App\Models\Server;
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\Team;
+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
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public ?Team $team = null;
+    public Server $server;
+    public ScheduledTask $task;
+    public Application|Service $resource;
+
+    public ?ScheduledTaskExecution $task_log = null;
+    public string $task_status = 'failed';
+    public ?string $task_output = null;
+    public array $containers = [];
+
+    public function __construct($task)
+    {
+        $this->task = $task;
+        if ($service = $task->service()->first()) {
+            $this->resource = $service;
+        } else if ($application = $task->application()->first()) {
+            $this->resource = $application;
+        }
+        $this->team = Team::find($task->team_id);
+    }
+
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->task->id)];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->task->id;
+    }
+
+    public function handle(): void
+    {
+        try {
+            $this->task_log = ScheduledTaskExecution::create([
+                'scheduled_task_id' => $this->task->id,
+            ]);
+
+            $this->server = $this->resource->destination->server;
+
+            if ($this->resource->type() == 'application') {
+                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+                if ($containers->count() > 0) {
+                    $containers->each(function ($container) {
+                        $this->containers[] = str_replace('/', '', $container['Names']);
+                    });
+                }
+            }
+            elseif ($this->resource->type() == 'service') {
+                $this->resource->applications()->get()->each(function ($application) {
+                    if (str(data_get($application, 'status'))->contains('running')) {
+                        $this->containers[] = data_get($application, 'name') . '-' . data_get($this->resource, 'uuid');
+                    }
+                });
+            }
+
+            if (count($this->containers) == 0) {
+                throw new \Exception('ScheduledTaskJob failed: No containers running.');
+            }
+
+            if (count($this->containers) > 1 && empty($this->task->container)) {
+                throw new \Exception('ScheduledTaskJob failed: More than one container exists but no container name was provided.');
+            }
+
+            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)  . '"';
+                    $exec = "docker exec {$containerName} {$cmd}";
+                    $this->task_output = instant_remote_process([$exec], $this->server, true);
+                    $this->task_log->update([
+                        'status' => 'success',
+                        'message' => $this->task_output,
+                    ]);
+                    return;
+                }
+            }
+
+            // No valid container was found.
+            throw new \Exception('ScheduledTaskJob failed: No valid container was found. Is the container name correct?');
+
+        } catch (\Throwable $e) {
+            if ($this->task_log) {
+                $this->task_log->update([
+                    'status' => 'failed',
+                    'message' => $this->task_output ?? $e->getMessage(),
+                ]);
+            }
+            // send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Livewire/Boarding/Index.php

@@ -274,7 +274,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->skipBoarding();
         return redirect()->route(
-            'project.resources.new',
+            'project.resource.create',
             [
                 'project_uuid' => $this->createdProject->uuid,
                 'environment_name' => 'production',

app/Livewire/CommandCenter/Index.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\CommandCenter;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $servers = [];
+    public function mount() {
+        $this->servers = Server::isReachable()->get();
+    }
+    public function render()
+    {
+        return view('livewire.command-center.index');
+    }
+}

app/Livewire/ForcePasswordReset.php

@@ -22,6 +22,10 @@ class ForcePasswordReset extends Component
     {
         $this->email = auth()->user()->email;
     }
+    public function render()
+    {
+        return view('livewire.force-password-reset')->layout('layouts.simple');
+    }
     public function submit()
     {
         try {

app/Livewire/Profile/Index.php

@@ -5,21 +5,19 @@ namespace App\Livewire\Profile;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
-class Form extends Component
+class Index extends Component
 {
     public int $userId;
     public string $email;
 
     #[Validate('required')]
     public string $name;
-
     public function mount()
     {
         $this->userId = auth()->user()->id;
         $this->name = auth()->user()->name;
         $this->email = auth()->user()->email;
     }
-
     public function submit()
 
     {
@@ -34,4 +32,8 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
+    public function render()
+    {
+        return view('livewire.profile.index');
+    }
 }

app/Livewire/Project/AddEnvironment.php

@@ -27,7 +27,7 @@ class AddEnvironment extends Component
                 'project_id' => $this->project->id,
             ]);
 
-            return redirect()->route('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
             ]);

app/Livewire/Project/Application/Configuration.php

@@ -4,13 +4,14 @@ namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
 use App\Models\Server;
-use App\Models\StandaloneDocker;
 use Livewire\Component;
 
 class Configuration extends Component
 {
     public Application $application;
     public $servers;
+    protected $listeners = ['build_pack_updated' => '$refresh'];
+
     public function mount()
     {
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();

app/Livewire/Project/Application/Deployment/Index.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Livewire\Project\Application;
+namespace App\Livewire\Project\Application\Deployment;
 
 use App\Models\Application;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 
-class Deployments extends Component
+class Index extends Component
 {
     public Application $application;
-    public Array|Collection $deployments = [];
+    public array|Collection $deployments = [];
     public int $deployments_count = 0;
     public string $current_url;
     public int $skip = 0;
@@ -19,11 +19,28 @@ class Deployments extends Component
     protected $queryString = ['pull_request_id'];
     public function mount()
     {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('dashboard');
+        }
+        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
+        $this->application = $application;
+        $this->deployments = $deployments;
+        $this->deployments_count = $count;
         $this->current_url = url()->current();
         $this->show_pull_request_only();
         $this->show_more();
     }
-    private function show_pull_request_only() {
+    private function show_pull_request_only()
+    {
         if ($this->pull_request_id) {
             $this->deployments = $this->deployments->where('pull_request_id', $this->pull_request_id);
         }
@@ -57,4 +74,8 @@ class Deployments extends Component
         $this->show_pull_request_only();
         $this->show_more();
     }
+    public function render()
+    {
+        return view('livewire.project.application.deployment.index');
+    }
 }

app/Livewire/Project/Application/Deployment/Show.php

@@ -1,35 +1,20 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Livewire\Project\Application\Deployment;
 
+use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
+use Livewire\Component;
 
-class ApplicationController extends Controller
+class Show extends Component
 {
-    use AuthorizesRequests, ValidatesRequests;
+    public Application $application;
+    public ApplicationDeploymentQueue $application_deployment_queue;
+    public string $deployment_uuid;
+    public $isKeepAliveOn = true;
+    protected $listeners = ['refreshQueue'];
 
-    public function deployments()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
-        return view('project.application.deployments', ['application' => $application, 'deployments' => $deployments, 'deployments_count' => $count]);
-    }
-
-    public function deployment()
-    {
+    public function mount() {
         $deploymentUuid = request()->route('deployment_uuid');
 
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -46,7 +31,7 @@ class ApplicationController extends Controller
         }
         // $activity = Activity::where('properties->type_uuid', '=', $deploymentUuid)->first();
         // if (!$activity) {
-        //     return redirect()->route('project.application.deployments', [
+        //     return redirect()->route('project.application.deployment.index', [
         //         'project_uuid' => $project->uuid,
         //         'environment_name' => $environment->name,
         //         'application_uuid' => $application->uuid,
@@ -54,17 +39,32 @@ class ApplicationController extends Controller
         // }
         $application_deployment_queue = ApplicationDeploymentQueue::where('deployment_uuid', $deploymentUuid)->first();
         if (!$application_deployment_queue) {
-            return redirect()->route('project.application.deployments', [
+            return redirect()->route('project.application.deployment.index', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
         }
-        return view('project.application.deployment', [
-            'application' => $application,
-            // 'activity' => $activity,
-            'application_deployment_queue' => $application_deployment_queue,
-            'deployment_uuid' => $deploymentUuid,
-        ]);
+        $this->application = $application;
+        $this->application_deployment_queue = $application_deployment_queue;
+        $this->deployment_uuid = $deploymentUuid;
+    }
+
+    public function refreshQueue()
+    {
+        $this->application_deployment_queue->refresh();
+    }
+
+    public function polling()
+    {
+        $this->dispatch('deploymentFinished');
+        $this->application_deployment_queue->refresh();
+        if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
+            $this->isKeepAliveOn = false;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.application.deployment.show');
     }
 }

app/Livewire/Project/Application/DeploymentLogs.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Application;
-
-use App\Models\ApplicationDeploymentQueue;
-use Livewire\Component;
-
-class DeploymentLogs extends Component
-{
-    public ApplicationDeploymentQueue $application_deployment_queue;
-    public $isKeepAliveOn = true;
-    protected $listeners = ['refreshQueue'];
-
-    public function refreshQueue()
-    {
-        $this->application_deployment_queue->refresh();
-    }
-
-    public function polling()
-    {
-        $this->dispatch('deploymentFinished');
-        $this->application_deployment_queue->refresh();
-        if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
-            $this->isKeepAliveOn = false;
-        }
-    }
-}

app/Livewire/Project/Application/General.php

@@ -165,12 +165,20 @@ class General extends Component
         if ($this->application->build_pack !== 'nixpacks') {
             $this->application->settings->is_static = false;
             $this->application->settings->save();
+        } else {
+            $this->application->ports_exposes = $this->ports_exposes = 3000;
+            $this->resetDefaultLabels(false);
         }
         if ($this->application->build_pack === 'dockercompose') {
             $this->application->fqdn = null;
             $this->application->settings->save();
         }
+        if ($this->application->build_pack === 'static') {
+            $this->application->ports_exposes = $this->ports_exposes = 80;
+            $this->resetDefaultLabels(false);
+        }
         $this->submit();
+        $this->dispatch('build_pack_updated');
     }
     public function checkLabelUpdates()
     {
@@ -201,7 +209,7 @@ class General extends Component
     public function updatedApplicationFqdn()
     {
         $this->resetDefaultLabels(false);
-        $this->dispatch('success', 'Labels reseted to default!');
+        // $this->dispatch('success', 'Labels reset to default!');
     }
     public function submit($showToaster = true)
     {
@@ -227,9 +235,16 @@ class General extends Component
                 ]);
             }
             if (data_get($this->application, 'fqdn')) {
-                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return Str::of($domain)->trim()->lower();
+                $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+                $domains = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                    return str($domain)->trim()->lower();
                 });
+                $domains = $domains->unique();
+                foreach ($domains as $domain) {
+                    if (!validate_dns_entry($domain, $this->application->destination->server)) {
+                        $showToaster && $this->dispatch('error', "Validating DNS settings for: $domain failed.<br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                    }
+                }
                 $this->application->fqdn = $domains->implode(',');
             }
 

app/Livewire/Project/Application/Heading.php

@@ -39,7 +39,7 @@ class Heading extends Component
         } else {
             dispatch(new ServerStatusJob($this->application->destination->server));
         }
-        if ($showNotification) $this->dispatch('success', 'Application status updated.');
+        if ($showNotification) $this->dispatch('success', "Application status updated.");
     }
 
     public function force_deploy_without_cache()
@@ -60,7 +60,7 @@ class Heading extends Component
             force_rebuild: false,
             is_new_deployment: true,
         );
-        return redirect()->route('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,
@@ -83,7 +83,7 @@ class Heading extends Component
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: $force_rebuild,
         );
-        return redirect()->route('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,
@@ -113,7 +113,7 @@ class Heading extends Component
             restart_only: true,
             is_new_deployment: true,
         );
-        return redirect()->route('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,
@@ -128,7 +128,7 @@ class Heading extends Component
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
         );
-        return redirect()->route('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,

app/Livewire/Project/Application/Previews.php

@@ -52,7 +52,7 @@ class Previews extends Component
                 force_rebuild: true,
                 pull_request_id: $pull_request_id,
             );
-            return redirect()->route('project.application.deployment', [
+            return redirect()->route('project.application.deployment.show', [
                 'project_uuid' => $this->parameters['project_uuid'],
                 'application_uuid' => $this->parameters['application_uuid'],
                 'deployment_uuid' => $this->deployment_uuid,

app/Livewire/Project/Application/Rollback.php

@@ -29,7 +29,7 @@ class Rollback extends Component
             commit: $commit,
             force_rebuild: false,
         );
-        return redirect()->route('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $deployment_uuid,

app/Livewire/Project/CloneMe.php

@@ -8,7 +8,7 @@ use App\Models\Server;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
-class CloneProject extends Component
+class CloneMe extends Component
 {
     public string $project_uuid;
     public string $environment_name;
@@ -41,7 +41,7 @@ class CloneProject extends Component
 
     public function render()
     {
-        return view('livewire.project.clone-project');
+        return view('livewire.project.clone-me');
     }
 
     public function selectServer($server_id, $destination_id)
@@ -152,7 +152,7 @@ class CloneProject extends Component
                 }
                 $newService->parse();
             }
-            return redirect()->route('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $newProject->uuid,
                 'environment_name' => $newEnvironment->name,
             ]);

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Livewire\Project\Database\Backup;
+
+use Livewire\Component;
+
+class Execution extends Component
+{
+    public $database;
+    public $backup;
+    public $executions;
+    public $s3s;
+    public function mount() {
+        $backup_uuid = request()->route('backup_uuid');
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        $backup = $database->scheduledBackups->where('uuid', $backup_uuid)->first();
+        if (!$backup) {
+            return redirect()->route('dashboard');
+        }
+        $executions = collect($backup->executions)->sortByDesc('created_at');
+        $this->database = $database;
+        $this->backup = $backup;
+        $this->executions = $executions;
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.backup.execution');
+    }
+}

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Livewire\Project\Database\Backup;
+
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $database;
+    public $s3s;
+    public function mount() {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        // No backups for redis
+        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+            return redirect()->route('project.database.configuration', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'database_uuid' => $database->uuid,
+            ]);
+        }
+        $this->database = $database;
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.backup.index');
+    }
+}

app/Livewire/Project/Database/BackupEdit.php

@@ -52,7 +52,7 @@ class BackupEdit extends Component
             $url = $url->getPath() .  "#{$url->getFragment()}";
             return redirect($url);
         } else {
-            return redirect()->route('project.database.backups.all', $this->parameters);
+            return redirect()->route('project.database.backup.index', $this->parameters);
         }
 
     }

app/Livewire/Project/Database/Configuration.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class Configuration extends Component
+{
+    public $database;
+    public function mount() {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        $this->database = $database;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.configuration');
+    }
+}

app/Livewire/Project/Database/Import.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Livewire\Project\Database;
+
+use Exception;
+use Livewire\Component;
+use Livewire\WithFileUploads;
+use App\Models\Server;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
+
+class Import extends Component
+{
+    use WithFileUploads;
+
+    public $file;
+    public $resource;
+    public $parameters;
+    public $containers;
+    public bool $validated = true;
+    public bool $scpInProgress = false;
+    public bool $importRunning = false;
+    public string $validationMsg = '';
+    public Server $server;
+    public string $container;
+    public array $importCommands = [];
+    public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
+    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p $MYSQL_PASSWORD $MYSQL_DATABASE';
+    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p $MARIADB_PASSWORD $MARIADB_DATABASE';
+
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+        return [
+            "echo-private:user.{$userId},DatabaseStatusChanged" => '$refresh',
+        ];
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->getContainers();
+    }
+
+    public function getContainers()
+    {
+        $this->containers = collect();
+        if (!data_get($this->parameters, 'database_uuid')) {
+            abort(404);
+        }
+
+        $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
+        if (is_null($resource)) {
+            $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+            if (is_null($resource)) {
+                $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                if (is_null($resource)) {
+                    $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                    if (is_null($resource)) {
+                        $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                        if (is_null($resource)) {
+                            abort(404);
+                        }
+                    }
+                }
+            }
+        }
+        $this->resource = $resource;
+        $this->server = $this->resource->destination->server;
+        $this->container = $this->resource->uuid;
+        if (str(data_get($this, 'resource.status'))->startsWith('running')) {
+            $this->containers->push($this->container);
+        }
+
+        if ($this->containers->count() > 1) {
+            $this->validated = false;
+            $this->validationMsg = 'The database service has more than one container running. Cannot import.';
+        }
+
+        if (
+            $this->resource->getMorphClass() == 'App\Models\StandaloneRedis'
+            || $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
+        ) {
+            $this->validated = false;
+            $this->validationMsg = 'This database type is not currently supported.';
+        }
+    }
+
+    public function runImport()
+    {
+        $this->validate([
+            'file' => 'required|file|max:102400'
+        ]);
+
+        $this->importRunning = true;
+        $this->scpInProgress = true;
+
+        try {
+            $uploadedFilename = $this->file->store('backup-import');
+            $path = Storage::path($uploadedFilename);
+            $tmpPath = '/tmp/' . basename($uploadedFilename);
+
+            // SCP the backup file to the server.
+            instant_scp($path, $tmpPath, $this->server);
+            $this->scpInProgress = false;
+
+            $this->importCommands[] = "docker cp {$tmpPath} {$this->container}:{$tmpPath}";
+
+            switch ($this->resource->getMorphClass()) {
+                case 'App\Models\StandaloneMariadb':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mariadbRestoreCommand} < {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+                case 'App\Models\StandaloneMysql':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mysqlRestoreCommand} < {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+                case 'App\Models\StandalonePostgresql':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+            }
+
+            $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'";
+            $this->importCommands[] = "docker exec {$this->container} sh -c 'echo \"Import finished with exit code $?\"'";
+
+            if (!empty($this->importCommands)) {
+                $activity = remote_process($this->importCommands, $this->server, ignore_errors: true);
+                $this->dispatch('newMonitorActivity', $activity->id);
+            }
+        } catch (\Throwable $e) {
+            $this->validated = false;
+            $this->validationMsg = $e->getMessage();
+        }
+    }
+}

app/Livewire/Project/DeleteProject.php

@@ -25,6 +25,6 @@ class DeleteProject extends Component
             return $this->dispatch('error', 'Project has resources defined, please delete them first.');
         }
         $project->delete();
-        return redirect()->route('projects');
+        return redirect()->route('project.index');
     }
 }

app/Livewire/Project/Edit.php

@@ -12,6 +12,15 @@ class Edit extends Component
         'project.name' => 'required|min:3|max:255',
         'project.description' => 'nullable|string|max:255',
     ];
+    public function mount() {
+        $projectUuid = request()->route('project_uuid');
+        $teamId = currentTeam()->id;
+        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $this->project = $project;
+    }
 
     public function submit()
     {

app/Livewire/Project/Index.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Project;
+use App\Models\Server;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $projects;
+    public $servers;
+    public function mount() {
+        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->servers = Server::ownedByCurrentTeam()->count();
+    }
+    public function render()
+    {
+        return view('livewire.project.index');
+    }
+}

app/Livewire/Project/New/Select.php

@@ -55,7 +55,7 @@ class Select extends Component
 
     public function updatedSelectedEnvironment()
     {
-        return redirect()->route('project.resources.new', [
+        return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
             'environment_name' => $this->selectedEnvironment,
         ]);
@@ -157,7 +157,7 @@ class Select extends Component
     public function setDestination(string $destination_uuid)
     {
         $this->destination_uuid = $destination_uuid;
-        return redirect()->route('project.resources.new', [
+        return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
             'environment_name' => $this->parameters['environment_name'],
             'type' => $this->type,

app/Livewire/Project/Resource/Create.php

@@ -1,52 +1,18 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Livewire\Project\Resource;
 
 use App\Models\EnvironmentVariable;
-use App\Models\Project;
-use App\Models\Server;
 use App\Models\Service;
 use App\Models\StandaloneDocker;
-use Illuminate\Support\Str;
+use Livewire\Component;
 
-class ProjectController extends Controller
+class Create extends Component
 {
-    public function all()
-    {
-        return view('projects', [
-            'projects' => Project::ownedByCurrentTeam()->get(),
-            'servers' => Server::ownedByCurrentTeam()->count(),
-        ]);
-    }
-
-    public function edit()
-    {
-        $projectUuid = request()->route('project_uuid');
-        $teamId = currentTeam()->id;
-        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.edit', ['project' => $project]);
-    }
-
-    public function show()
-    {
-        $projectUuid = request()->route('project_uuid');
-        $teamId = currentTeam()->id;
-
-        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $project->load(['environments']);
-        return view('project.show', ['project' => $project]);
-    }
-
-    public function new()
-    {
+    public $type;
+    public function mount() {
         $services = getServiceTemplates();
-        $type = Str::of(request()->query('type'));
+        $type = str(request()->query('type'));
         $destination_uuid = request()->query('destination');
         $server_id = request()->query('server_id');
 
@@ -81,14 +47,14 @@ class ProjectController extends Controller
             $oneClickService = data_get($services, "$oneClickServiceName.compose");
             $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
             if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                $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 = Service::create([
-                    'name' => "$oneClickServiceName-" . Str::random(10),
+                    'name' => "$oneClickServiceName-" . str()->random(10),
                     'docker_compose_raw' => base64_decode($oneClickService),
                     'environment_id' => $environment->id,
                     'server_id' => (int) $server_id,
@@ -99,8 +65,8 @@ class ProjectController extends Controller
                 $service->save();
                 if ($oneClickDotEnvs?->count() > 0) {
                     $oneClickDotEnvs->each(function ($value) use ($service) {
-                        $key = Str::before($value, '=');
-                        $value = Str::of(Str::after($value, '='));
+                        $key = str()->before($value, '=');
+                        $value = str(str()->after($value, '='));
                         $generatedValue = $value;
                         if ($value->contains('SERVICE_')) {
                             $command = $value->after('SERVICE_')->beforeLast('_');
@@ -123,24 +89,10 @@ class ProjectController extends Controller
                 ]);
             }
         }
-        return view('project.new', [
-            'type' => $type->value()
-        ]);
+        $this->type = $type->value();
     }
-
-    public function resources()
+    public function render()
     {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.resources', [
-            'project' => $project,
-            'environment' => $environment
-        ]);
+        return view('livewire.project.resource.create');
     }
 }

app/Livewire/Project/Resource/Index.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Livewire\Project\Resource;
+
+use App\Models\Environment;
+use App\Models\Project;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public Project $project;
+    public Environment $environment;
+    public $applications = [];
+    public $postgresqls = [];
+    public $redis = [];
+    public $mongodbs = [];
+    public $mysqls = [];
+    public $mariadbs = [];
+    public $services = [];
+    public function mount()
+    {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $this->project = $project;
+        $this->environment = $environment;
+        $this->applications = $environment->applications->sortBy('name');
+        $this->applications = $this->applications->map(function ($application) {
+            if (data_get($application, 'environment.project.uuid')) {
+                $application->hrefLink = route('project.application.configuration', [
+                    'project_uuid' => data_get($application, 'environment.project.uuid'),
+                    'environment_name' => data_get($application, 'environment.name'),
+                    'application_uuid' => data_get($application, 'uuid')
+                ]);
+            }
+            return $application;
+        });
+        $this->postgresqls = $environment->postgresqls->sortBy('name');
+        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+            if (data_get($postgresql, 'environment.project.uuid')) {
+                $postgresql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
+                    'environment_name' => data_get($postgresql, 'environment.name'),
+                    'database_uuid' => data_get($postgresql, 'uuid')
+                ]);
+            }
+            return $postgresql;
+        });
+        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $this->redis->map(function ($redis) {
+            if (data_get($redis, 'environment.project.uuid')) {
+                $redis->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($redis, 'environment.project.uuid'),
+                    'environment_name' => data_get($redis, 'environment.name'),
+                    'database_uuid' => data_get($redis, 'uuid')
+                ]);
+            }
+            return $redis;
+        });
+        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
+            if (data_get($mongodb, 'environment.project.uuid')) {
+                $mongodb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mongodb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mongodb, 'environment.name'),
+                    'database_uuid' => data_get($mongodb, 'uuid')
+                ]);
+            }
+            return $mongodb;
+        });
+        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $this->mysqls->map(function ($mysql) {
+            if (data_get($mysql, 'environment.project.uuid')) {
+                $mysql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mysql, 'environment.project.uuid'),
+                    'environment_name' => data_get($mysql, 'environment.name'),
+                    'database_uuid' => data_get($mysql, 'uuid')
+                ]);
+            }
+            return $mysql;
+        });
+        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
+            if (data_get($mariadb, 'environment.project.uuid')) {
+                $mariadb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mariadb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mariadb, 'environment.name'),
+                    'database_uuid' => data_get($mariadb, 'uuid')
+                ]);
+            }
+            return $mariadb;
+        });
+        $this->services = $environment->services->sortBy('name');
+        $this->services = $this->services->map(function ($service) {
+            if (data_get($service, 'environment.project.uuid')) {
+                $service->hrefLink = route('project.service.configuration', [
+                    'project_uuid' => data_get($service, 'environment.project.uuid'),
+                    'environment_name' => data_get($service, 'environment.name'),
+                    'service_uuid' => data_get($service, 'uuid')
+                ]);
+                $service->status = serviceStatus($service);
+            }
+            return $service;
+        });
+    }
+    public function render()
+    {
+        return view('livewire.project.resource.index');
+    }
+}

app/Livewire/Project/Service/Configuration.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Livewire\Project\Service;
+
+use App\Jobs\ContainerStatusJob;
+use App\Models\Service;
+use Livewire\Component;
+
+class Configuration extends Component
+{
+    public Service $service;
+    public $applications;
+    public $databases;
+    public array $parameters;
+    public array $query;
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+        return [
+            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
+            "refreshStacks",
+            "checkStatus",
+        ];
+    }
+    public function render()
+    {
+        return view('livewire.project.service.configuration');
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->applications = $this->service->applications->sort();
+        $this->databases = $this->service->databases->sort();
+    }
+    public function checkStatus()
+    {
+        dispatch_sync(new ContainerStatusJob($this->service->server));
+        $this->refreshStacks();
+        $this->dispatch('serviceStatusChanged');
+    }
+    public function refreshStacks()
+    {
+        $this->applications = $this->service->applications->sort();
+        $this->applications->each(function ($application) {
+            $application->refresh();
+        });
+        $this->databases = $this->service->databases->sort();
+        $this->databases->each(function ($database) {
+            $database->refresh();
+        });
+    }
+}

app/Livewire/Project/Service/Index.php

@@ -2,53 +2,51 @@
 
 namespace App\Livewire\Project\Service;
 
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Index extends Component
 {
     public Service $service;
-    public $applications;
-    public $databases;
+    public ?ServiceApplication $serviceApplication = null;
+    public ?ServiceDatabase $serviceDatabase = null;
     public array $parameters;
     public array $query;
-    public function getListeners()
+    public Collection $services;
+    public $s3s;
+
+    protected $listeners = ['generateDockerCompose'];
+
+    public function mount()
     {
-        $userId = auth()->user()->id;
-        return [
-            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
-            "refreshStacks",
-            "checkStatus",
-        ];
+        try {
+            $this->services = collect([]);
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            if ($service) {
+                $this->serviceApplication = $service;
+                $this->serviceApplication->getFilesFromServer();
+            } else {
+                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase->getFilesFromServer();
+            }
+            $this->s3s = currentTeam()->s3s;
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+
+    }
+    public function generateDockerCompose()
+    {
+        $this->service->parse();
     }
     public function render()
     {
         return view('livewire.project.service.index');
     }
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $this->applications = $this->service->applications->sort();
-        $this->databases = $this->service->databases->sort();
-    }
-    public function checkStatus()
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->refreshStacks();
-        $this->dispatch('serviceStatusChanged');
-    }
-    public function refreshStacks()
-    {
-        $this->applications = $this->service->applications->sort();
-        $this->applications->each(function ($application) {
-            $application->refresh();
-        });
-        $this->databases = $this->service->databases->sort();
-        $this->databases->each(function ($database) {
-            $database->refresh();
-        });
-    }
 }

app/Livewire/Project/Service/Show.php

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

app/Livewire/Project/Shared/Danger.php

@@ -25,7 +25,7 @@ class Danger extends Component
     {
         try {
             DeleteResourceJob::dispatchSync($this->resource);
-            return redirect()->route('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
                 'environment_name' => $this->environmentName
             ]);

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -10,7 +10,6 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
-use Illuminate\Support\Sleep;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
@@ -109,8 +108,7 @@ class ExecuteContainerCommand extends Component
         $this->validate();
         try {
             // Wrap command to prevent escaped execution in the host.
-            $cmd = 'sh -c "' . str_replace('"', '\"', $this->command)  . '"';
-
+            $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
                 $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
             } else {

app/Livewire/Project/Shared/ResourceLimits.php

@@ -44,8 +44,8 @@ class ResourceLimits extends Component
             if (!$this->resource->limits_cpus) {
                 $this->resource->limits_cpus = "0";
             }
-            if (!$this->resource->limits_cpuset) {
-                $this->resource->limits_cpuset = "0";
+            if ($this->resource->limits_cpuset === "") {
+                $this->resource->limits_cpuset = null;
             }
             if (!$this->resource->limits_cpu_shares) {
                 $this->resource->limits_cpu_shares = 1024;

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

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use Livewire\Component;
+
+class Add extends Component
+{
+    public $parameters;
+    public string $name;
+    public string $command;
+    public string $frequency;
+    public ?string $container = '';
+
+    protected $listeners = ['clearScheduledTask' => 'clear'];
+    protected $rules = [
+        'name' => 'required|string',
+        'command' => 'required|string',
+        'frequency' => 'required|string',
+        'container' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'name' => 'name',
+        'command' => 'command',
+        'frequency' => 'frequency',
+        'container' => 'container',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        $isValid = validate_cron_expression($this->frequency);
+        if (!$isValid) {
+            $this->dispatch('error', 'Invalid Cron / Human expression.');
+            return;
+        }
+        $this->dispatch('saveScheduledTask', [
+            'name' => $this->name,
+            'command' => $this->command,
+            'frequency' => $this->frequency,
+            'container' => $this->container,
+        ]);
+        $this->clear();
+    }
+
+    public function clear()
+    {
+        $this->name = '';
+        $this->command = '';
+        $this->frequency = '';
+        $this->container = '';
+    }
+}

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

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use App\Models\ScheduledTask;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+use Illuminate\Support\Str;
+
+class All extends Component
+{
+    public $resource;
+    public string|null $modalId = null;
+    public ?string $variables = null;
+    public array $parameters;
+    protected $listeners = ['refreshTasks', 'saveScheduledTask' => 'submit'];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->modalId = new Cuid2(7);
+    }
+    public function refreshTasks()
+    {
+        $this->resource->refresh();
+    }
+
+    public function submit($data)
+    {
+        try {
+            $task = new ScheduledTask();
+            $task->name = $data['name'];
+            $task->command = $data['command'];
+            $task->frequency = $data['frequency'];
+            $task->container = $data['container'];
+            $task->team_id = currentTeam()->id;
+
+            switch ($this->resource->type()) {
+                case 'application':
+                    $task->application_id = $this->resource->id;
+                    break;
+                case 'standalone-postgresql':
+                    $task->standalone_postgresql_id = $this->resource->id;
+                    break;
+                case 'service':
+                    $task->service_id = $this->resource->id;
+                    break;
+            }
+            $task->save();
+            $this->refreshTasks();
+            $this->dispatch('success', 'Scheduled task added successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use Illuminate\Support\Facades\Storage;
+use Livewire\Component;
+
+class Executions extends Component
+{
+    public $executions = [];
+    public $selectedKey;
+    public function getListeners()
+    {
+        return [
+            "selectTask",
+        ];
+    }
+
+    public function selectTask($key): void
+    {
+        if ($key == $this->selectedKey) {
+            $this->selectedKey = null;
+            return;
+        }
+        $this->selectedKey = $key;
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use App\Models\ScheduledTask as ModelsScheduledTask;
+use Livewire\Component;
+use App\Models\Application;
+use App\Models\Service;
+use Visus\Cuid2\Cuid2;
+
+class Show extends Component
+{
+    public $parameters;
+    public Application|Service $resource;
+    public ModelsScheduledTask $task;
+    public ?string $modalId = null;
+    public string $type;
+
+    protected $rules = [
+        'task.name' => 'required|string',
+        'task.command' => 'required|string',
+        'task.frequency' => 'required|string',
+        'task.container' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'name' => 'name',
+        'command' => 'command',
+        'frequency' => 'frequency',
+        'container' => 'container',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+
+        if (data_get($this->parameters, 'application_uuid')) {
+            $this->type = 'application';
+            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+        } else if (data_get($this->parameters, 'service_uuid')) {
+            $this->type = 'service';
+            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+        }
+
+        $this->modalId = new Cuid2(7);
+        $this->task = ModelsScheduledTask::where('uuid', request()->route('task_uuid'))->first();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        $this->task->save();
+        $this->dispatch('success', 'Scheduled task updated successfully.');
+        $this->dispatch('refreshTasks');
+    }
+
+    public function delete()
+    {
+        try {
+            $this->task->delete();
+
+            if ($this->type == 'application') {
+                return redirect()->route('project.application.configuration', $this->parameters);
+            }
+            else {
+                return redirect()->route('project.service.configuration', $this->parameters);
+            }
+
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
+    }
+}

app/Livewire/Project/Show.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Project;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Project $project;
+    public function mount() {
+        $projectUuid = request()->route('project_uuid');
+        $teamId = currentTeam()->id;
+
+        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $project->load(['environments']);
+        $this->project = $project;
+    }
+    public function render()
+    {
+        return view('livewire.project.show');
+    }
+}

app/Livewire/Security/PrivateKey/Create.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\PrivateKey;
+namespace App\Livewire\Security\PrivateKey;
 
 use App\Models\PrivateKey;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;

app/Livewire/Security/PrivateKey/Show.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Livewire\PrivateKey;
+namespace App\Livewire\Security\PrivateKey;
 
 use App\Models\PrivateKey;
 use Livewire\Component;
 
-class Change extends Component
+class Show extends Component
 {
     public PrivateKey $private_key;
     public $public_key;
@@ -24,6 +24,7 @@ class Change extends Component
     public function mount()
     {
         try {
+            $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
             $this->public_key = $this->private_key->publicKey();
         }catch(\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/Delete.php

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

app/Livewire/Server/Destination/Show.php

@@ -15,7 +15,7 @@ class Show extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/Form.php

@@ -76,7 +76,7 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+            $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
             return;
         }
     }
@@ -85,7 +85,7 @@ class Form extends Component
         try {
             $uptime = $this->server->validateConnection();
             if (!$uptime) {
-                $install && $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+                $install &&  $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
                 return;
             }
             $supported_os_type = $this->server->validateOS();

app/Livewire/Server/Index.php

@@ -6,7 +6,7 @@ use App\Models\Server;
 use Illuminate\Database\Eloquent\Collection;
 use Livewire\Component;
 
-class All extends Component
+class Index extends Component
 {
     public ?Collection $servers = null;
 
@@ -15,6 +15,6 @@ class All extends Component
     }
     public function render()
     {
-        return view('livewire.server.all');
+        return view('livewire.server.index');
     }
 }

app/Livewire/Server/LogDrains.php

@@ -43,7 +43,7 @@ class LogDrains extends Component
         try {
             $server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
             $this->server = $server;
         } catch (\Throwable $e) {

app/Livewire/Server/PrivateKey/Show.php

@@ -17,7 +17,7 @@ class Show extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
             $this->privateKeys = PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false);
         } catch (\Throwable $e) {

app/Livewire/Server/Proxy/Logs.php

@@ -15,7 +15,7 @@ class Logs extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/Proxy/Show.php

@@ -20,7 +20,7 @@ class Show extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/Show.php

@@ -17,7 +17,7 @@ class Show extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return redirect()->route('server.all');
+                return redirect()->route('server.index');
             }
 
         } catch (\Throwable $e) {

app/Livewire/Server/ShowPrivateKey.php

@@ -39,7 +39,7 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                $this->dispatch('error', 'Server is not reachable. Please check your connection and private key configuration.');
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
                 return;
             }
         } catch (\Throwable $e) {

app/Livewire/Settings/Configuration.php

@@ -15,6 +15,7 @@ class Configuration extends Component
     public bool $do_not_track;
     public bool $is_auto_update_enabled;
     public bool $is_registration_enabled;
+    public bool $is_dns_validation_enabled;
     public bool $next_channel;
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
     protected Server $server;
@@ -24,12 +25,14 @@ class Configuration extends Component
         'settings.resale_license' => 'nullable',
         'settings.public_port_min' => 'required',
         'settings.public_port_max' => 'required',
+        'settings.custom_dns_servers' => 'nullable',
     ];
     protected $validationAttributes = [
         'settings.fqdn' => 'FQDN',
         'settings.resale_license' => 'Resale License',
         'settings.public_port_min' => 'Public port min',
         'settings.public_port_max' => 'Public port max',
+        'settings.custom_dns_servers' => 'Custom DNS servers',
     ];
 
     public function mount()
@@ -38,6 +41,7 @@ class Configuration extends Component
         $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->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
     }
 
     public function instantSave()
@@ -45,6 +49,7 @@ class Configuration extends Component
         $this->settings->do_not_track = $this->do_not_track;
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
+        $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
         if ($this->next_channel) {
             $this->settings->next_channel = false;
             $this->next_channel = false;
@@ -63,6 +68,14 @@ class Configuration extends Component
             return;
         }
         $this->validate();
+
+        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
+        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
+            return str($dns)->trim()->lower();
+        });
+        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
+        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
+
         $this->settings->save();
         $this->server = Server::findOrFail(0);
         $this->setup_instance_fqdn();

app/Livewire/Settings/Index.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Livewire\Settings;
+
+use App\Models\InstanceSettings;
+use App\Models\S3Storage;
+use App\Models\StandalonePostgresql;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public InstanceSettings $settings;
+    public StandalonePostgresql $database;
+    public $s3s;
+    public function mount()
+    {
+        if (isInstanceAdmin()) {
+            $settings = InstanceSettings::get();
+            $database = StandalonePostgresql::whereName('coolify-db')->first();
+            $s3s = S3Storage::whereTeamId(0)->get() ?? [];
+            if ($database) {
+                if ($database->status !== 'running') {
+                    $database->status = 'running';
+                    $database->save();
+                }
+                $this->database = $database;
+            }
+            $this->settings = $settings;
+            $this->s3s = $s3s;
+        } else {
+            return redirect()->route('dashboard');
+        }
+    }
+    public function render()
+    {
+        return view('livewire.settings.index');
+    }
+}

app/Livewire/Settings/License.php

@@ -1,15 +1,16 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Settings;
 
 use App\Actions\License\CheckResaleLicense;
 use App\Models\InstanceSettings;
 use Livewire\Component;
 
-class CheckLicense extends Component
+class License extends Component
 {
-    public InstanceSettings|null $settings = null;
+    public InstanceSettings $settings;
     public string|null $instance_id = null;
+
     protected $rules = [
         'settings.resale_license' => 'nullable',
         'settings.is_resale_license_active' => 'nullable',
@@ -20,12 +21,17 @@ class CheckLicense extends Component
         'settings.is_resale_license_active' => 'Is License Active',
     ];
 
-    public function mount()
-    {
+    public function mount () {
+        if (!isCloud()) {
+            abort(404);
+        }
         $this->instance_id = config('app.id');
         $this->settings = InstanceSettings::get();
     }
-
+    public function render()
+    {
+        return view('livewire.settings.license')->layout('layouts.subscription');
+    }
     public function submit()
     {
         $this->validate();

app/Livewire/Subscription/Index.php

@@ -6,7 +6,7 @@ use App\Models\InstanceSettings;
 use App\Providers\RouteServiceProvider;
 use Livewire\Component;
 
-class Show extends Component
+class Index extends Component
 {
     public InstanceSettings $settings;
     public bool $alreadySubscribed = false;
@@ -26,6 +26,6 @@ class Show extends Component
     }
     public function render()
     {
-        return view('livewire.subscription.show')->layout('layouts.subscription');
+        return view('livewire.subscription.index')->layout('layouts.subscription');
     }
 }

app/Livewire/Team/Delete.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Livewire\Team;
-
-use Illuminate\Support\Facades\DB;
-use Livewire\Component;
-
-class Delete extends Component
-{
-    public function delete()
-    {
-        $currentTeam = currentTeam();
-        $currentTeam->delete();
-
-        $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === auth()->user()->id) {
-                return;
-            }
-            $user->teams()->detach($currentTeam);
-            $session = DB::table('sessions')->where('user_id', $user->id)->first();
-            if ($session) {
-                DB::table('sessions')->where('id', $session->id)->delete();
-            }
-        });
-
-        refreshSession();
-        return redirect()->route('team.index');
-    }
-}

app/Livewire/Team/Form.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Livewire\Team;
-
-use App\Models\Team;
-use Livewire\Component;
-
-class Form extends Component
-{
-    public Team $team;
-    protected $rules = [
-        'team.name' => 'required|min:3|max:255',
-        'team.description' => 'nullable|min:3|max:255',
-    ];
-    protected $validationAttributes = [
-        'team.name' => 'name',
-        'team.description' => 'description',
-    ];
-
-    public function mount()
-    {
-        $this->team = currentTeam();
-    }
-
-    public function submit()
-    {
-        $this->validate();
-        try {
-            $this->team->save();
-            refreshSession();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

app/Livewire/Team/Index.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Livewire\Team;
+
+use App\Models\Team;
+use App\Models\TeamInvitation;
+use Illuminate\Support\Facades\DB;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $invitations = [];
+    public Team $team;
+    protected $rules = [
+        'team.name' => 'required|min:3|max:255',
+        'team.description' => 'nullable|min:3|max:255',
+    ];
+    protected $validationAttributes = [
+        'team.name' => 'name',
+        'team.description' => 'description',
+    ];
+    public function mount() {
+        $this->team = currentTeam();
+
+        if (auth()->user()->isAdminFromSession()) {
+            $this->invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
+        }
+    }
+    public function render()
+    {
+        return view('livewire.team.index');
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->team->save();
+            refreshSession();
+            $this->dispatch('success', 'Team updated successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function delete()
+    {
+        $currentTeam = currentTeam();
+        $currentTeam->delete();
+
+        $currentTeam->members->each(function ($user) use ($currentTeam) {
+            if ($user->id === auth()->user()->id) {
+                return;
+            }
+            $user->teams()->detach($currentTeam);
+            $session = DB::table('sessions')->where('user_id', $user->id)->first();
+            if ($session) {
+                DB::table('sessions')->where('id', $session->id)->delete();
+            }
+        });
+
+        refreshSession();
+        return redirect()->route('team.index');
+    }
+}

app/Livewire/Team/Member/Index.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Livewire\Team\Member;
+
+use App\Models\TeamInvitation;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $invitations = [];
+    public function mount() {
+        if (auth()->user()->isAdminFromSession()) {
+            $this->invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
+        }
+    }
+    public function render()
+    {
+        return view('livewire.team.member.index');
+    }
+}

app/Livewire/Team/Notification/Index.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\Team\Notification;
+
+use Livewire\Component;
+
+class Index extends Component
+{
+    public function render()
+    {
+        return view('livewire.team.notification.index');
+    }
+}

app/Livewire/Team/Storage/Create.php

@@ -65,7 +65,7 @@ class Create extends Component
             $this->storage->team_id = currentTeam()->id;
             $this->storage->testConnection();
             $this->storage->save();
-            return redirect()->route('team.storages.show', $this->storage->uuid);
+            return redirect()->route('team.storage.show', $this->storage->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Team/Storage/Form.php

@@ -43,7 +43,7 @@ class Form extends Component
     {
         try {
             $this->storage->delete();
-            return redirect()->route('team.storages.all');
+            return redirect()->route('team.storage.index');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Team/Storage/Index.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\Team\Storage;
+
+use App\Models\S3Storage;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $s3;
+    public function mount() {
+        $this->s3 = S3Storage::ownedByCurrentTeam()->get();
+    }
+    public function render()
+    {
+        return view('livewire.team.storage.index');
+    }
+}

app/Livewire/Team/Storage/Show.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Livewire\Team\Storage;
+
+use App\Models\S3Storage;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public $storage = null;
+    public function mount()
+    {
+        $this->storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->first();
+        if (!$this->storage) {
+            abort(404);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.team.storage.show');
+    }
+}

app/Models/Application.php

@@ -315,6 +315,11 @@ class Application extends BaseModel
         return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->where('key', 'like', 'NIXPACKS_%');
     }
 
+    public function scheduled_tasks(): HasMany
+    {
+        return $this->hasMany(ScheduledTask::class)->orderBy('name', 'asc');
+    }
+
     public function private_key()
     {
         return $this->belongsTo(PrivateKey::class);
@@ -424,7 +429,7 @@ class Application extends BaseModel
     }
     public function isConfigurationChanged($save = false)
     {
-        $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->health_check_path  . $this->health_check_port . $this->health_check_host . $this->health_check_method . $this->health_check_return_code . $this->health_check_scheme . $this->health_check_response_text . $this->health_check_interval . $this->health_check_timeout . $this->health_check_retries . $this->health_check_start_period . $this->health_check_enabled . $this->limits_memory  . $this->limits_swap . $this->limits_swappiness . $this->limits_reservation . $this->limits_cpus . $this->limits_cpuset . $this->limits_cpu_shares . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
+        $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
         if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
             $newConfigHash .= json_encode($this->environment_variables->all());
         } else {
@@ -637,7 +642,6 @@ class Application extends BaseModel
                     'mem_swappiness' => $this->limits_memory_swappiness,
                     'mem_reservation' => $this->limits_memory_reservation,
                     'cpus' => (float) $this->limits_cpus,
-                    'cpuset' => $this->limits_cpuset,
                     'cpu_shares' => $this->limits_cpu_shares,
                 ]
             ],
@@ -649,6 +653,9 @@ class Application extends BaseModel
                 ]
             ]
         ];
+        if (!is_null($this->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset);
+        }
         if ($server->isSwarm()) {
             data_forget($docker_compose, 'services.' . $container_name . '.container_name');
             data_forget($docker_compose, 'services.' . $container_name . '.expose');
@@ -755,7 +762,6 @@ class Application extends BaseModel
         // if (count($this->ports_mappings_array) > 0) {
         // $deployment->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
         $containers = getCurrentApplicationContainerStatus($server, $this->id, $pullRequestId);
-        ray($containers);
         // if ($pullRequestId === 0) {
         //     $containers = $containers->filter(function ($container) use ($containerName) {
         //         return data_get($container, 'Names') !== $containerName;
@@ -867,7 +873,6 @@ class Application extends BaseModel
             } else {
                 $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
             }
-            ray($git_clone_command);
             if ($exec_in_docker) {
                 $commands = collect([
                     executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),

app/Models/S3Storage.php

@@ -48,7 +48,7 @@ class S3Storage extends BaseModel
             if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
                 $mail = new MailMessage();
                 $mail->subject('Coolify: S3 Storage Connection Error');
-                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storages.show', ['storage_uuid' => $this->uuid])]);
+                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storage.show', ['storage_uuid' => $this->uuid])]);
                 $users = collect([]);
                 $members = $this->team->members()->get();
                 foreach ($members as $user) {

app/Models/ScheduledTask.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class ScheduledTask extends BaseModel
+{
+    protected $guarded = [];
+
+    public function service()
+    {
+        return $this->belongsTo(Service::class);
+    }
+    public function application()
+    {
+        return $this->belongsTo(Application::class);
+    }
+    public function latest_log(): HasOne
+    {
+        return $this->hasOne(ScheduledTaskExecution::class)->latest();
+    }
+    public function executions(): HasMany
+    {
+        return $this->hasMany(ScheduledTaskExecution::class);
+    }
+}

app/Models/ScheduledTaskExecution.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ScheduledTaskExecution extends BaseModel
+{
+    protected $guarded = [];
+
+    public function scheduledTask(): BelongsTo
+    {
+        return $this->belongsTo(ScheduledTask::class);
+    }
+}

app/Models/Server.php

@@ -358,10 +358,10 @@ class Server extends BaseModel
     public function validateOS(): bool | Stringable
     {
         $os_release = instant_remote_process(['cat /etc/os-release'], $this);
-        $datas = collect(explode("\n", $os_release));
+        $releaseLines = collect(explode("\n", $os_release));
         $collectedData = collect([]);
-        foreach ($datas as $data) {
-            $item = Str::of($data)->trim();
+        foreach ($releaseLines as $line) {
+            $item = Str::of($line)->trim();
             $collectedData->put($item->before('=')->value(), $item->after('=')->lower()->replace('"', '')->value());
         }
         $ID = data_get($collectedData, 'ID');

app/Models/Service.php

@@ -396,6 +396,10 @@ class Service extends BaseModel
         }
         return null;
     }
+    public function scheduled_tasks(): HasMany
+    {
+        return $this->hasMany(ScheduledTask::class)->orderBy('name', 'asc');
+    }
     public function environment_variables(): HasMany
     {
         return $this->hasMany(EnvironmentVariable::class)->orderBy('key', 'asc');

app/Notifications/Channels/EmailChannel.php

@@ -14,8 +14,8 @@ class EmailChannel
     {
         try {
             $this->bootConfigs($notifiable);
-            $recepients = $notifiable->getRecepients($notification);
-            if (count($recepients) === 0) {
+            $recipients = $notifiable->getRecepients($notification);
+            if (count($recipients) === 0) {
                 throw new Exception('No email recipients found');
             }
 
@@ -24,7 +24,7 @@ class EmailChannel
                 [],
                 [],
                 fn (Message $message) => $message
-                    ->to($recepients)
+                    ->to($recipients)
                     ->subject($mailMessage->subject)
                     ->html((string)$mailMessage->render())
             );
@@ -35,8 +35,8 @@ class EmailChannel
             }
             ray($e->getMessage());
             $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:";
-            if (isset($recepients)) {
-                $message .= implode(', ', $recepients);
+            if (isset($recipients)) {
+                $message .= implode(', ', $recipients);
             }
             if (isset($mailMessage)) {
                 $message .= " with subject: {$mailMessage->subject}";

app/Notifications/Container/ContainerRestarted.php

@@ -27,7 +27,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}");
+        $mail->subject("Coolify: A resource ({$this->name}) has been restarted automatically on {$this->server->name}");
         $mail->view('emails.container-restarted', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
@@ -38,12 +38,12 @@ class ContainerRestarted extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}";
+        $message = "Coolify: A resource ({$this->name}) has been restarted automatically on {$this->server->name}";
         return $message;
     }
     public function toTelegram(): array
     {
-        $message = "Coolify: A service ({$this->name}) has been restarted automatically on {$this->server->name}";
+        $message = "Coolify: A resource ({$this->name}) has been restarted automatically on {$this->server->name}";
         $payload = [
             "message" => $message,
         ];

app/Notifications/Container/ContainerStopped.php

@@ -26,7 +26,7 @@ class ContainerStopped extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify: A service ({$this->name}) has been stopped on {$this->server->name}");
+        $mail->subject("Coolify: A resource  has been stopped unexpectedly on {$this->server->name}");
         $mail->view('emails.container-stopped', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
@@ -37,12 +37,12 @@ class ContainerStopped extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: A service ({$this->name}) has been stopped on {$this->server->name}";
+        $message = "Coolify: A resource has been stopped unexpectedly on {$this->server->name}";
         return $message;
     }
     public function toTelegram(): array
     {
-        $message = "Coolify: A service ($this->name} has been stopped on {$this->server->name}";
+        $message = "Coolify: A resource has been stopped unexpectedly on {$this->server->name}";
         $payload = [
             "message" => $message,
         ];

app/Providers/FortifyServiceProvider.php

@@ -31,7 +31,7 @@ class FortifyServiceProvider extends ServiceProvider
             {
                 // First user (root) will be redirected to /settings instead of / on registration.
                 if ($request->user()->currentTeam->id === 0) {
-                    return redirect()->route('settings.configuration');
+                    return redirect()->route('settings.index');
                 }
                 return redirect(RouteServiceProvider::HOME);
             }

app/Traits/ExecuteRemoteCommand.php

@@ -32,10 +32,11 @@ trait ExecuteRemoteCommand
             $hidden = data_get($single_command, 'hidden', false);
             $customType = data_get($single_command, 'type');
             $ignore_errors = data_get($single_command, 'ignore_errors', false);
+            $append = data_get($single_command, 'append', true);
             $this->save = data_get($single_command, 'save');
 
             $remote_command = generateSshCommand($this->server, $command);
-            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden, $customType) {
+            $process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden, $customType, $append) {
                 $output = Str::of($output)->trim();
                 if ($output->startsWith('╔')) {
                     $output = "\n" . $output;
@@ -59,7 +60,15 @@ trait ExecuteRemoteCommand
                 $this->application_deployment_queue->save();
 
                 if ($this->save) {
-                    $this->saved_outputs[$this->save] = Str::of($output)->trim();
+                    if (data_get($this->saved_outputs, $this->save, null) === null) {
+                        data_set($this->saved_outputs, $this->save, str());
+                    }
+                    if ($append) {
+                        $this->saved_outputs[$this->save] .= str($output)->trim();
+                        $this->saved_outputs[$this->save] = str($this->saved_outputs[$this->save]);
+                    } else {
+                        $this->saved_outputs[$this->save] = str($output)->trim();
+                    }
                 }
             });
             $this->application_deployment_queue->update([

bootstrap/helpers/applications.php

@@ -167,7 +167,6 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
                 'mem_swappiness' => $application->limits_memory_swappiness,
                 'mem_reservation' => $application->limits_memory_reservation,
                 'cpus' => (int) $application->limits_cpus,
-                'cpuset' => $application->limits_cpuset,
                 'cpu_shares' => $application->limits_cpu_shares,
             ]
         ],
@@ -179,6 +178,9 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
             ]
         ]
     ];
+    if (!is_null($application->limits_cpuset)) {
+        data_set($docker_compose, "services.{$containerName}.cpuset", $application->limits_cpuset);
+    }
     if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) {
         $docker_compose['services'][$containerName]['logging'] = [
             'driver' => 'fluentd',

bootstrap/helpers/docker.php

@@ -226,14 +226,15 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
             if (is_null($port) && !is_null($onlyPort)) {
                 $port = $onlyPort;
             }
-            $http_label = "{$uuid}-{$loop}-http";
-            $https_label = "{$uuid}-{$loop}-https";
+            $http_label = "http-{$loop}-{$uuid}";
+            $https_label = "https-{$loop}-{$uuid}";
 
+            $labels->push("traefik.http.middlewares.gzip.compress=true");
+            $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
             if ($schema === 'https') {
                 // Set labels for https
                 $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
                 $labels->push("traefik.http.routers.{$https_label}.entryPoints=https");
-                $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
                 if ($port) {
                     $labels->push("traefik.http.routers.{$https_label}.service={$https_label}");
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
@@ -249,36 +250,39 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 // Set labels for http (redirect to https)
                 $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
                 $labels->push("traefik.http.routers.{$http_label}.entryPoints=http");
+                if ($port) {
+                    $labels->push("traefik.http.services.{$http_label}.loadbalancer.server.port=$port");
+                    $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
+                }
                 if ($is_force_https_enabled) {
+                    $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https");
                     $labels->push("traefik.http.routers.{$http_label}.middlewares=redirect-to-https");
                 }
             } else {
                 // Set labels for http
                 $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
                 $labels->push("traefik.http.routers.{$http_label}.entryPoints=http");
-                $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip");
                 if ($port) {
-                    $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                     $labels->push("traefik.http.services.{$http_label}.loadbalancer.server.port=$port");
+                    $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($path !== '/') {
                     $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix");
                     $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
                 }
             }
-        } catch(\Throwable $e) {
+        } catch (\Throwable $e) {
             continue;
         }
-
     }
 
-    return $labels;
+    return $labels->sort();
 }
 function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null): array
 {
     $ports = $application->settings->is_static ? [80] : $application->ports_exposes_array;
     $onlyPort = null;
-    if (count($ports) === 1) {
+    if (count($ports) > 0) {
         $onlyPort = $ports[0];
     }
     $pull_request_id = data_get($preview, 'pull_request_id', 0);

bootstrap/helpers/proxy.php

@@ -103,25 +103,6 @@ function generate_default_proxy_configuration(Server $server)
         "traefik.http.routers.traefik.entrypoints=http",
         "traefik.http.routers.traefik.service=api@internal",
         "traefik.http.services.traefik.loadbalancer.server.port=8080",
-        // Global Middlewares
-        "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https",
-        "traefik.http.middlewares.gzip.compress=true",
-        // https WWW to non-WWW
-        "traefik.http.middlewares.https-www-to-non-www.redirectregex.regex=^https?://www\\.(.+)",
-        "traefik.http.middlewares.https-www-to-non-www.redirectregex.replacement=https://\$1",
-        "traefik.http.middlewares.https-www-to-non-www.redirectregex.permanent=true",
-        // https Non-WWW to WWW
-        "traefik.http.middlewares.https-non-www-to-www.redirectregex.regex=^https?://(?:www\\.)?(.+)",
-        "traefik.http.middlewares.https-non-www-to-www.redirectregex.replacement=https://www.\$\${1}",
-        "traefik.http.middlewares.https-non-www-to-www.redirectregex.permanent=true",
-        // http www to non-WWW
-        "traefik.http.middlewares.http-www-to-non-www.redirectregex.regex=^http://www\\.(.+)",
-        "traefik.http.middlewares.http-www-to-non-www.redirectregex.replacement=http://\$1",
-        "traefik.http.middlewares.http-www-to-non-www.redirectregex.permanent=true",
-        // http Non-WWW to WWW
-        "traefik.http.middlewares.http-non-www-to-www.redirectregex.regex=^http://(?:www\\.)?(.+)",
-        "traefik.http.middlewares.http-non-www-to-www.redirectregex.replacement=http://www.\$\${1}",
-        "traefik.http.middlewares.http-non-www-to-www.redirectregex.permanent=true",
     ];
     $config = [
         "version" => "3.8",
@@ -171,7 +152,7 @@ function generate_default_proxy_configuration(Server $server)
         ],
     ];
     if (isDev()) {
-        $config['services']['traefik']['command'][] = "--log.level=debug";
+        // $config['services']['traefik']['command'][] = "--log.level=debug";
         $config['services']['traefik']['command'][] = "--accesslog.filepath=/traefik/access.log";
         $config['services']['traefik']['command'][] = "--accesslog.bufferingsize=100";
     }
@@ -214,10 +195,23 @@ function setup_dynamic_configuration()
             $traefik_dynamic_conf = [
                 'http' =>
                 [
+                    'middlewares' => [
+                        'redirect-to-https' => [
+                            'redirectscheme' => [
+                                'scheme' => 'https',
+                            ],
+                        ],
+                        'gzip' => [
+                            'compress' => true,
+                        ],
+                    ],
                     'routers' =>
                     [
                         'coolify-http' =>
                         [
+                            'middlewares' => [
+                                0 => 'gzip',
+                            ],
                             'entryPoints' => [
                                 0 => 'http',
                             ],
@@ -267,7 +261,7 @@ function setup_dynamic_configuration()
 
             if ($schema === 'https') {
                 $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
+                    0 => 'redirect-to-https',
                 ];
 
                 $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
@@ -304,7 +298,7 @@ function setup_dynamic_configuration()
             ], $server);
 
             if (config('app.env') == 'local') {
-                ray($yaml);
+                // ray($yaml);
             }
         }
     }

bootstrap/helpers/remoteProcess.php

@@ -67,6 +67,47 @@ function savePrivateKeyToFs(Server $server)
     return $location;
 }
 
+function generateScpCommand(Server $server, string $source, string $dest)
+{
+    $user = $server->user;
+    $port = $server->port;
+    $privateKeyLocation = savePrivateKeyToFs($server);
+    $timeout = config('constants.ssh.command_timeout');
+    $connectionTimeout = config('constants.ssh.connection_timeout');
+    $serverInterval = config('constants.ssh.server_interval');
+
+    $scp_command = "timeout $timeout scp ";
+    $scp_command .= "-i {$privateKeyLocation} "
+        . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
+        . '-o PasswordAuthentication=no '
+        . "-o ConnectTimeout=$connectionTimeout "
+        . "-o ServerAliveInterval=$serverInterval "
+        . '-o RequestTTY=no '
+        . '-o LogLevel=ERROR '
+        . "-P {$port} "
+        . "{$source} "
+        . "{$user}@{$server->ip}:{$dest}";
+
+    return $scp_command;
+}
+function instant_scp(string $source, string $dest, Server $server, $throwError = true)
+{
+    $timeout = config('constants.ssh.command_timeout');
+    $scp_command = generateScpCommand($server, $source, $dest);
+    $process = Process::timeout($timeout)->run($scp_command);
+    $output = trim($process->output());
+    $exitCode = $process->exitCode();
+    if ($exitCode !== 0) {
+        if (!$throwError) {
+            return null;
+        }
+        return excludeCertainErrors($process->errorOutput(), $exitCode);
+    }
+    if ($output === 'null') {
+        $output = null;
+    }
+    return $output;
+}
 function generateSshCommand(Server $server, string $command, bool $isMux = true)
 {
     $user = $server->user;
@@ -85,7 +126,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     if (data_get($server, 'settings.is_cloudflare_tunnel')) {
         $ssh_command .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
     }
-    $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
+    $command = "test -f ~/.profile && . ~/.profile; PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
     $ssh_command .= "-i {$privateKeyLocation} "
         . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
         . '-o PasswordAuthentication=no '

bootstrap/helpers/shared.php

@@ -22,14 +22,11 @@ use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
 use App\Notifications\Internal\GeneralNotification;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
-use Illuminate\Database\QueryException;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
@@ -40,6 +37,7 @@ use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
+use PurplePixie\PhpDns\DNSQuery;
 
 function base_configuration_dir(): string
 {
@@ -408,7 +406,7 @@ function generateFqdn(Server $server, string $random)
 }
 function sslip(Server $server)
 {
-    if (isDev()) {
+    if (isDev() && $server->id === 0) {
         return "http://127.0.0.1.sslip.io";
     }
     if ($server->ip === 'host.docker.internal') {
@@ -1592,3 +1590,50 @@ function getRealtime()
         return $envDefined;
     }
 }
+
+function validate_dns_entry(string $fqdn, Server $server)
+{
+    $url = Url::fromString($fqdn);
+    $host = $url->getHost();
+    if (str($host)->contains('sslip.io')) {
+        return true;
+    }
+    $settings = InstanceSettings::get();
+    $is_dns_validation_enabled = data_get($settings, 'is_dns_validation_enabled');
+    if (!$is_dns_validation_enabled) {
+        return true;
+    }
+    $dnsServers = data_get($settings, 'custom_dns_servers');
+    $dnsServers = str($dnsServers)->explode(',');
+    if ($server->id === 0) {
+        $ip = data_get($settings, 'public_ipv4') || data_get($settings, 'public_ipv6') || $server->ip;
+    } else {
+        $ip = $server->ip;
+    }
+    $foundMatch = false;
+    $type = \PurplePixie\PhpDns\DNSTypes::NAME_A;
+    foreach ($dnsServers as $dnsServer) {
+        try {
+            ray("Checking $host on $dnsServer");
+            $query = new DNSQuery($dnsServer);
+            $results = $query->query($host, $type);
+            if ($results === false || $query->hasError()) {
+                ray("Error: " . $query->getLasterror());
+            } else {
+                foreach ($results as $result) {
+                    if ($result->getType() == $type) {
+                        if ($result->getData() === $ip) {
+                            ray($host . " has IP address " . $result->getData());
+                            ray($result->getString());
+                            $foundMatch = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+        }
+    }
+    ray("Found match: $foundMatch");
+    return $foundMatch;
+}

composer.json

@@ -28,6 +28,7 @@
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",
         "poliander/cron": "^3.0",
+        "purplepixie/phpdns": "^2.1",
         "pusher/pusher-php-server": "^7.2",
         "resend/resend-laravel": "^0.5.0",
         "sentry/sentry-laravel": "^3.4",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "44337ff4ff1d9c435d9776fec01ebe9c",
+    "content-hash": "de3b59fade9b132d2582a40dcf3c00f9",
     "packages": [
         {
             "name": "amphp/amp",
@@ -6287,6 +6287,54 @@
             },
             "time": "2023-10-14T21:56:36+00:00"
         },
+        {
+            "name": "purplepixie/phpdns",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/purplepixie/phpdns.git",
+                "reference": "e1e4f18a60d01947e2aac7157325a9e2e7755bf7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/purplepixie/phpdns/zipball/e1e4f18a60d01947e2aac7157325a9e2e7755bf7",
+                "reference": "e1e4f18a60d01947e2aac7157325a9e2e7755bf7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PurplePixie": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Cutting",
+                    "email": "dcutting@purplepixie.org"
+                }
+            ],
+            "description": "PHP DNS Direct Query Module",
+            "support": {
+                "issues": "https://github.com/purplepixie/phpdns/issues",
+                "source": "https://github.com/purplepixie/phpdns/tree/2.1.0"
+            },
+            "time": "2023-11-06T15:37:19+00:00"
+        },
         {
             "name": "pusher/pusher-php-server",
             "version": "7.2.4",

config/livewire.php

@@ -53,7 +53,9 @@ return [
 
     'temporary_file_upload' => [
         'disk' => null,        // Example: 'local', 's3'              | Default: 'default'
-        'rules' => null,       // Example: ['file', 'mimes:png,jpg']  | Default: ['required', 'file', 'max:12288'] (12MB)
+        'rules' => [           // Example: ['file', 'mimes:png,jpg']  | Default: ['required', 'file', 'max:12288'] (12MB)
+            'file', 'max:256000'
+        ],
         'directory' => null,   // Example: 'tmp'                      | Default: 'livewire-tmp'
         'middleware' => null,  // Example: 'throttle:5,1'             | Default: 'throttle:60,1'
         'preview_mimes' => [   // Supported file types for temporary pre-signed file URLs...

config/queue.php

@@ -65,7 +65,7 @@ return [
             'driver' => 'redis',
             'connection' => 'default',
             'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 300,
+            'retry_after' => 3600,
             'block_for' => null,
             'after_commit' => true,
         ],

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