From 6e9960c010305f15fa2e58a6f7bf89ef3ccf3b0b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 17 Jan 2025 13:44:37 +0100 Subject: [PATCH] revert revert so it will be good (say what?) --- composer.json | 2 +- composer.lock | 17 ++++---- database/seeders/ProductionSeeder.php | 57 +++++++++++++-------------- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/composer.json b/composer.json index b983f6ed8..f01913b5f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "doctrine/dbal": "^4.2", "guzzlehttp/guzzle": "^7.5.0", "laravel/fortify": "^1.16.0", - "laravel/framework": "11.35.0", + "laravel/framework": "^11.0", "laravel/horizon": "^5.29.1", "laravel/pail": "^1.1", "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0", diff --git a/composer.lock b/composer.lock index 998584b4f..97b40f7c7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ef45e2ecf9ff00aa6c51c0f49fd072e0", + "content-hash": "9c1a0833be38d1f058f216dcaa522077", "packages": [ { "name": "3sidedcube/laravel-redoc", @@ -2733,16 +2733,16 @@ }, { "name": "laravel/framework", - "version": "v11.35.0", + "version": "v11.38.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc" + "reference": "9d290aa90fcad44048bedca5219d2b872e98772a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc", - "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc", + "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a", + "reference": "9d290aa90fcad44048bedca5219d2b872e98772a", "shasum": "" }, "require": { @@ -2763,7 +2763,7 @@ "guzzlehttp/uri-template": "^1.0", "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0", "laravel/serializable-closure": "^1.3|^2.0", - "league/commonmark": "^2.2.1", + "league/commonmark": "^2.6", "league/flysystem": "^3.25.1", "league/flysystem-local": "^3.25.1", "league/uri": "^7.5.1", @@ -2778,7 +2778,7 @@ "symfony/console": "^7.0.3", "symfony/error-handler": "^7.0.3", "symfony/finder": "^7.0.3", - "symfony/http-foundation": "^7.0.3", + "symfony/http-foundation": "^7.2.0", "symfony/http-kernel": "^7.0.3", "symfony/mailer": "^7.0.3", "symfony/mime": "^7.0.3", @@ -2792,7 +2792,6 @@ "voku/portable-ascii": "^2.0.2" }, "conflict": { - "mockery/mockery": "1.6.8", "tightenco/collect": "<5.5.33" }, "provide": { @@ -2944,7 +2943,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-12-10T16:09:29+00:00" + "time": "2025-01-15T00:06:46+00:00" }, { "name": "laravel/horizon", diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index 3bcf7d193..268fd8291 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -63,13 +63,40 @@ class ProductionSeeder extends Seeder ]); } + if (! isCloud() && config('constants.coolify.is_windows_docker_desktop') == false) { + $coolify_key_name = '@host.docker.internal'; + $ssh_keys_directory = Storage::disk('ssh-keys')->files(); + $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name)); + + $private_key_found = PrivateKey::find(0); + if (! $private_key_found) { + if ($coolify_key) { + $user = str($coolify_key)->before('@')->after('id.'); + $coolify_key = Storage::disk('ssh-keys')->get($coolify_key); + PrivateKey::create([ + 'id' => 0, + 'team_id' => 0, + 'name' => 'localhost\'s key', + 'description' => 'The private key for the Coolify host machine (localhost).', + 'private_key' => $coolify_key, + ]); + echo "SSH key found for the Coolify host machine (localhost).\n"; + } else { + echo "No SSH key found for the Coolify host machine (localhost).\n"; + echo "Please read the following documentation (point 3) to fix it: https://coolify. + io/docs/knowledge-base/server/openssh/\n"; + echo "Your localhost connection won't work until then."; + } + } + } + if (! isCloud()) { if (Server::find(0) == null) { $server_details = [ 'id' => 0, 'name' => 'localhost', 'description' => "This is the server where Coolify is running on. Don't delete this!", - 'user' => 'root', + 'user' => $user, 'ip' => 'host.docker.internal', 'team_id' => 0, 'private_key_id' => 0, @@ -98,35 +125,7 @@ class ProductionSeeder extends Seeder ]); } } - if (! isCloud() && config('constants.coolify.is_windows_docker_desktop') == false) { - $coolify_key_name = '@host.docker.internal'; - $ssh_keys_directory = Storage::disk('ssh-keys')->files(); - $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name)); - $private_key_found = PrivateKey::find(0); - if (! $private_key_found) { - if ($coolify_key) { - $user = str($coolify_key)->before('@')->after('id.'); - $coolify_key = Storage::disk('ssh-keys')->get($coolify_key); - PrivateKey::create([ - 'id' => 0, - 'team_id' => 0, - 'name' => 'localhost\'s key', - 'description' => 'The private key for the Coolify host machine (localhost).', - 'private_key' => $coolify_key, - ]); - $server = Server::find(0); - $server->user = $user; - $server->save(); - echo "SSH key found for the Coolify host machine (localhost).\n"; - } else { - echo "No SSH key found for the Coolify host machine (localhost).\n"; - echo "Please read the following documentation (point 3) to fix it: https://coolify. - io/docs/knowledge-base/server/openssh/\n"; - echo "Your localhost connection won't work until then."; - } - } - } if (config('constants.coolify.is_windows_docker_desktop')) { PrivateKey::updateOrCreate( [