From f5d16c46cb48e19b60a15ddf09f0c68aeb545c37 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 11 Oct 2023 13:11:52 +0200 Subject: [PATCH 1/5] version++ --- 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 48463cf03..f5b1c39b0 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.76', + 'release' => '4.0.0-beta.77', // 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 5c888f006..b6e86f8a8 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Wed, 11 Oct 2023 13:12:29 +0200 Subject: [PATCH 2/5] fix: cannot remove localhost --- resources/views/livewire/server/form.blade.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 227765c4e..515ec3eb4 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -26,7 +26,8 @@ Server is reachable and validated. @endif @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id !== 0) - + Validate Server & Install Docker Engine @endif @@ -59,13 +60,13 @@ helper="Disk cleanup job will be executed if disk usage is more than this number." /> @endif -

Danger Zone

-
Woah. I hope you know what are you doing.
-

Delete Server

-
This will remove this server from Coolify. Beware! There is no coming - back! -
- @if ($server->id !== 0 || isDev()) + @if ($server->id !== 0) +

Danger Zone

+
Woah. I hope you know what are you doing.
+

Delete Server

+
This will remove this server from Coolify. Beware! There is no coming + back! +
Delete From 9535c8df29037896c3a8a731528c17612a95ab64 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 11 Oct 2023 13:30:36 +0200 Subject: [PATCH 3/5] fix: check localhost connection --- app/Http/Livewire/Server/Form.php | 15 +++++++++++++-- resources/views/livewire/server/form.blade.php | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 18fb1dbec..efe4f73eb 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -61,7 +61,18 @@ class Form extends Component $activity = InstallDocker::run($this->server); $this->emit('newMonitorActivity', $activity->id); } - + public function checkLocalhostConnection() { + $uptime = $this->server->validateConnection(); + if ($uptime) { + $this->emit('success', 'Server is reachable.'); + $this->server->settings->is_reachable = true; + $this->server->settings->is_usaable = true; + $this->server->settings->save(); + } else { + $this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); + return; + } + } public function validateServer($install = true) { try { @@ -69,7 +80,7 @@ class Form extends Component if ($uptime) { $install && $this->emit('success', 'Server is reachable.'); } else { - $install &&$this->emit('error', 'Server is not reachable. Please check your connection and private key configuration.'); + $install &&$this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); return; } $dockerInstalled = $this->server->validateDockerEngine(); diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 515ec3eb4..d5382fd50 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -31,6 +31,12 @@ Validate Server & Install Docker Engine @endif + @if ($server->id === 0) + + Validate Server + + @endif
From 40ec3d97535b8883540ca7bada29a7ec5808733f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 11 Oct 2023 13:34:51 +0200 Subject: [PATCH 4/5] fix --- app/Http/Livewire/Server/Form.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index efe4f73eb..d053ca4bd 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -66,7 +66,7 @@ class Form extends Component if ($uptime) { $this->emit('success', 'Server is reachable.'); $this->server->settings->is_reachable = true; - $this->server->settings->is_usaable = true; + $this->server->settings->is_usable = true; $this->server->settings->save(); } else { $this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); @@ -128,6 +128,7 @@ class Form extends Component $this->emit('error', 'IP address is already in use by another team.'); return; } + refresh_server_connection($this->server->privateKey); $this->server->settings->wildcard_domain = $this->wildcard_domain; $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage; $this->server->settings->save(); From 0b0ae55f0bbdb942abf6217884f6681cc36498b3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 11 Oct 2023 13:47:14 +0200 Subject: [PATCH 5/5] fix --- app/Jobs/ContainerStatusJob.php | 5 ++++- docker/testing-host/Dockerfile | 2 +- resources/views/livewire/server/form.blade.php | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index e175aeb8f..1ed74c750 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -44,7 +44,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted public function handle() { try { - // ray("checking server status for {$this->server->name}"); + ray("checking server status for {$this->server->name}"); // ray()->clearAll(); $serverUptimeCheckNumber = $this->server->unreachable_count; $serverUptimeCheckNumberMax = 3; @@ -59,6 +59,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted $this->server->settings()->update([ 'is_reachable' => false, ]); + $this->server->update([ + 'unreachable_count' => 0, + ]); return; } $result = $this->server->validateConnection(); diff --git a/docker/testing-host/Dockerfile b/docker/testing-host/Dockerfile index d78b6f03e..6d0d0d5c5 100644 --- a/docker/testing-host/Dockerfile +++ b/docker/testing-host/Dockerfile @@ -27,4 +27,4 @@ RUN mkdir -p ~/.ssh RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuGmoeGq/pojrsyP1pszcNVuZx9iFkCELtxrh31QJ68 coolify@coolify-instance" >> ~/.ssh/authorized_keys EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] +CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0", "-o", "Port=22"] diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index d5382fd50..462d07857 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -31,7 +31,7 @@ Validate Server & Install Docker Engine @endif - @if ($server->id === 0) + @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id === 0) Validate Server @@ -42,7 +42,7 @@ + helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.
Example:
In case you set:https://example.com your applications will get:
https://randomId.example.com" /> {{-- --}}