dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' into main

Browse Source
This commit is contained in:
Marvin von Rappard
2024-11-14 12:54:04 +01:00
committed by GitHub
parent 80ed561374 b0f3f5378f
commit 7bdac8b42f
120 changed files with 11805 additions and 3231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
database/seeders/PopulateSshKeysDirectorySeeder.php
View File

@@ -24,9 +24,8 @@ class PopulateSshKeysDirectorySeeder extends Seeder
});
if (isDev()) {
$user = env('PUID').':'.env('PGID');
Process::run("chown -R $user ".storage_path('app/ssh/keys'));
Process::run("chown -R $user ".storage_path('app/ssh/mux'));
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/keys'));
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/mux'));
} else {
Process::run('chown -R 9999:root '.storage_path('app/ssh/keys'));
Process::run('chown -R 9999:root '.storage_path('app/ssh/mux'));

4
database/seeders/ProductionSeeder.php
View File

@@ -100,7 +100,7 @@ class ProductionSeeder extends Seeder
}
}
if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
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));
@@ -127,7 +127,7 @@ class ProductionSeeder extends Seeder
}
}
}
if (config('coolify.is_windows_docker_desktop')) {
if (config('constants.coolify.is_windows_docker_desktop')) {
PrivateKey::updateOrCreate(
[
'id' => 0,