From 1feb8488a38ca003745b397d67c4335501711546 Mon Sep 17 00:00:00 2001 From: Alexzvn Date: Mon, 29 Jul 2024 08:09:27 +0000 Subject: [PATCH] cleanup --- app/Jobs/ApplicationDeploymentJob.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 54a80a92a..2d3b0d5a6 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -2029,19 +2029,17 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); */ private function graceful_shutdown_container(string $containerName, int $timeout = 300) { try { - $this->execute_remote_command( + return $this->execute_remote_command( ["docker stop --time=$timeout $containerName > /dev/null 2>&1", 'hidden' => true], ["docker rm $containerName > /dev/null 2>&1", 'hidden' => true] ); - - return; } catch (\Exception $error) { // report error if needed - } finally { - $this->execute_remote_command( - ["docker rm -f $containerName >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true] - ); } + + $this->execute_remote_command( + ["docker rm -f $containerName >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true] + ); } private function stop_running_container(bool $force = false)