From 694169bb8405ee63cbd25ad845eafea4c3e2a748 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Dec 2023 18:09:01 +0100 Subject: [PATCH 1/4] fix: why?! --- app/Jobs/ContainerStatusJob.php | 2 +- app/Models/Server.php | 1 + config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index a8b2c1a9a..61c0cc3fe 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -39,7 +39,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted public function __construct(public Server $server) { - // $this->handle(); + $this->handle(); } public function handle() diff --git a/app/Models/Server.php b/app/Models/Server.php index 7cc0983c0..bf91f6d86 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -164,6 +164,7 @@ class Server extends BaseModel ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax); $result = $this->validateConnection(); + ray($result); if ($result) { if ($this->unreachable_notification_sent === true) { $this->update(['unreachable_notification_sent' => false]); diff --git a/config/sentry.php b/config/sentry.php index a0aeeb38b..a039d0970 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.169', + 'release' => '4.0.0-beta.170', // 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 bf8f3671d..989b08f3e 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Wed, 20 Dec 2023 20:01:45 +0100 Subject: [PATCH 2/4] Comment out handle() method call in ContainerStatusJob constructor --- app/Jobs/ContainerStatusJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index 61c0cc3fe..a8b2c1a9a 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -39,7 +39,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted public function __construct(public Server $server) { - $this->handle(); + // $this->handle(); } public function handle() From ac19f0e34f397e4f0b01beff921663187fa80872 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Dec 2023 08:46:48 +0100 Subject: [PATCH 3/4] enable docker image swarms --- app/Livewire/Project/New/Select.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php index 80a41d7c7..0ba58c28a 100644 --- a/app/Livewire/Project/New/Select.php +++ b/app/Livewire/Project/New/Select.php @@ -123,7 +123,7 @@ class Select extends Component $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false); break; } - if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty') || str($type)->startsWith('docker-image')) { + if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty')) { $this->isDatabase = true; $this->includeSwarm = false; $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false); From 665e3761c45e03ad015b2399fee707fcf451dc15 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Dec 2023 08:48:53 +0100 Subject: [PATCH 4/4] fix: stay tuned --- resources/views/livewire/project/new/select.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index cc252c827..adc3f3600 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -202,6 +202,10 @@
  • Select a Server
  • Select a Destination
  • + @if ($isDatabase) +
    Swarm clusters are excluded from this type of resource at the moment. It will + be activated soon. Stay tuned.
    + @endif {{-- @if ($isDatabase)