From f2b4f5411a31ea4f0d7317f83dafe016cc7471df Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 17 May 2014 12:16:32 -0700 Subject: [PATCH] providers/docker: don't use graceful shutdown [GH-3798] --- CHANGELOG.md | 2 ++ plugins/providers/docker/action.rb | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dcfcbed7..d32de2cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ BUG FIXES: and should show less stale data. [GH-3808] - commands/package: Package with `--base` for VirtualBox doesn't crash. [GH-3827] + - providers/docker: Never do graceful shutdown, always use + `docker stop`. [GH-3798] - provisioners/puppet: Fix setting facter vars with Windows guests. [GH-3776] - guests/freebsd: Properly register the rsync_pre capability diff --git a/plugins/providers/docker/action.rb b/plugins/providers/docker/action.rb index 13a64a4e8..10a8b8c50 100644 --- a/plugins/providers/docker/action.rb +++ b/plugins/providers/docker/action.rb @@ -91,18 +91,7 @@ module VagrantPlugins next end - b2.use Call, HasSSH do |env2, b3| - if !env2[:result] - b3.use Stop - next - end - - b3.use Call, GracefulHalt, :stopped, :running do |env3, b4| - if !env3[:result] - b4.use Stop - end - end - end + b2.use Stop end end end