From c8434acd0d7d2a3d0b3af05564669edb40ccb8e2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 14 Apr 2023 10:00:42 +0200
Subject: [PATCH] fixes

---
 .dockerignore                                 |  3 +-
 .gitignore                                    |  2 +-
 app/Http/Livewire/CheckUpdate.php             | 29 +++++++++++++++++++
 app/Providers/AppServiceProvider.php          |  8 +++++
 bootstrap/app.php                             |  2 ++
 database/seeders/ProductionSeeder.php         | 27 +++++++++++++++++
 database/seeders/ServerSeeder.php             | 22 +++++++-------
 database/seeders/ServerSettingSeeder.php      |  8 ++---
 database/seeders/StandaloneDockerSeeder.php   |  4 +--
 database/seeders/SwarmDockerSeeder.php        |  4 +--
 docker-compose.yml                            |  2 ++
 resources/views/components/navbar.blade.php   |  1 +
 .../views/livewire/check-update.blade.php     |  4 +++
 routes/web.php                                |  3 ++
 14 files changed, 98 insertions(+), 21 deletions(-)
 create mode 100644 app/Http/Livewire/CheckUpdate.php
 create mode 100644 database/seeders/ProductionSeeder.php
 create mode 100644 resources/views/livewire/check-update.blade.php

diff --git a/.dockerignore b/.dockerignore
index 289ee8140..92de37bc1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,6 +5,7 @@
 /public/storage
 /storage/*.key
 /vendor
+.env.example
 .env
 .env.backup
 .env.production
@@ -19,5 +20,5 @@ yarn-error.log
 /.vscode
 /.npm
 /.bash_history
-/_volumes/*
+/_volumes
 
diff --git a/.gitignore b/.gitignore
index 2f7d79a71..1b23aac6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ yarn-error.log
 /.vscode
 /.npm
 /.bash_history
-/_volumes/*
+/_volumes
diff --git a/app/Http/Livewire/CheckUpdate.php b/app/Http/Livewire/CheckUpdate.php
new file mode 100644
index 000000000..17b83387e
--- /dev/null
+++ b/app/Http/Livewire/CheckUpdate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Models\Server;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Process;
+use Livewire\Component;
+
+class CheckUpdate extends Component
+{
+    public $updateAvailable = false;
+    public $latestVersion = '4.0.0-nightly.1';
+    protected $currentVersion;
+    protected $image = 'ghcr.io/coollabsio/coolify';
+
+    public function checkUpdate()
+    {
+        $response = Http::get('https://get.coollabs.io/versions.json');
+        $versions = $response->json();
+        // $this->latestVersion = data_get($versions, 'coolify.main.version');
+        $this->currentVersion = config('coolify.version');
+        version_compare($this->currentVersion, $this->latestVersion, '<') ? $this->updateAvailable = true : $this->updateAvailable = false;
+    }
+    public function render()
+    {
+        return view('livewire.check-update');
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 984d714cd..5813a6235 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Queue\Events\JobProcessed;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\ServiceProvider;
 
@@ -13,6 +14,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
+        // @TODO: Is this the best place to run the seeder?
+        // if (env('APP_ENV') === 'production') {
+        //     dump('Seed default data.');
+        //     Process::run('php artisan db:seed --class=ProductionSeeder --force');
+        // } else {
+        //     dump('Not in production environment.');
+        // }
         //
     }
 
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 037e17df0..55afdbffb 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,6 +11,8 @@
 |
 */
 
+use Illuminate\Support\Facades\Artisan;
+
 $app = new Illuminate\Foundation\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
