Merge pull request #5366 from djsisson/fix_delete_logic
change cleanup logic when restarting containers
This commit is contained in:
@@ -26,7 +26,7 @@ class StopDatabase
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->stopContainer($database, $database->uuid, 300);
|
$this->stopContainer($database, $database->uuid, 300);
|
||||||
if (! $isDeleteOperation) {
|
if ($isDeleteOperation) {
|
||||||
if ($dockerCleanup) {
|
if ($dockerCleanup) {
|
||||||
CleanupDocker::dispatch($server, true);
|
CleanupDocker::dispatch($server, true);
|
||||||
}
|
}
|
||||||
|
@@ -23,7 +23,7 @@ class StopService
|
|||||||
$containersToStop = $service->getContainersToStop();
|
$containersToStop = $service->getContainersToStop();
|
||||||
$service->stopContainers($containersToStop, $server);
|
$service->stopContainers($containersToStop, $server);
|
||||||
|
|
||||||
if (! $isDeleteOperation) {
|
if ($isDeleteOperation) {
|
||||||
$service->delete_connected_networks($service->uuid);
|
$service->delete_connected_networks($service->uuid);
|
||||||
if ($dockerCleanup) {
|
if ($dockerCleanup) {
|
||||||
CleanupDocker::dispatch($server, true);
|
CleanupDocker::dispatch($server, true);
|
||||||
|
Reference in New Issue
Block a user