ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-16 12:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-23 20:31:50 +02:00
parent 573e5c4913
commit 2841675691
4 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Commands/CleanupStuckedResources.php
View File

@@ -2,10 +2,12 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Jobs\CleanupHelperContainersJob;
use App\Models\Application; use App\Models\Application;
use App\Models\ApplicationPreview; use App\Models\ApplicationPreview;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Models\ScheduledTask; use App\Models\ScheduledTask;
use App\Models\Server;
use App\Models\Service; use App\Models\Service;
use App\Models\ServiceApplication; use App\Models\ServiceApplication;
use App\Models\ServiceDatabase; use App\Models\ServiceDatabase;
@@ -35,6 +37,16 @@ class CleanupStuckedResources extends Command
private function cleanup_stucked_resources() private function cleanup_stucked_resources()
{ {
try {
$servers = Server::all()->filter(function ($server) {
return $server->isFunctional();
});
foreach ($servers as $server) {
CleanupHelperContainersJob::dispatch($server);
}
} catch (\Throwable $e) {
echo "Error in cleaning stucked resources: {$e->getMessage()}\n";
}
try { try {
$applications = Application::withTrashed()->whereNotNull('deleted_at')->get(); $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
foreach ($applications as $application) { foreach ($applications as $application) {

4
bootstrap/helpers/shared.php
View File

@@ -1247,6 +1247,10 @@ function get_public_ips()
} }
$settings->update(['public_ipv4' => $ipv4]); $settings->update(['public_ipv4' => $ipv4]);
} }
} catch (\Exception $e) {
echo "Error: {$e->getMessage()}\n";
}
try {
$ipv6 = $second->output(); $ipv6 = $second->output();
if ($ipv6) { if ($ipv6) {
$ipv6 = trim($ipv6); $ipv6 = trim($ipv6);

39
database/seeders/PopulateSshKeysDirectorySeeder.php
View File

@@ -11,25 +11,30 @@ class PopulateSshKeysDirectorySeeder extends Seeder
{ {
public function run() public function run()
{ {
Storage::disk('ssh-keys')->deleteDirectory(''); try {
Storage::disk('ssh-keys')->makeDirectory(''); Storage::disk('ssh-keys')->deleteDirectory('');
Storage::disk('ssh-mux')->deleteDirectory(''); Storage::disk('ssh-keys')->makeDirectory('');
Storage::disk('ssh-mux')->makeDirectory(''); Storage::disk('ssh-mux')->deleteDirectory('');
Storage::disk('ssh-mux')->makeDirectory('');
PrivateKey::chunk(100, function ($keys) { PrivateKey::chunk(100, function ($keys) {
foreach ($keys as $key) { foreach ($keys as $key) {
echo 'Storing key: '.$key->name."\n"; echo 'Storing key: '.$key->name."\n";
$key->storeInFileSystem(); $key->storeInFileSystem();
}
});
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'));
} else {
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/keys'));
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/mux'));
} }
}); } catch (\Throwable $e) {
echo "Error: {$e->getMessage()}\n";
if (isDev()) { ray($e->getMessage());
$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'));
} else {
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/keys'));
Process::run('chown -R 9999:9999 '.storage_path('app/ssh/mux'));
} }
} }
} }

2
docker/prod/etc/s6-overlay/s6-rc.d/init-script/up
View File

@@ -1,3 +1,3 @@
#!/command/execlineb -P #!/command/execlineb -P
s6-setuidgid webuser s6-setuidgid webuser
php /var/www/html/artisan app:init --full-cleanup php /var/www/html/artisan app:init