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

Merge pull request #7298 from till/t/docker-for-mac-beta 

Change: disable the linux switch (Docker for Mac/Windows, etc.)
This commit is contained in:
Seth Vargo 2016-05-27 17:25:13 -04:00
parent ba77d4b533 647bd6114c
commit db1f98ffd6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/providers/docker/provider.rb
View File

@ -128,8 +128,7 @@ module VagrantPlugins
# rather than directly on our system. Docker needs to run in a VM # rather than directly on our system. Docker needs to run in a VM
# when we're not on Linux, or not on a Linux that supports Docker. # when we're not on Linux, or not on a Linux that supports Docker.
def host_vm? def host_vm?
@machine.provider_config.force_host_vm || @machine.provider_config.force_host_vm
!Vagrant::Util::Platform.linux?
end end
# Returns the SSH info for accessing the Container. # Returns the SSH info for accessing the Container.