From 2d1d03bf8e599bb87756f712143c16dbd0d3e208 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 20:02:03 +0200 Subject: [PATCH 1/4] chore: Update version numbers to 4.0.0-beta.293 --- 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 744642dae..602ef922a 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.292', + 'release' => '4.0.0-beta.293', // 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 c7756dc4f..7f9358574 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Thu, 30 May 2024 20:02:11 +0200 Subject: [PATCH 2/4] async update process --- app/Actions/Server/UpdateCoolify.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 16a01fb6f..512c1b380 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -53,12 +53,12 @@ class UpdateCoolify private function update() { if (isDev()) { - instant_remote_process([ - "sleep 1" + remote_process([ + "sleep 10" ], $this->server); return; } - instant_remote_process([ + 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); From 40a71a11cbe39c69ae6eed896733a746236e88d9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 20:07:06 +0200 Subject: [PATCH 3/4] chore: Add upgrade guide link to upgrade.blade.php --- resources/views/livewire/upgrade.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/livewire/upgrade.blade.php b/resources/views/livewire/upgrade.blade.php index 8e722dbe4..a7df1d99b 100644 --- a/resources/views/livewire/upgrade.blade.php +++ b/resources/views/livewire/upgrade.blade.php @@ -60,6 +60,8 @@

You can review the changelogs here.

+

If something goes wrong, You can check the following guide on what to do.

@if ($showProgress)

Progress

From 7c9790dff04d2b9895bff86add1c1dc1ef652308 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 30 May 2024 20:07:42 +0200 Subject: [PATCH 4/4] chore: Improve upgrade.blade.php with clearer instructions and formatting --- resources/views/livewire/upgrade.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/livewire/upgrade.blade.php b/resources/views/livewire/upgrade.blade.php index a7df1d99b..4b235b6ec 100644 --- a/resources/views/livewire/upgrade.blade.php +++ b/resources/views/livewire/upgrade.blade.php @@ -60,7 +60,8 @@

You can review the changelogs here.

-

If something goes wrong, You can check the following +

If something goes wrong and you cannot upgrade your instance, You can check the following guide on what to do.

@if ($showProgress)