From 067c1ca348304c72c86f6fb2103d1a3ac00604ff Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 18 Apr 2014 17:23:40 -0700 Subject: [PATCH] providers/docker: reuse action stacks where possible --- plugins/providers/docker/action.rb | 5 +++-- .../docker/action/host_machine_sync_folders_disable.rb | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/providers/docker/action.rb b/plugins/providers/docker/action.rb index 646f4d2ba..c86a0c864 100644 --- a/plugins/providers/docker/action.rb +++ b/plugins/providers/docker/action.rb @@ -110,8 +110,9 @@ module VagrantPlugins b2.use Call, IsBuild do |env2, b3| if env2[:result] - b3.use Destroy - b3.use DestroyBuildImage + b3.use EnvSet, force_confirm_destroy: true, + skip_docker_host_machine_sync_folders_disable: true + b3.use action_destroy end end diff --git a/plugins/providers/docker/action/host_machine_sync_folders_disable.rb b/plugins/providers/docker/action/host_machine_sync_folders_disable.rb index b7912d93a..8875e7119 100644 --- a/plugins/providers/docker/action/host_machine_sync_folders_disable.rb +++ b/plugins/providers/docker/action/host_machine_sync_folders_disable.rb @@ -15,6 +15,7 @@ module VagrantPlugins end def call(env) + return @app.call(env) if env[:skip_docker_host_machine_sync_folders_disable] return @app.call(env) if !env[:machine].provider.host_vm? # Read our random ID for this instance