From 9e09c449cf63c5d9ec6410ea76a135979dcb3fc9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 29 Jan 2024 16:03:45 +0100 Subject: [PATCH] fix: service deletion function --- app/Actions/Service/DeleteService.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Actions/Service/DeleteService.php b/app/Actions/Service/DeleteService.php index c42a8ec4a..743158c2d 100644 --- a/app/Actions/Service/DeleteService.php +++ b/app/Actions/Service/DeleteService.php @@ -32,13 +32,14 @@ class DeleteService } $database->forceDelete(); } - foreach ($storagesToDelete as $storage) { - $commands[] = "docker volume rm -f $storage->name"; + if ($server->isFunctional()) { + foreach ($storagesToDelete as $storage) { + $commands[] = "docker volume rm -f $storage->name"; + } + $commands[] = "docker rm -f $service->uuid"; + + instant_remote_process($commands, $server, false); } - $commands[] = "docker rm -f $service->uuid"; - - instant_remote_process($commands, $server, false); - $service->forceDelete(); } }