ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-17 04:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: service deletion fix

Browse Source
This commit is contained in:
Andras Bacsai
2024-01-30 08:26:33 +01:00
parent c3e2a741ea
commit 73d0948734
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Actions/Service/DeleteService.php
View File

@@ -10,10 +10,10 @@ class DeleteService
use AsAction; use AsAction;
public function handle(Service $service) public function handle(Service $service)
{ {
try {
$server = data_get($service, 'server'); $server = data_get($service, 'server');
if ($server->isFunctional()) { if ($server->isFunctional()) {
StopService::run($service); StopService::run($service);
}
$storagesToDelete = collect([]); $storagesToDelete = collect([]);
$service->environment_variables()->delete(); $service->environment_variables()->delete();
@@ -23,16 +23,13 @@ class DeleteService
foreach ($storages as $storage) { foreach ($storages as $storage) {
$storagesToDelete->push($storage); $storagesToDelete->push($storage);
} }
$application->forceDelete();
} }
foreach ($service->databases()->get() as $database) { foreach ($service->databases()->get() as $database) {
$storages = $database->persistentStorages()->get(); $storages = $database->persistentStorages()->get();
foreach ($storages as $storage) { foreach ($storages as $storage) {
$storagesToDelete->push($storage); $storagesToDelete->push($storage);
} }
$database->forceDelete();
} }
if ($server->isFunctional()) {
foreach ($storagesToDelete as $storage) { foreach ($storagesToDelete as $storage) {
$commands[] = "docker volume rm -f $storage->name"; $commands[] = "docker volume rm -f $storage->name";
} }
@@ -40,6 +37,16 @@ class DeleteService
instant_remote_process($commands, $server, false); instant_remote_process($commands, $server, false);
} }
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
} finally {
foreach ($service->applications()->get() as $application) {
$application->forceDelete();
}
foreach ($service->databases()->get() as $database) {
$database->forceDelete();
}
$service->forceDelete(); $service->forceDelete();
} }
} }
}