[integration-cli] fix windows build test cases
Use the same IP as the DOCKER_HOST when making a remote file server. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
This commit is contained in:
parent
4dbdd98b41
commit
d06ffd0a5f
1 changed files with 17 additions and 1 deletions
|
@ -877,10 +877,26 @@ COPY . /static`); err != nil {
|
|||
return nil, fmt.Errorf("failed to find container port: err=%v\nout=%s", err, out)
|
||||
}
|
||||
|
||||
fileserverHostPort := strings.Trim(out, "\n")
|
||||
_, port, err := net.SplitHostPort(fileserverHostPort)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to parse file server host:port: %v", err)
|
||||
}
|
||||
|
||||
dockerHostURL, err := url.Parse(daemonHost())
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to parse daemon host URL: %v", err)
|
||||
}
|
||||
|
||||
host, _, err := net.SplitHostPort(dockerHostURL.Host)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to parse docker daemon host:port: %v", err)
|
||||
}
|
||||
|
||||
return &remoteFileServer{
|
||||
container: container,
|
||||
image: image,
|
||||
host: strings.Trim(out, "\n"),
|
||||
host: fmt.Sprintf("%s:%s", host, port),
|
||||
ctx: ctx}, nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue