From bba1cb38321f21bd4d5fd2433ee1175be39bfdb3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 15 Feb 2024 13:44:40 +0100
Subject: [PATCH] fix: ec2 does not have uptime command lol version++

---
 app/Livewire/Boarding/Index.php     |  3 +-
 app/Models/Server.php               |  3 +-
 bootstrap/helpers/remoteProcess.php | 50 -----------------------------
 config/sentry.php                   |  2 +-
 config/version.php                  |  2 +-
 versions.json                       |  2 +-
 6 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index 8cb1dd7d2..09e15ddea 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -206,7 +206,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         try {
             config()->set('coolify.mux_enabled', false);
 
-            instant_remote_process(['uptime'], $this->createdServer, true);
+            // EC2 does not have `uptime` command, lol
+            instant_remote_process(['ls'], $this->createdServer, true);
 
             $this->createdServer->settings()->update([
                 'is_reachable' => true,
diff --git a/app/Models/Server.php b/app/Models/Server.php
index e4a7b895a..3e564a07f 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -400,7 +400,8 @@ class Server extends BaseModel
         if ($server->skipServer()) {
             return false;
         }
-        $uptime = instant_remote_process(['uptime'], $server, false);
+        // EC2 does not have `uptime` command, lol
+        $uptime = instant_remote_process(['ls'], $server, false);
         if (!$uptime) {
             $server->settings()->update([
                 'is_reachable' => false,
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index d981ca436..cec7e82aa 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -228,56 +228,6 @@ function refresh_server_connection(?PrivateKey $private_key = null)
     }
 }
 
-// function validateServer(Server $server, bool $throwError = false)
-// {
-//     try {
-//         $uptime = instant_remote_process(['uptime'], $server, $throwError);
-//         if (!$uptime) {
-//             $server->settings->is_reachable = false;
-//             $server->team->notify(new Unreachable($server));
-//             $server->unreachable_notification_sent = true;
-//             $server->save();
-//             return [
-//                 "uptime" => null,
-//                 "dockerVersion" => null,
-//             ];
-//         }
-//         $server->settings->is_reachable = true;
-//         instant_remote_process(["docker ps"], $server, $throwError);
-//         $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $server, $throwError);
-//         if (!$dockerVersion) {
-//             $dockerVersion = null;
-//             return [
-//                 "uptime" => $uptime,
-//                 "dockerVersion" => null,
-//             ];
-//         }
-//         $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
-//         if (is_null($dockerVersion)) {
-//             $server->settings->is_usable = false;
-//         } else {
-//             $server->settings->is_usable = true;
-//             if (data_get($server, 'unreachable_notification_sent') === true) {
-//                 $server->team->notify(new Revived($server));
-//                 $server->unreachable_notification_sent = false;
-//                 $server->save();
-//             }
-//         }
-//         return [
-//             "uptime" => $uptime,
-//             "dockerVersion" => $dockerVersion,
-//         ];
-//     } catch (\Throwable $e) {
-//         $server->settings->is_reachable = false;
-//         $server->settings->is_usable = false;
-//         throw $e;
-//     } finally {
-//         if (data_get($server, 'settings')) {
-//             $server->settings->save();
-//         }
-//     }
-// }
-
 function checkRequiredCommands(Server $server)
 {
     $commands = collect(["jq", "jc"]);
diff --git a/config/sentry.php b/config/sentry.php
index 355c5d8f1..80b7ffe7f 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.218',
+    'release' => '4.0.0-beta.219',
     // 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 720085e96..81f48a3c5 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.218';
+return '4.0.0-beta.219';
diff --git a/versions.json b/versions.json
index 562416b31..da42b0e85 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.218"
+            "version": "4.0.0-beta.219"
         }
     }
 }