new file mode 100644
index 000000000..c959294aa
--- /dev/null
+++ b/database/seeders/ProductionSeeder.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\Team;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Storage;
+
+class ProductionSeeder extends Seeder
+{
+    public function run(): void
+    {
+        $coolify_key = Storage::disk('local')->get('ssh-keys/coolify.dsa');
+        if (PrivateKey::where('name', 'Coolify Host')->doesntExist()) {
+            PrivateKey::create([
+                "id" => 0,
+                "name" => "Coolify Host",
+                "description" => "This is the private key for the server where Coolify is hosted.",
+                "private_key" => $coolify_key,
+            ]);
+        } else {
+            dump('Coolify SSH Key already exists.');
+        }
+    }
+}
diff --git a/database/seeders/ServerSeeder.php b/database/seeders/ServerSeeder.php
index 632d947d4..10e0484bc 100644
--- a/database/seeders/ServerSeeder.php
+++ b/database/seeders/ServerSeeder.php
@@ -16,9 +16,17 @@ public function run(): void
     {
         $root_team = Team::find(1);
         $private_key_1 = PrivateKey::find(1);
-
         Server::create([
             'id' => 1,
+            'name' => "localhost",
+            'description' => "This is the local machine",
+            'user' => 'root',
+            'ip' => "host.docker.internal",
+            'team_id' => $root_team->id,
+            'private_key_id' => $private_key_1->id,
+        ]);
+        Server::create([
+            'id' => 2,
             'name' => "testing-local-docker-container",
             'description' => "This is a test docker container",
             'ip' => "coolify-testing-host",
@@ -26,21 +34,13 @@ public function run(): void
             'private_key_id' => $private_key_1->id,
         ]);
         Server::create([
-            'id' => 2,
+            'id' => 3,
             'name' => "testing-local-docker-container-2",
             'description' => "This is a test docker container",
             'ip' => "coolify-testing-host-2",
             'team_id' => $root_team->id,
             'private_key_id' => $private_key_1->id,
         ]);
-        Server::create([
-            'id' => 3,
-            'name' => "localhost",
-            'description' => "This is the local machine",
-            'user' => 'root',
-            'ip' => "coolify-testing-host",
-            'team_id' => $root_team->id,
-            'private_key_id' => $private_key_1->id,
-        ]);
+
     }
 }
diff --git a/database/seeders/ServerSettingSeeder.php b/database/seeders/ServerSettingSeeder.php
index a7d5dd97d..5ea0d59c1 100644
--- a/database/seeders/ServerSettingSeeder.php
+++ b/database/seeders/ServerSettingSeeder.php
@@ -13,13 +13,13 @@ class ServerSettingSeeder extends Seeder
      */
     public function run(): void
     {
-        $server_1 = Server::find(1)->load(['settings']);
-        $server_1->settings->is_build_server = true;
-        $server_1->settings->save();
-
         $server_2 = Server::find(2)->load(['settings']);
         $server_2->settings->is_build_server = true;
         $server_2->settings->save();
 
+        $server_3 = Server::find(3)->load(['settings']);
+        $server_3->settings->is_build_server = true;
+        $server_3->settings->save();
+
     }
 }
diff --git a/database/seeders/StandaloneDockerSeeder.php b/database/seeders/StandaloneDockerSeeder.php
index 9dd27f063..77583700f 100644
--- a/database/seeders/StandaloneDockerSeeder.php
+++ b/database/seeders/StandaloneDockerSeeder.php
@@ -15,11 +15,11 @@ class StandaloneDockerSeeder extends Seeder
      */
     public function run(): void
     {
-        $server_3 = Server::find(3);
+        $server_1 = Server::find(1);
         StandaloneDocker::create([
             'id' => 1,
             'network' => 'coolify',
-            'server_id' => $server_3->id,
+            'server_id' => $server_1->id,
         ]);
     }
 }
diff --git a/database/seeders/SwarmDockerSeeder.php b/database/seeders/SwarmDockerSeeder.php
index 2d1a87b53..6a219f3fd 100644
--- a/database/seeders/SwarmDockerSeeder.php
+++ b/database/seeders/SwarmDockerSeeder.php
@@ -16,10 +16,10 @@ class SwarmDockerSeeder extends Seeder
      */
     public function run(): void
     {
-        $server_1 = Server::find(1);
+        $server_2 = Server::find(2);
         SwarmDocker::create([
             'id' => 1,
-            'server_id' => $server_1->id,
+            'server_id' => $server_2->id,
         ]);
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 094a02c97..24b83b4b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,8 @@ version: '3.8'
 services:
   coolify:
     working_dir: /var/www/html
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
     networks:
       - coolify
     depends_on:
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 1d2400fd1..3427f2adc 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -14,5 +14,6 @@
             @csrf
             <button type="submit">Logout</button>
         </form>
+        <livewire:check-update>
     @endauth
 </nav>
diff --git a/resources/views/livewire/check-update.blade.php b/resources/views/livewire/check-update.blade.php
new file mode 100644
index 000000000..5ba478a43
--- /dev/null
+++ b/resources/views/livewire/check-update.blade.php
@@ -0,0 +1,4 @@
+<div>
+    <button wire:click='checkUpdate'>Updates</button>
+    {{ $updateAvailable ? 'Update available' : 'No updates' }}
+</div>
diff --git a/routes/web.php b/routes/web.php
index c2ce8690b..6aa837d2d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,6 +32,9 @@
     Route::get('/profile', function () {
         return view('profile');
     });
+    Route::get('/update', function () {
+        return view('update');
+    });
     Route::get('/demo', function () {
         return view('demo');
     });