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

Fixes #9085: Cannot `up` a machine with Docker Toolbox and Git Bash

This commit is contained in:
mihab 2018-03-01 21:38:39 +01:00
parent 04fdab961e
commit 03178bbe04
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/providers/docker/driver.rb
View File

@ -49,6 +49,13 @@ module VagrantPlugins
run_cmd += volumes.map { |v| run_cmd += volumes.map { |v|
v = v.to_s v = v.to_s
if v.include?(":") && @executor.windows? if v.include?(":") && @executor.windows?
if v.index(":") != v.rindex(":")
# If we have 2 colons, the host path is an absolute Windows URL
# and we need to remove the colon from it
host, colon, guest = v.rpartition(":")
host = "//" + host[0].downcase + host[2..-1]
v = [host, guest].join(":")
else
host, guest = v.split(":", 2) host, guest = v.split(":", 2)
host = Vagrant::Util::Platform.windows_path(host) host = Vagrant::Util::Platform.windows_path(host)
# NOTE: Docker does not support UNC style paths (which also # NOTE: Docker does not support UNC style paths (which also
@ -57,6 +64,8 @@ module VagrantPlugins
host.gsub!(/^[^A-Za-z]+/, "") host.gsub!(/^[^A-Za-z]+/, "")
v = [host, guest].join(":") v = [host, guest].join(":")
end end
end
['-v', v.to_s] ['-v', v.to_s]
} }
run_cmd += %W(--privileged) if params[:privileged] run_cmd += %W(--privileged) if params[:privileged]