From a20c4e8a596c08d0d55dfcb7370152db2e64451d Mon Sep 17 00:00:00 2001 From: Luan Santos Date: Mon, 24 Nov 2014 15:35:32 -0800 Subject: [PATCH] Stop container before destroying it [#82596896] --- warden/lib/warden/container/insecure.rb | 1 + warden/lib/warden/container/linux.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/warden/lib/warden/container/insecure.rb b/warden/lib/warden/container/insecure.rb index aeb311c6..22c32a6a 100644 --- a/warden/lib/warden/container/insecure.rb +++ b/warden/lib/warden/container/insecure.rb @@ -33,6 +33,7 @@ def do_stop(request, response) end def do_destroy(request, response) + sh File.join(root_path, "stop.sh"), container_path, "-w", "0", raise: false sh File.join(root_path, "destroy.sh"), container_path logger.debug("Container destroyed") end diff --git a/warden/lib/warden/container/linux.rb b/warden/lib/warden/container/linux.rb index a3db519a..2d0735ab 100644 --- a/warden/lib/warden/container/linux.rb +++ b/warden/lib/warden/container/linux.rb @@ -120,6 +120,7 @@ def do_stop(request, response) end def do_destroy(request, response) + sh File.join(root_path, "stop.sh"), container_path, "-w", "0", raise: false sh File.join(root_path, "destroy.sh"), container_path logger.debug("Container destroyed")