haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8437 from chrisroberts/enhancement/docker-host-vm 

Do not force docker host VM on Darwin or Windows
This commit is contained in:
Chris Roberts 2017-04-04 12:56:59 -07:00 committed by GitHub
parent cd68ba2c8e 05b6cdab6c
commit d7132b79c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/providers/docker/config.rb
View File

@ -228,7 +228,9 @@ module VagrantPlugins
# host VM. Other users can optionally disable this by setting the # host VM. Other users can optionally disable this by setting the
# value explicitly to false in their Vagrantfile. # value explicitly to false in their Vagrantfile.
if @force_host_vm == UNSET_VALUE if @force_host_vm == UNSET_VALUE
@force_host_vm = !Vagrant::Util::Platform.linux? @force_host_vm = !Vagrant::Util::Platform.linux? &&
!Vagrant::Util::Platform.darwin? &&
!Vagrant::Util::Platform.windows?
end end
# The machine name must be a symbol # The machine name must be a symbol