From 568185c3e985cf78a7608accf85c646c2aa245c7 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 20 Apr 2014 08:45:51 -0700 Subject: [PATCH] providers/docker: always copy the host VM Vagrantfile --- plugins/providers/docker/hostmachine/Vagrantfile | 3 --- plugins/providers/docker/provider.rb | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/providers/docker/hostmachine/Vagrantfile b/plugins/providers/docker/hostmachine/Vagrantfile index 4e8a42b22..38856c3e1 100644 --- a/plugins/providers/docker/hostmachine/Vagrantfile +++ b/plugins/providers/docker/hostmachine/Vagrantfile @@ -7,7 +7,4 @@ Vagrant.configure("2") do |config| v.check_guest_additions = false v.functional_vboxsf = false end - - # Don't sync this directory - config.vm.synced_folder ".", "/vagrant", disabled: true end diff --git a/plugins/providers/docker/provider.rb b/plugins/providers/docker/provider.rb index 27d7fa2d6..4c25eea6c 100644 --- a/plugins/providers/docker/provider.rb +++ b/plugins/providers/docker/provider.rb @@ -60,11 +60,9 @@ module VagrantPlugins default_path = File.expand_path("../hostmachine/Vagrantfile", __FILE__) vf_path = @machine.env.data_dir.join("docker-host", "Vagrantfile") begin - if !vf_path.file? - @machine.env.lock("docker-provider-hostvm") do - vf_path.dirname.mkpath - FileUtils.cp(default_path, vf_path) - end + @machine.env.lock("docker-provider-hostvm") do + vf_path.dirname.mkpath + FileUtils.cp(default_path, vf_path) end rescue Vagrant::Errors::EnvironmentLockedError # Lock contention, just retry