From 16c71f364787e805170a8e98b62e720e5abeca19 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 11 Sep 2023 17:19:30 +0200 Subject: [PATCH] fix: old docker version error --- app/Http/Livewire/Server/Form.php | 5 +++-- app/Http/Livewire/Server/ShowPrivateKey.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 76dbb1a06..b3346fa23 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -56,14 +56,15 @@ class Form extends Component $this->uptime = $uptime; $this->emit('success', 'Server is reachable!'); } else { - throw new \Exception('Server is not rachable'); + $this->emit('error', 'Server is not rachable'); + return; } if ($dockerVersion) { $this->dockerVersion = $dockerVersion; $this->emit('proxyStatusUpdated'); $this->emit('success', 'Docker Engine 23+ is installed!'); } else { - throw new \Exception('Old Docker version detected (lower than 23).'); + $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.'); } } catch (\Exception $e) { return general_error_handler($e, that: $this); diff --git a/app/Http/Livewire/Server/ShowPrivateKey.php b/app/Http/Livewire/Server/ShowPrivateKey.php index fe75d8cfd..993afde00 100644 --- a/app/Http/Livewire/Server/ShowPrivateKey.php +++ b/app/Http/Livewire/Server/ShowPrivateKey.php @@ -38,12 +38,13 @@ class ShowPrivateKey extends Component if ($uptime) { $this->emit('success', 'Server is reachable with this private key.'); } else { - throw new \Exception('Server is not reachable with this private key.'); + $this->emit('error', 'Server is not reachable with this private key.'); + return; } if ($dockerVersion) { $this->emit('success', 'Server is usable for Coolify.'); } else { - throw new \Exception('Old Docker version detected (lower than 23).'); + $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.'); } } catch (\Exception $e) { throw new \Exception($e->getMessage());