diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index ac548a951..2cdc7ea2c 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -5,6 +5,7 @@ namespace App\Actions\Server; use Lorisleiva\Actions\Concerns\AsAction; use App\Models\InstanceSettings; use App\Models\Server; +use Illuminate\Support\Facades\Log; class UpdateCoolify { @@ -12,12 +13,10 @@ class UpdateCoolify public ?Server $server = null; public ?string $latestVersion = null; public ?string $currentVersion = null; - public bool $async = false; - public function handle(bool $force = false, bool $async = false) + public function handle() { try { - $this->async = $async; $settings = InstanceSettings::get(); ray('Running InstanceAutoUpdateJob'); $this->server = Server::find(0); @@ -27,24 +26,20 @@ class UpdateCoolify CleanupDocker::run($this->server, false); $this->latestVersion = get_latest_version_of_coolify(); $this->currentVersion = config('version'); - // if ($settings->next_channel) { - // ray('next channel enabled'); - // $this->latestVersion = 'next'; - // } - if ($force) { - $this->update(); - } else { - if (!$settings->is_auto_update_enabled) { - return 'Auto update is disabled'; - } - if ($this->latestVersion === $this->currentVersion) { - return 'Already on latest version'; - } - if (version_compare($this->latestVersion, $this->currentVersion, '<')) { - return 'Latest version is lower than current version?!'; - } - $this->update(); + if (!$settings->is_auto_update_enabled) { + Log::info('Auto update is disabled'); + throw 'Auto update is disabled'; } + if ($this->latestVersion === $this->currentVersion) { + Log::info('Already on latest version'); + throw 'Already on latest version'; + } + if (version_compare($this->latestVersion, $this->currentVersion, '<')) { + Log::info('Latest version is lower than current version?!'); + throw 'Latest version is lower than current version?!'; + } + Log::info("Updating from {$this->currentVersion} -> {$this->latestVersion}"); + $this->update(); } catch (\Throwable $e) { ray('InstanceAutoUpdateJob failed'); ray($e->getMessage()); @@ -56,34 +51,16 @@ class UpdateCoolify private function update() { if (isDev()) { - ray("Running update on local docker container. Updating to $this->latestVersion"); - if ($this->async) { - ray('Running async update'); - remote_process([ - "sleep 10" - ], $this->server); - } else { - instant_remote_process([ - "sleep 10" - ], $this->server); - } - ray('Update done'); - return; - } else { - ray('Running update on production server'); - if ($this->async) { - remote_process([ - "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh", - "bash /data/coolify/source/upgrade.sh $this->latestVersion" - ], $this->server); - } else { - instant_remote_process([ - "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh", - "bash /data/coolify/source/upgrade.sh $this->latestVersion" - ], $this->server); - } - send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}"); + instant_remote_process([ + "sleep 10" + ], $this->server); return; } + instant_remote_process([ + "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh", + "bash /data/coolify/source/upgrade.sh $this->latestVersion" + ], $this->server); + send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}"); + return; } } diff --git a/app/Jobs/InstanceAutoUpdateJob.php b/app/Jobs/InstanceAutoUpdateJob.php index dc35aa2b1..ae629dab9 100644 --- a/app/Jobs/InstanceAutoUpdateJob.php +++ b/app/Jobs/InstanceAutoUpdateJob.php @@ -18,12 +18,12 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr public $timeout = 600; public $tries = 1; - public function __construct(private bool $force = false) + public function __construct() { } public function handle(): void { - UpdateCoolify::run(force: $this->force, async: false); + UpdateCoolify::run(); } } diff --git a/app/Livewire/Upgrade.php b/app/Livewire/Upgrade.php index 9dc51ccb3..ba9fad7fd 100644 --- a/app/Livewire/Upgrade.php +++ b/app/Livewire/Upgrade.php @@ -33,7 +33,7 @@ class Upgrade extends Component } $this->rateLimit(1, 60); $this->updateInProgress = true; - UpdateCoolify::run(force: true, async: false); + UpdateCoolify::run(); } catch (\Throwable $e) { return handleError($e, $this); }