ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9381 from cblecker/docker-vagrantfile-fix 

Vagrantfile incorrectly using docker image regardless of provider
This commit is contained in:
James Nugent 2016-10-14 15:31:19 -05:00 committed by GitHub
parent d9df49fa90 8ca6309b8b
commit b22f12ab65
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@ -53,6 +53,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision "shell", inline: $script, privileged: false config.vm.provision "shell", inline: $script, privileged: false
config.vm.synced_folder '.', '/opt/gopath/src/github.com/hashicorp/terraform' 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| ["vmware_fusion", "vmware_workstation"].each do |p|
config.vm.provider p do |v| config.vm.provider p do |v|
v.vmx["memsize"] = "4096" v.vmx["memsize"] = "4096"
@ -60,10 +64,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end end
end end
config.vm.provider "docker" do
config.vm.box = "tknerr/baseimage-ubuntu-14.04"
end
config.vm.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.memory = 4096 v.memory = 4096
v.cpus = 2 v.cpus = 2