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

Change: disable the linux switch (Docker for Mac/Windows, etc.)
hashicorp · May 27, 2016 · db1f98f · db1f98f
2 parents ba77d4b + 647bd61
commit db1f98f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/plugins/providers/docker/provider.rb b/plugins/providers/docker/provider.rb
@@ -128,8 +128,7 @@ def host_vm_mutex
       # 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.
       def host_vm?
-        @machine.provider_config.force_host_vm ||
-          !Vagrant::Util::Platform.linux?
+        @machine.provider_config.force_host_vm
       end
 
       # Returns the SSH info for accessing the Container.