From 8ca6309b8bbd58f83e7267e7e0e36a5bda62b150 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Fri, 14 Oct 2016 13:23:23 -0700 Subject: [PATCH] Fix Vagrantfile to not always use docker box --- Vagrantfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6bae188a6..5a00bf67d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -53,6 +53,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provision "shell", inline: $script, privileged: false config.vm.synced_folder '.', '/opt/gopath/src/github.com/hashicorp/terraform' + config.vm.provider "docker" do |v, override| + override.vm.box = "tknerr/baseimage-ubuntu-14.04" + end + ["vmware_fusion", "vmware_workstation"].each do |p| config.vm.provider p do |v| v.vmx["memsize"] = "4096" @@ -60,10 +64,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end end - config.vm.provider "docker" do - config.vm.box = "tknerr/baseimage-ubuntu-14.04" - end - config.vm.provider "virtualbox" do |v| v.memory = 4096 v.cpus = 2