1. docker
  2. Commit 632a8635a0fa0b09759f87fc8a024d99a984c9df
Browse code

Fix make.ps1 client build for Windows

Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.

Signed-off-by: John Stephens <johnstep@docker.com>

John Stephens authored on 2017/05/16 04:29:25
Showing 1 changed files
hack/make.ps1
History View file @ 632a863
... ... 
@@ -411,7 +411,7 @@ Try {
411 411 
             $saveGOPATH = $env:GOPATH
412 412 
             Try {
413 413 
                 $env:GOPATH = $tempLocation
414 
-                $dockerCliRoot = "$env:GOPATH\src\$($dockerCliRepo.Split("/", 3)[2])"
414 
+                $dockerCliRoot = "$env:GOPATH\src\github.com\docker\cli"
415 415 
                 Write-Host "INFO: Cloning client repository..."
416 416 
                 Invoke-Expression "git clone -q $dockerCliRepo $dockerCliRoot"
417 417 
                 if ($LASTEXITCODE -ne 0) { Throw "Failed to clone client repository $dockerCliRepo" }