From 5c27f43b3dcd98ad24aefdcc82486af7d0517bad Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 12 Oct 2023 08:56:29 +0200 Subject: [PATCH] move autoupdate job to actions --- app/Actions/Server/UpdateCoolify.php | 4 +++- app/Http/Livewire/Upgrade.php | 2 +- app/Jobs/InstanceAutoUpdateJob.php | 2 +- database/seeders/ServerSeeder.php | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 3203f9b05..6fd74025c 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -2,16 +2,18 @@ namespace App\Actions\Server; +use Lorisleiva\Actions\Concerns\AsAction; use App\Models\InstanceSettings; use App\Models\Server; class UpdateCoolify { + use AsAction; public ?Server $server = null; public ?string $latestVersion = null; public ?string $currentVersion = null; - public function __invoke(bool $force) + public function handle(bool $force) { try { $settings = InstanceSettings::get(); diff --git a/app/Http/Livewire/Upgrade.php b/app/Http/Livewire/Upgrade.php index ca5f7df30..fc930a997 100644 --- a/app/Http/Livewire/Upgrade.php +++ b/app/Http/Livewire/Upgrade.php @@ -37,7 +37,7 @@ class Upgrade extends Component return; } $this->showProgress = true; - resolve(UpdateCoolify::class)(true); + UpdateCoolify::run(true); $this->emit('success', "Upgrading to {$this->latestVersion} version..."); } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Jobs/InstanceAutoUpdateJob.php b/app/Jobs/InstanceAutoUpdateJob.php index 814ae9cc9..99e0a34f3 100644 --- a/app/Jobs/InstanceAutoUpdateJob.php +++ b/app/Jobs/InstanceAutoUpdateJob.php @@ -23,6 +23,6 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr public function handle(): void { - resolve(UpdateCoolify::class)($this->force); + UpdateCoolify::run($this->force); } } diff --git a/database/seeders/ServerSeeder.php b/database/seeders/ServerSeeder.php index f201862f0..99ffa37ef 100644 --- a/database/seeders/ServerSeeder.php +++ b/database/seeders/ServerSeeder.php @@ -16,10 +16,6 @@ class ServerSeeder extends Seeder 'ip' => "coolify-testing-host", 'team_id' => 0, 'private_key_id' => 0, - // 'proxy' => ServerMetadata::from([ - // 'type' => ProxyTypes::TRAEFIK_V2->value, - // 'status' => ProxyStatus::EXITED->value - // ]), ]); } }