From f8d607b06fae063ad110b6147c4a4cb1411b7787 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 19:35:38 +0200 Subject: [PATCH 1/4] chore: Update version numbers to 4.0.0-beta.292 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index e4861e285..744642dae 100644 --- a/config/sentry.php +++ b/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.291', + 'release' => '4.0.0-beta.292', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 2d27ac881..c7756dc4f 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Thu, 30 May 2024 19:35:44 +0200 Subject: [PATCH 2/4] fix: spamming :D --- app/Actions/Server/UpdateCoolify.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 04bfbac06..37cb69445 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -27,16 +27,16 @@ class UpdateCoolify $this->latestVersion = get_latest_version_of_coolify(); $this->currentVersion = config('version'); if (!$settings->is_auto_update_enabled) { - Log::info('Auto update is disabled'); - throw new \Exception('Auto update is disabled'); + Log::debug('Auto update is disabled'); + return; } if ($this->latestVersion === $this->currentVersion) { - Log::info('Already on latest version'); - throw new \Exception('Already on latest version'); + Log::debug('Already on latest version'); + return; } if (version_compare($this->latestVersion, $this->currentVersion, '<')) { - Log::info('Latest version is lower than current version?!'); - throw new \Exception('Latest version is lower than current version?!'); + Log::debug('Latest version is lower than current version?!'); + return; } Log::info("Updating from {$this->currentVersion} -> {$this->latestVersion}"); $this->update(); From 30a978334828b20bde85af85c8f4b1fd8b4fdc3f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 19:38:33 +0200 Subject: [PATCH 3/4] feat: Add manual update option to UpdateCoolify handle method --- app/Actions/Server/UpdateCoolify.php | 26 ++++++++++++++------------ app/Livewire/Upgrade.php | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 37cb69445..dd126009c 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -14,7 +14,7 @@ class UpdateCoolify public ?string $latestVersion = null; public ?string $currentVersion = null; - public function handle() + public function handle($manual_update = false) { try { $settings = InstanceSettings::get(); @@ -26,17 +26,19 @@ class UpdateCoolify CleanupDocker::run($this->server, false); $this->latestVersion = get_latest_version_of_coolify(); $this->currentVersion = config('version'); - if (!$settings->is_auto_update_enabled) { - Log::debug('Auto update is disabled'); - return; - } - if ($this->latestVersion === $this->currentVersion) { - Log::debug('Already on latest version'); - return; - } - if (version_compare($this->latestVersion, $this->currentVersion, '<')) { - Log::debug('Latest version is lower than current version?!'); - return; + if (!$manual_update) { + if (!$settings->is_auto_update_enabled) { + Log::debug('Auto update is disabled'); + return; + } + if ($this->latestVersion === $this->currentVersion) { + Log::debug('Already on latest version'); + return; + } + if (version_compare($this->latestVersion, $this->currentVersion, '<')) { + Log::debug('Latest version is lower than current version?!'); + return; + } } Log::info("Updating from {$this->currentVersion} -> {$this->latestVersion}"); $this->update(); diff --git a/app/Livewire/Upgrade.php b/app/Livewire/Upgrade.php index ba9fad7fd..5bb4143c0 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(); + UpdateCoolify::run(manual_update: true); } catch (\Throwable $e) { return handleError($e, $this); } From cd58e0d01eac98cbcbac1520240514467975b401 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 19:45:36 +0200 Subject: [PATCH 4/4] fixes --- app/Actions/Server/UpdateCoolify.php | 2 +- app/Livewire/Upgrade.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index dd126009c..16a01fb6f 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -54,7 +54,7 @@ class UpdateCoolify { if (isDev()) { instant_remote_process([ - "sleep 10" + "sleep 1" ], $this->server); return; } diff --git a/app/Livewire/Upgrade.php b/app/Livewire/Upgrade.php index 5bb4143c0..e81ee93e6 100644 --- a/app/Livewire/Upgrade.php +++ b/app/Livewire/Upgrade.php @@ -5,11 +5,9 @@ namespace App\Livewire; use App\Actions\Server\UpdateCoolify; use Livewire\Component; -use DanHarrin\LivewireRateLimiting\WithRateLimiting; class Upgrade extends Component { - use WithRateLimiting; public bool $showProgress = false; public bool $updateInProgress = false; public bool $isUpgradeAvailable = false; @@ -31,7 +29,6 @@ class Upgrade extends Component if ($this->updateInProgress) { return; } - $this->rateLimit(1, 60); $this->updateInProgress = true; UpdateCoolify::run(manual_update: true); } catch (\Throwable $e) {