Browse Source

Merge pull request #33234 from johnstep/ensure-correct-windows-client

Ensure the correct Windows client is built
Sebastiaan van Stijn 8 years ago
parent
commit
1290ec2d4b
1 changed files with 3 additions and 1 deletions
  1. 3 1
      hack/make.ps1

+ 3 - 1
hack/make.ps1

@@ -418,8 +418,10 @@ Try {
                 Invoke-Expression "git -C $dockerCliRoot  checkout -q $dockerCliCommit"
                 if ($LASTEXITCODE -ne 0) { Throw "Failed to checkout client commit $dockerCliCommit" }
                 Write-Host "INFO: Building client..."
-                Invoke-Expression "go build -o $root\bundles\docker.exe github.com/docker/cli/cmd/docker"
+                Push-Location "$dockerCliRoot\cmd\docker"; $global:pushed=$True
+                Invoke-Expression "go build -o $root\bundles\docker.exe"
                 if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client" }
+                Pop-Location; $global:pushed=$False
             }
             Catch [Exception] {
                 Throw $_