From 7bdef134e6dac48983dbc64a8922a8d53da4810d Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:54:58 +0100 Subject: [PATCH] feat: get command and output for logs from CleanupDocker --- app/Actions/Server/CleanupDocker.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Actions/Server/CleanupDocker.php b/app/Actions/Server/CleanupDocker.php index 0349ead89..ba4c2311a 100644 --- a/app/Actions/Server/CleanupDocker.php +++ b/app/Actions/Server/CleanupDocker.php @@ -25,17 +25,25 @@ class CleanupDocker "docker images --filter before=$helperImageWithVersion --filter reference=$helperImage | grep $helperImage | awk '{print $3}' | xargs -r docker rmi -f", ]; - $serverSettings = $server->settings; - if ($serverSettings->delete_unused_volumes) { + if ($server->settings->delete_unused_volumes) { $commands[] = 'docker volume prune -af'; } - if ($serverSettings->delete_unused_networks) { + if ($server->settings->delete_unused_networks) { $commands[] = 'docker network prune -f'; } + $cleanupLog = []; foreach ($commands as $command) { - instant_remote_process([$command], $server, false); + $commandOutput = instant_remote_process([$command], $server, false); + if ($commandOutput !== null) { + $cleanupLog[] = [ + 'command' => $command, + 'output' => $commandOutput, + ]; + } } + + return $cleanupLog; } }