Merge remote-tracking branch 'origin/next' into pr-7764-shadow/add-shared-server-env

app/Actions/Fortify/ResetUserPassword.php

@@ -21,7 +21,7 @@ class ResetUserPassword implements ResetsUserPasswords
             'password' => ['required', Password::defaults(), 'confirmed'],
         ])->validate();
 
-        $user->forceFill([
+        $user->fill([
             'password' => Hash::make($input['password']),
         ])->save();
         $user->deleteAllSessions();

app/Actions/Fortify/UpdateUserPassword.php

@@ -24,7 +24,7 @@ class UpdateUserPassword implements UpdatesUserPasswords
             'current_password.current_password' => __('The provided password does not match your current password.'),
         ])->validateWithBag('updatePassword');
 
-        $user->forceFill([
+        $user->fill([
             'password' => Hash::make($input['password']),
         ])->save();
     }

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -35,7 +35,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
         ) {
             $this->updateVerifiedUser($user, $input);
         } else {
-            $user->forceFill([
+            $user->fill([
                 'name' => $input['name'],
                 'email' => $input['email'],
             ])->save();
@@ -49,7 +49,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      */
     protected function updateVerifiedUser(User $user, array $input): void
     {
-        $user->forceFill([
+        $user->fill([
             'name' => $input['name'],
             'email' => $input['email'],
             'email_verified_at' => null,

app/Actions/Server/InstallDocker.php

@@ -49,7 +49,7 @@ class InstallDocker
           }');
         $found = StandaloneDocker::where('server_id', $server->id);
         if ($found->count() == 0 && $server->id) {
-            StandaloneDocker::forceCreate([
+            StandaloneDocker::create([
                 'name' => 'coolify',
                 'network' => 'coolify',
                 'server_id' => $server->id,

app/Console/Commands/Emails.php

@@ -136,7 +136,7 @@ class Emails extends Command
                 $application = Application::all()->first();
                 $preview = ApplicationPreview::all()->first();
                 if (! $preview) {
-                    $preview = ApplicationPreview::forceCreate([
+                    $preview = ApplicationPreview::create([
                         'application_id' => $application->id,
                         'pull_request_id' => 1,
                         'pull_request_html_url' => 'http://example.com',

app/Http/Controllers/Api/ProjectController.php

@@ -258,7 +258,7 @@ class ProjectController extends Controller
             ], 422);
         }
 
-        $project = Project::forceCreate([
+        $project = Project::create([
             'name' => $request->name,
             'description' => $request->description,
             'team_id' => $teamId,

app/Http/Controllers/Api/ServicesController.php

@@ -432,7 +432,7 @@ class ServicesController extends Controller
                 if (in_array($oneClickServiceName, NEEDS_TO_CONNECT_TO_PREDEFINED_NETWORK)) {
                     data_set($servicePayload, 'connect_to_docker_network', true);
                 }
-                $service = Service::forceCreate($servicePayload);
+                $service = Service::create($servicePayload);
                 $service->name = $request->name ?? "$oneClickServiceName-".$service->uuid;
                 $service->description = $request->description;
                 if ($request->has('is_container_label_escape_enabled')) {

app/Http/Controllers/Webhook/Bitbucket.php

@@ -119,7 +119,7 @@ class Bitbucket extends Controller
                         $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                         if (! $found) {
                             if ($application->build_pack === 'dockercompose') {
-                                $pr_app = ApplicationPreview::forceCreate([
+                                $pr_app = ApplicationPreview::create([
                                     'git_type' => 'bitbucket',
                                     'application_id' => $application->id,
                                     'pull_request_id' => $pull_request_id,
@@ -128,7 +128,7 @@ class Bitbucket extends Controller
                                 ]);
                                 $pr_app->generate_preview_fqdn_compose();
                             } else {
-                                $pr_app = ApplicationPreview::forceCreate([
+                                $pr_app = ApplicationPreview::create([
                                     'git_type' => 'bitbucket',
                                     'application_id' => $application->id,
                                     'pull_request_id' => $pull_request_id,

app/Http/Controllers/Webhook/Gitea.php

@@ -144,7 +144,7 @@ class Gitea extends Controller
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if (! $found) {
                                 if ($application->build_pack === 'dockercompose') {
-                                    $pr_app = ApplicationPreview::forceCreate([
+                                    $pr_app = ApplicationPreview::create([
                                         'git_type' => 'gitea',
                                         'application_id' => $application->id,
                                         'pull_request_id' => $pull_request_id,
@@ -153,7 +153,7 @@ class Gitea extends Controller
                                     ]);
                                     $pr_app->generate_preview_fqdn_compose();
                                 } else {
-                                    $pr_app = ApplicationPreview::forceCreate([
+                                    $pr_app = ApplicationPreview::create([
                                         'git_type' => 'gitea',
                                         'application_id' => $application->id,
                                         'pull_request_id' => $pull_request_id,

app/Http/Controllers/Webhook/Gitlab.php

@@ -177,7 +177,7 @@ class Gitlab extends Controller
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if (! $found) {
                                 if ($application->build_pack === 'dockercompose') {
-                                    $pr_app = ApplicationPreview::forceCreate([
+                                    $pr_app = ApplicationPreview::create([
                                         'git_type' => 'gitlab',
                                         'application_id' => $application->id,
                                         'pull_request_id' => $pull_request_id,
@@ -186,7 +186,7 @@ class Gitlab extends Controller
                                     ]);
                                     $pr_app->generate_preview_fqdn_compose();
                                 } else {
-                                    $pr_app = ApplicationPreview::forceCreate([
+                                    $pr_app = ApplicationPreview::create([
                                         'git_type' => 'gitlab',
                                         'application_id' => $application->id,
                                         'pull_request_id' => $pull_request_id,

app/Jobs/ProcessGithubPullRequestWebhook.php

@@ -118,7 +118,7 @@ class ProcessGithubPullRequestWebhook implements ShouldBeEncrypted, ShouldQueue
 
         if (! $found) {
             if ($application->build_pack === 'dockercompose') {
-                $preview = ApplicationPreview::forceCreate([
+                $preview = ApplicationPreview::create([
                     'git_type' => 'github',
                     'application_id' => $application->id,
                     'pull_request_id' => $this->pullRequestId,
@@ -127,7 +127,7 @@ class ProcessGithubPullRequestWebhook implements ShouldBeEncrypted, ShouldQueue
                 ]);
                 $preview->generate_preview_fqdn_compose();
             } else {
-                $preview = ApplicationPreview::forceCreate([
+                $preview = ApplicationPreview::create([
                     'git_type' => 'github',
                     'application_id' => $application->id,
                     'pull_request_id' => $this->pullRequestId,

app/Livewire/Boarding/Index.php

@@ -441,7 +441,7 @@ class Index extends Component
 
     public function createNewProject()
     {
-        $this->createdProject = Project::forceCreate([
+        $this->createdProject = Project::create([
             'name' => 'My first project',
             'team_id' => currentTeam()->id,
             'uuid' => (string) new Cuid2,

app/Livewire/Destination/New/Docker.php

@@ -77,7 +77,7 @@ class Docker extends Component
                 if ($found) {
                     throw new \Exception('Network already added to this server.');
                 } else {
-                    $docker = SwarmDocker::forceCreate([
+                    $docker = SwarmDocker::create([
                         'name' => $this->name,
                         'network' => $this->network,
                         'server_id' => $this->selectedServer->id,
@@ -88,7 +88,7 @@ class Docker extends Component
                 if ($found) {
                     throw new \Exception('Network already added to this server.');
                 } else {
-                    $docker = StandaloneDocker::forceCreate([
+                    $docker = StandaloneDocker::create([
                         'name' => $this->name,
                         'network' => $this->network,
                         'server_id' => $this->selectedServer->id,

app/Livewire/ForcePasswordReset.php

@@ -48,7 +48,7 @@ class ForcePasswordReset extends Component
             $this->rateLimit(10);
             $this->validate();
             $firstLogin = auth()->user()->created_at == auth()->user()->updated_at;
-            auth()->user()->forceFill([
+            auth()->user()->fill([
                 'password' => Hash::make($this->password),
                 'force_password_reset' => false,
             ])->save();

app/Livewire/Project/AddEmpty.php

@@ -30,7 +30,7 @@ class AddEmpty extends Component
     {
         try {
             $this->validate();
-            $project = Project::forceCreate([
+            $project = Project::create([
                 'name' => $this->name,
                 'description' => $this->description,
                 'team_id' => currentTeam()->id,

app/Livewire/Project/Application/Previews.php

@@ -196,7 +196,7 @@ class Previews extends Component
                 $this->setDeploymentUuid();
                 $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
                 if (! $found && ! is_null($pull_request_html_url)) {
-                    $found = ApplicationPreview::forceCreate([
+                    $found = ApplicationPreview::create([
                         'application_id' => $this->application->id,
                         'pull_request_id' => $pull_request_id,
                         'pull_request_html_url' => $pull_request_html_url,
@@ -210,7 +210,7 @@ class Previews extends Component
                 $this->setDeploymentUuid();
                 $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
                 if (! $found && (! is_null($pull_request_html_url) || ($this->application->build_pack === 'dockerimage' && str($docker_registry_image_tag)->isNotEmpty()))) {
-                    $found = ApplicationPreview::forceCreate([
+                    $found = ApplicationPreview::create([
                         'application_id' => $this->application->id,
                         'pull_request_id' => $pull_request_id,
                         'pull_request_html_url' => $pull_request_html_url ?? '',
@@ -262,7 +262,7 @@ class Previews extends Component
             $this->setDeploymentUuid();
             $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
             if (! $found && (! is_null($pull_request_html_url) || ($this->application->build_pack === 'dockerimage' && str($docker_registry_image_tag)->isNotEmpty()))) {
-                $found = ApplicationPreview::forceCreate([
+                $found = ApplicationPreview::create([
                     'application_id' => $this->application->id,
                     'pull_request_id' => $pull_request_id,
                     'pull_request_html_url' => $pull_request_html_url ?? '',

app/Livewire/Project/CloneMe.php

@@ -100,7 +100,7 @@ class CloneMe extends Component
                 if ($foundProject) {
                     throw new \Exception('Project with the same name already exists.');
                 }
-                $project = Project::forceCreate([
+                $project = Project::create([
                     'name' => $this->newName,
                     'team_id' => currentTeam()->id,
                     'description' => $this->project->description.' (clone)',
@@ -139,7 +139,7 @@ class CloneMe extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'uuid' => $uuid,
                     'status' => 'exited',
                     'started_at' => null,
@@ -188,7 +188,7 @@ class CloneMe extends Component
                         'created_at',
                         'updated_at',
                         'uuid',
-                    ])->forceFill([
+                    ])->fill([
                         'name' => $newName,
                         'resource_id' => $newDatabase->id,
                     ]);
@@ -217,7 +217,7 @@ class CloneMe extends Component
                         'id',
                         'created_at',
                         'updated_at',
-                    ])->forceFill([
+                    ])->fill([
                         'resource_id' => $newDatabase->id,
                     ]);
                     $newStorage->save();
@@ -230,7 +230,7 @@ class CloneMe extends Component
                         'id',
                         'created_at',
                         'updated_at',
-                    ])->forceFill([
+                    ])->fill([
                         'uuid' => $uuid,
                         'database_id' => $newDatabase->id,
                         'database_type' => $newDatabase->getMorphClass(),
@@ -248,7 +248,7 @@ class CloneMe extends Component
                         'id',
                         'created_at',
                         'updated_at',
-                    ])->forceFill($payload);
+                    ])->fill($payload);
                     $newEnvironmentVariable->save();
                 }
             }
@@ -259,7 +259,7 @@ class CloneMe extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'uuid' => $uuid,
                     'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
@@ -277,7 +277,7 @@ class CloneMe extends Component
                         'id',
                         'created_at',
                         'updated_at',
-                    ])->forceFill([
+                    ])->fill([
                         'uuid' => (string) new Cuid2,
                         'service_id' => $newService->id,
                         'team_id' => currentTeam()->id,
@@ -291,7 +291,7 @@ class CloneMe extends Component
                         'id',
                         'created_at',
                         'updated_at',
-                    ])->forceFill([
+                    ])->fill([
                         'resourceable_id' => $newService->id,
                         'resourceable_type' => $newService->getMorphClass(),
                     ]);
@@ -299,7 +299,7 @@ class CloneMe extends Component
                 }
 
                 foreach ($newService->applications() as $application) {
-                    $application->forceFill([
+                    $application->fill([
                         'status' => 'exited',
                     ])->save();
 
@@ -317,7 +317,7 @@ class CloneMe extends Component
                             'created_at',
                             'updated_at',
                             'uuid',
-                        ])->forceFill([
+                        ])->fill([
                             'name' => $newName,
                             'resource_id' => $application->id,
                         ]);
@@ -346,7 +346,7 @@ class CloneMe extends Component
                             'id',
                             'created_at',
                             'updated_at',
-                        ])->forceFill([
+                        ])->fill([
                             'resource_id' => $application->id,
                         ]);
                         $newStorage->save();
@@ -354,7 +354,7 @@ class CloneMe extends Component
                 }
 
                 foreach ($newService->databases() as $database) {
-                    $database->forceFill([
+                    $database->fill([
                         'status' => 'exited',
                     ])->save();
 
@@ -372,7 +372,7 @@ class CloneMe extends Component
                             'created_at',
                             'updated_at',
                             'uuid',
-                        ])->forceFill([
+                        ])->fill([
                             'name' => $newName,
                             'resource_id' => $database->id,
                         ]);
@@ -401,7 +401,7 @@ class CloneMe extends Component
                             'id',
                             'created_at',
                             'updated_at',
-                        ])->forceFill([
+                        ])->fill([
                             'resource_id' => $database->id,
                         ]);
                         $newStorage->save();
@@ -414,7 +414,7 @@ class CloneMe extends Component
                             'id',
                             'created_at',
                             'updated_at',
-                        ])->forceFill([
+                        ])->fill([
                             'uuid' => $uuid,
                             'database_id' => $database->id,
                             'database_type' => $database->getMorphClass(),

app/Livewire/Project/New/DockerCompose.php

@@ -54,7 +54,7 @@ class DockerCompose extends Component
             }
             $destination_class = $destination->getMorphClass();
 
-            $service = Service::forceCreate([
+            $service = Service::create([
                 'docker_compose_raw' => $this->dockerComposeRaw,
                 'environment_id' => $environment->id,
                 'server_id' => (int) $server_id,

app/Livewire/Project/New/DockerImage.php

@@ -133,7 +133,7 @@ class DockerImage extends Component
         // Determine the image tag based on whether it's a hash or regular tag
         $imageTag = $parser->isImageHash() ? 'sha256-'.$parser->getTag() : $parser->getTag();
 
-        $application = Application::forceCreate([
+        $application = Application::create([
             'name' => 'docker-image-'.new Cuid2,
             'repository_project_id' => 0,
             'git_repository' => 'coollabsio/coolify',

app/Livewire/Project/New/EmptyProject.php

@@ -10,7 +10,7 @@ class EmptyProject extends Component
 {
     public function createEmptyProject()
     {
-        $project = Project::forceCreate([
+        $project = Project::create([
             'name' => generate_random_name(),
             'team_id' => currentTeam()->id,
             'uuid' => (string) new Cuid2,

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -99,6 +99,8 @@ class GithubPrivateRepository extends Component
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
+        $this->branches = collect();
+        $this->total_branches_count = 0;
         $this->page = 1;
         $this->selected_github_app_id = $github_app_id;
         $this->github_app = GithubApp::where('id', $github_app_id)->first();
@@ -189,7 +191,7 @@ class GithubPrivateRepository extends Component
             $project = Project::ownedByCurrentTeam()->where('uuid', $this->parameters['project_uuid'])->firstOrFail();
             $environment = $project->environments()->where('uuid', $this->parameters['environment_uuid'])->firstOrFail();
 
-            $application = Application::forceCreate([
+            $application = Application::create([
                 'name' => generate_application_name($this->selected_repository_owner.'/'.$this->selected_repository_repo, $this->selected_branch_name),
                 'repository_project_id' => $this->selected_repository_id,
                 'git_repository' => str($this->selected_repository_owner)->trim()->toString().'/'.str($this->selected_repository_repo)->trim()->toString(),

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -183,7 +183,7 @@ class GithubPrivateRepositoryDeployKey extends Component
                 $application_init['docker_compose_location'] = $this->docker_compose_location;
                 $application_init['base_directory'] = $this->base_directory;
             }
-            $application = Application::forceCreate($application_init);
+            $application = Application::create($application_init);
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 

app/Livewire/Project/New/PublicGitRepository.php

@@ -299,7 +299,7 @@ class PublicGitRepository extends Component
                     $new_service['source_id'] = $this->git_source->id;
                     $new_service['source_type'] = $this->git_source->getMorphClass();
                 }
-                $service = Service::forceCreate($new_service);
+                $service = Service::create($new_service);
 
                 return redirect()->route('project.service.configuration', [
                     'service_uuid' => $service->uuid,
@@ -346,7 +346,7 @@ class PublicGitRepository extends Component
                 $application_init['docker_compose_location'] = $this->docker_compose_location;
                 $application_init['base_directory'] = $this->base_directory;
             }
-            $application = Application::forceCreate($application_init);
+            $application = Application::create($application_init);
 
             $application->settings->is_static = $this->isStatic;
             $application->settings->save();

app/Livewire/Project/New/SimpleDockerfile.php

@@ -52,7 +52,7 @@ CMD ["nginx", "-g", "daemon off;"]
         if (! $port) {
             $port = 80;
         }
-        $application = Application::forceCreate([
+        $application = Application::create([
             'name' => 'dockerfile-'.new Cuid2,
             'repository_project_id' => 0,
             'git_repository' => 'coollabsio/coolify',

app/Livewire/Project/Resource/Create.php

@@ -91,7 +91,7 @@ class Create extends Component
                     if (in_array($oneClickServiceName, NEEDS_TO_CONNECT_TO_PREDEFINED_NETWORK)) {
                         data_set($service_payload, 'connect_to_docker_network', true);
                     }
-                    $service = Service::forceCreate($service_payload);
+                    $service = Service::create($service_payload);
                     $service->name = "$oneClickServiceName-".$service->uuid;
                     $service->save();
                     if ($oneClickDotEnvs?->count() > 0) {

app/Livewire/Project/Shared/ResourceOperations.php

@@ -94,7 +94,7 @@ class ResourceOperations extends Component
                 'id',
                 'created_at',
                 'updated_at',
-            ])->forceFill([
+            ])->fill([
                 'uuid' => $uuid,
                 'name' => $this->resource->name.'-clone-'.$uuid,
                 'status' => 'exited',
@@ -143,7 +143,7 @@ class ResourceOperations extends Component
                     'created_at',
                     'updated_at',
                     'uuid',
-                ])->forceFill([
+                ])->fill([
                     'name' => $newName,
                     'resource_id' => $new_resource->id,
                 ]);
@@ -172,7 +172,7 @@ class ResourceOperations extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'resource_id' => $new_resource->id,
                 ]);
                 $newStorage->save();
@@ -185,7 +185,7 @@ class ResourceOperations extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'uuid' => $uuid,
                     'database_id' => $new_resource->id,
                     'database_type' => $new_resource->getMorphClass(),
@@ -204,7 +204,7 @@ class ResourceOperations extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill($payload);
+                ])->fill($payload);
                 $newEnvironmentVariable->save();
             }
 
@@ -221,7 +221,7 @@ class ResourceOperations extends Component
                 'id',
                 'created_at',
                 'updated_at',
-            ])->forceFill([
+            ])->fill([
                 'uuid' => $uuid,
                 'name' => $this->resource->name.'-clone-'.$uuid,
                 'destination_id' => $new_destination->id,
@@ -242,7 +242,7 @@ class ResourceOperations extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'uuid' => (string) new Cuid2,
                     'service_id' => $new_resource->id,
                     'team_id' => currentTeam()->id,
@@ -256,7 +256,7 @@ class ResourceOperations extends Component
                     'id',
                     'created_at',
                     'updated_at',
-                ])->forceFill([
+                ])->fill([
                     'resourceable_id' => $new_resource->id,
                     'resourceable_type' => $new_resource->getMorphClass(),
                 ]);
@@ -264,7 +264,7 @@ class ResourceOperations extends Component
             }
 
             foreach ($new_resource->applications() as $application) {
-                $application->forceFill([
+                $application->fill([
                     'status' => 'exited',
                 ])->save();
 
@@ -282,7 +282,7 @@ class ResourceOperations extends Component
                         'created_at',
                         'updated_at',
                         'uuid',
-                    ])->forceFill([
+                    ])->fill([
                         'name' => $newName,
                         'resource_id' => $application->id,
                     ]);
@@ -307,7 +307,7 @@ class ResourceOperations extends Component
             }
 
             foreach ($new_resource->databases() as $database) {
-                $database->forceFill([
+                $database->fill([
                     'status' => 'exited',
                 ])->save();
 
@@ -325,7 +325,7 @@ class ResourceOperations extends Component
                         'created_at',
                         'updated_at',
                         'uuid',
-                    ])->forceFill([
+                    ])->fill([
                         'name' => $newName,
                         'resource_id' => $database->id,
                     ]);
@@ -366,7 +366,7 @@ class ResourceOperations extends Component
         try {
             $this->authorize('update', $this->resource);
             $new_environment = Environment::ownedByCurrentTeam()->findOrFail($environment_id);
-            $this->resource->forceFill([
+            $this->resource->fill([
                 'environment_id' => $environment_id,
             ])->save();
             if ($this->resource->type() === 'application') {

app/Livewire/Project/Show.php

@@ -42,7 +42,7 @@ class Show extends Component
     {
         try {
             $this->validate();
-            $environment = Environment::forceCreate([
+            $environment = Environment::create([
                 'name' => $this->name,
                 'project_id' => $this->project->id,
                 'uuid' => (string) new Cuid2,

app/Livewire/Server/Destinations.php

@@ -43,7 +43,7 @@ class Destinations extends Component
 
                 return;
             } else {
-                SwarmDocker::forceCreate([
+                SwarmDocker::create([
                     'name' => $this->server->name.'-'.$name,
                     'network' => $this->name,
                     'server_id' => $this->server->id,
@@ -57,7 +57,7 @@ class Destinations extends Component
 
                 return;
             } else {
-                StandaloneDocker::forceCreate([
+                StandaloneDocker::create([
                     'name' => $this->server->name.'-'.$name,
                     'network' => $name,
                     'server_id' => $this->server->id,

app/Livewire/SettingsBackup.php

@@ -83,7 +83,8 @@ class SettingsBackup extends Component
             $postgres_password = $envs['POSTGRES_PASSWORD'];
             $postgres_user = $envs['POSTGRES_USER'];
             $postgres_db = $envs['POSTGRES_DB'];
-            $this->database = StandalonePostgresql::forceCreate([
+            $this->database = new StandalonePostgresql;
+            $this->database->forceFill([
                 'id' => 0,
                 'name' => 'coolify-db',
                 'description' => 'Coolify database',
@@ -94,6 +95,7 @@ class SettingsBackup extends Component
                 'destination_type' => StandaloneDocker::class,
                 'destination_id' => 0,
             ]);
+            $this->database->save();
             $this->backup = ScheduledDatabaseBackup::create([
                 'id' => 0,
                 'enabled' => true,

app/Models/Application.php

@@ -203,6 +203,14 @@ class Application extends BaseModel
         'restart_count',
         'last_restart_at',
         'last_restart_type',
+        'uuid',
+        'environment_id',
+        'destination_id',
+        'destination_type',
+        'source_id',
+        'source_type',
+        'repository_project_id',
+        'private_key_id',
     ];
 
     protected $appends = ['server_status'];
@@ -262,7 +270,7 @@ class Application extends BaseModel
                 }
             }
             if (count($payload) > 0) {
-                $application->forceFill($payload);
+                $application->fill($payload);
             }
 
             // Buildpack switching cleanup logic
@@ -299,7 +307,7 @@ class Application extends BaseModel
             }
         });
         static::created(function ($application) {
-            ApplicationSetting::forceCreate([
+            ApplicationSetting::create([
                 'application_id' => $application->id,
             ]);
             $application->compose_parsing_version = self::$parserVersion;

app/Models/ApplicationDeploymentQueue.php

@@ -44,6 +44,7 @@ class ApplicationDeploymentQueue extends Model
         'application_id',
         'deployment_uuid',
         'pull_request_id',
+        'docker_registry_image_tag',
         'force_rebuild',
         'commit',
         'status',

app/Models/ApplicationPreview.php

@@ -11,6 +11,7 @@ class ApplicationPreview extends BaseModel
     use SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'application_id',
         'pull_request_id',
         'pull_request_html_url',
@@ -62,7 +63,7 @@ class ApplicationPreview extends BaseModel
         });
         static::saving(function ($preview) {
             if ($preview->isDirty('status')) {
-                $preview->forceFill(['last_online_at' => now()]);
+                $preview->last_online_at = now();
             }
         });
     }

app/Models/ApplicationSetting.php

@@ -29,6 +29,7 @@ class ApplicationSetting extends Model
     ];
 
     protected $fillable = [
+        'application_id',
         'is_static',
         'is_git_submodules_enabled',
         'is_git_lfs_enabled',

app/Models/CloudProviderToken.php

@@ -5,6 +5,7 @@ namespace App\Models;
 class CloudProviderToken extends BaseModel
 {
     protected $fillable = [
+        'team_id',
         'provider',
         'token',
         'name',

app/Models/Environment.php

@@ -28,6 +28,8 @@ class Environment extends BaseModel
     protected $fillable = [
         'name',
         'description',
+        'project_id',
+        'uuid',
     ];
 
     protected static function booted()

app/Models/GithubApp.php

@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 class GithubApp extends BaseModel
 {
     protected $fillable = [
+        'team_id',
+        'private_key_id',
         'name',
         'organization',
         'api_url',

app/Models/Project.php

@@ -27,6 +27,8 @@ class Project extends BaseModel
     protected $fillable = [
         'name',
         'description',
+        'team_id',
+        'uuid',
     ];
 
     /**
@@ -51,10 +53,10 @@ class Project extends BaseModel
     protected static function booted()
     {
         static::created(function ($project) {
-            ProjectSetting::forceCreate([
+            ProjectSetting::create([
                 'project_id' => $project->id,
             ]);
-            Environment::forceCreate([
+            Environment::create([
                 'name' => 'production',
                 'project_id' => $project->id,
                 'uuid' => (string) new Cuid2,

app/Models/ProjectSetting.php

@@ -6,7 +6,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class ProjectSetting extends Model
 {
-    protected $fillable = [];
+    protected $fillable = [
+        'project_id',
+    ];
 
     public function project()
     {

app/Models/ScheduledDatabaseBackup.php

@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 class ScheduledDatabaseBackup extends BaseModel
 {
     protected $fillable = [
+        'uuid',
+        'team_id',
         'description',
         'enabled',
         'save_s3',

app/Models/ScheduledDatabaseBackupExecution.php

@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 class ScheduledDatabaseBackupExecution extends BaseModel
 {
     protected $fillable = [
+        'uuid',
+        'scheduled_database_backup_id',
         'status',
         'message',
         'size',

app/Models/ScheduledTask.php

@@ -30,12 +30,16 @@ class ScheduledTask extends BaseModel
     use HasSafeStringAttribute;
 
     protected $fillable = [
+        'uuid',
         'enabled',
         'name',
         'command',
         'frequency',
         'container',
         'timeout',
+        'team_id',
+        'application_id',
+        'service_id',
     ];
 
     public static function ownedByCurrentTeamAPI(int $teamId)

app/Models/ScheduledTaskExecution.php

@@ -23,6 +23,7 @@ use OpenApi\Attributes as OA;
 class ScheduledTaskExecution extends BaseModel
 {
     protected $fillable = [
+        'scheduled_task_id',
         'status',
         'message',
         'finished_at',

app/Models/Server.php

@@ -135,7 +135,7 @@ class Server extends BaseModel
                     $payload['ip_previous'] = $server->getOriginal('ip');
                 }
             }
-            $server->forceFill($payload);
+            $server->fill($payload);
         });
         static::saved(function ($server) {
             if ($server->wasChanged('private_key_id') || $server->privateKey?->isDirty()) {
@@ -143,28 +143,28 @@ class Server extends BaseModel
             }
         });
         static::created(function ($server) {
-            ServerSetting::forceCreate([
+            ServerSetting::create([
                 'server_id' => $server->id,
             ]);
             if ($server->id === 0) {
                 if ($server->isSwarm()) {
-                    SwarmDocker::forceCreate([
+                    (new SwarmDocker)->forceFill([
                         'id' => 0,
                         'name' => 'coolify',
                         'network' => 'coolify-overlay',
                         'server_id' => $server->id,
-                    ]);
+                    ])->save();
                 } else {
-                    StandaloneDocker::forceCreate([
+                    (new StandaloneDocker)->forceFill([
                         'id' => 0,
                         'name' => 'coolify',
                         'network' => 'coolify',
                         'server_id' => $server->id,
-                    ]);
+                    ])->saveQuietly();
                 }
             } else {
                 if ($server->isSwarm()) {
-                    SwarmDocker::forceCreate([
+                    SwarmDocker::create([
                         'name' => 'coolify-overlay',
                         'network' => 'coolify-overlay',
                         'server_id' => $server->id,
@@ -283,6 +283,7 @@ class Server extends BaseModel
         'detected_traefik_version',
         'traefik_outdated_info',
         'server_metadata',
+        'ip_previous',
     ];
 
     use HasSafeStringAttribute;

app/Models/ServerSetting.php

@@ -54,6 +54,7 @@ use OpenApi\Attributes as OA;
 class ServerSetting extends Model
 {
     protected $fillable = [
+        'server_id',
         'is_swarm_manager',
         'is_jump_server',
         'is_build_server',

app/Models/Service.php

@@ -49,6 +49,7 @@ class Service extends BaseModel
     private static $parserVersion = '5';
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'docker_compose_raw',
@@ -58,6 +59,10 @@ class Service extends BaseModel
         'config_hash',
         'compose_parsing_version',
         'is_container_label_escape_enabled',
+        'environment_id',
+        'server_id',
+        'destination_id',
+        'destination_type',
     ];
 
     protected $appends = ['server_status', 'status'];

app/Models/ServiceApplication.php

@@ -12,6 +12,7 @@ class ServiceApplication extends BaseModel
     use HasFactory, SoftDeletes;
 
     protected $fillable = [
+        'service_id',
         'name',
         'human_name',
         'description',
@@ -39,7 +40,7 @@ class ServiceApplication extends BaseModel
         });
         static::saving(function ($service) {
             if ($service->isDirty('status')) {
-                $service->forceFill(['last_online_at' => now()]);
+                $service->last_online_at = now();
             }
         });
     }

app/Models/ServiceDatabase.php

@@ -10,6 +10,7 @@ class ServiceDatabase extends BaseModel
     use HasFactory, SoftDeletes;
 
     protected $fillable = [
+        'service_id',
         'name',
         'human_name',
         'description',
@@ -44,7 +45,7 @@ class ServiceDatabase extends BaseModel
         });
         static::saving(function ($service) {
             if ($service->isDirty('status')) {
-                $service->forceFill(['last_online_at' => now()]);
+                $service->last_online_at = now();
             }
         });
     }

app/Models/StandaloneClickhouse.php

@@ -14,6 +14,7 @@ class StandaloneClickhouse extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'clickhouse_admin_user',
@@ -40,6 +41,9 @@ class StandaloneClickhouse extends BaseModel
         'public_port_timeout',
         'custom_docker_run_options',
         'clickhouse_db',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -71,7 +75,7 @@ class StandaloneClickhouse extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneDocker.php

@@ -13,6 +13,7 @@ class StandaloneDocker extends BaseModel
     use HasSafeStringAttribute;
 
     protected $fillable = [
+        'server_id',
         'name',
         'network',
     ];

app/Models/StandaloneDragonfly.php

@@ -14,6 +14,7 @@ class StandaloneDragonfly extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'dragonfly_password',
@@ -39,6 +40,9 @@ class StandaloneDragonfly extends BaseModel
         'public_port_timeout',
         'enable_ssl',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -70,7 +74,7 @@ class StandaloneDragonfly extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneKeydb.php

@@ -14,6 +14,7 @@ class StandaloneKeydb extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'keydb_password',
@@ -40,6 +41,9 @@ class StandaloneKeydb extends BaseModel
         'public_port_timeout',
         'enable_ssl',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'server_status'];
@@ -71,7 +75,7 @@ class StandaloneKeydb extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneMariadb.php

@@ -15,6 +15,7 @@ class StandaloneMariadb extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'mariadb_root_password',
@@ -43,6 +44,9 @@ class StandaloneMariadb extends BaseModel
         'enable_ssl',
         'is_log_drain_enabled',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -74,7 +78,7 @@ class StandaloneMariadb extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneMongodb.php

@@ -14,6 +14,7 @@ class StandaloneMongodb extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'mongo_conf',
@@ -43,6 +44,9 @@ class StandaloneMongodb extends BaseModel
         'is_log_drain_enabled',
         'is_include_timestamps',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -80,7 +84,7 @@ class StandaloneMongodb extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneMysql.php

@@ -14,6 +14,7 @@ class StandaloneMysql extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'mysql_root_password',
@@ -44,6 +45,9 @@ class StandaloneMysql extends BaseModel
         'is_log_drain_enabled',
         'is_include_timestamps',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -76,7 +80,7 @@ class StandaloneMysql extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandalonePostgresql.php

@@ -14,6 +14,7 @@ class StandalonePostgresql extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'postgres_user',
@@ -46,6 +47,9 @@ class StandalonePostgresql extends BaseModel
         'is_log_drain_enabled',
         'is_include_timestamps',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -92,7 +96,7 @@ class StandalonePostgresql extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
     }

app/Models/StandaloneRedis.php

@@ -14,6 +14,7 @@ class StandaloneRedis extends BaseModel
     use ClearsGlobalSearchCache, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
     protected $fillable = [
+        'uuid',
         'name',
         'description',
         'redis_conf',
@@ -39,6 +40,9 @@ class StandaloneRedis extends BaseModel
         'is_log_drain_enabled',
         'is_include_timestamps',
         'custom_docker_run_options',
+        'destination_type',
+        'destination_id',
+        'environment_id',
     ];
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
@@ -69,7 +73,7 @@ class StandaloneRedis extends BaseModel
         });
         static::saving(function ($database) {
             if ($database->isDirty('status')) {
-                $database->forceFill(['last_online_at' => now()]);
+                $database->last_online_at = now();
             }
         });
 

app/Models/Subscription.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class Subscription extends Model
 {
     protected $fillable = [
+        'team_id',
         'stripe_invoice_paid',
         'stripe_subscription_id',
         'stripe_customer_id',

app/Models/SwarmDocker.php

@@ -7,6 +7,7 @@ use App\Support\ValidationPatterns;
 class SwarmDocker extends BaseModel
 {
     protected $fillable = [
+        'server_id',
         'name',
         'network',
     ];

app/Models/Tag.php

@@ -10,6 +10,7 @@ class Tag extends BaseModel
 
     protected $fillable = [
         'name',
+        'team_id',
     ];
 
     protected function customizeName($value)

app/Models/User.php

@@ -49,6 +49,9 @@ class User extends Authenticatable implements SendsEmail
         'password',
         'force_password_reset',
         'marketing_emails',
+        'pending_email',
+        'email_change_code',
+        'email_change_code_expires_at',
     ];
 
     protected $hidden = [
@@ -95,7 +98,8 @@ class User extends Authenticatable implements SendsEmail
                 $team['id'] = 0;
                 $team['name'] = 'Root Team';
             }
-            $new_team = Team::forceCreate($team);
+            $new_team = (new Team)->forceFill($team);
+            $new_team->save();
             $user->teams()->attach($new_team, ['role' => 'owner']);
         });
 
@@ -198,7 +202,8 @@ class User extends Authenticatable implements SendsEmail
             $team['id'] = 0;
             $team['name'] = 'Root Team';
         }
-        $new_team = Team::forceCreate($team);
+        $new_team = (new Team)->forceFill($team);
+        $new_team->save();
         $this->teams()->attach($new_team, ['role' => 'owner']);
 
         return $new_team;
@@ -409,7 +414,7 @@ class User extends Authenticatable implements SendsEmail
         $expiryMinutes = config('constants.email_change.verification_code_expiry_minutes', 10);
         $expiresAt = Carbon::now()->addMinutes($expiryMinutes);
 
-        $this->forceFill([
+        $this->fill([
             'pending_email' => $newEmail,
             'email_change_code' => $code,
             'email_change_code_expires_at' => $expiresAt,