iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5048 from hashicorp/4887_patch 

Fix windows filepath in docker-toolbox call.
This commit is contained in:
Megan Marsh 2017-06-28 16:44:42 -07:00 committed by GitHub
parent 51d2d58ba4 a281e60e15
commit 0b0fd408c4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/docker/driver_docker.go
View File

@ -8,6 +8,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"regexp" "regexp"
"runtime"
"strings" "strings"
"sync" "sync"
@ -227,6 +228,11 @@ func (d *DockerDriver) StartContainer(config *ContainerConfig) (string, error) {
args = append(args, "--privileged") args = append(args, "--privileged")
} }
for host, guest := range config.Volumes { for host, guest := range config.Volumes {
if runtime.GOOS == "windows" {
// docker-toolbox can't handle the normal C:\filepath format in CLI
host = strings.Replace(host, "\\", "/", -1)
host = strings.Replace(host, "C:/", "/c/", 1)
}
args = append(args, "-v", fmt.Sprintf("%s:%s", host, guest)) args = append(args, "-v", fmt.Sprintf("%s:%s", host, guest))
} }
for _, v := range config.RunCommand { for _, v := range config.RunCommand {