From 2bc6fffacbec76a49d2e43ddf06e9f80c4651e8d Mon Sep 17 00:00:00 2001 From: John Stephens Date: Tue, 9 May 2017 12:55:30 -0700 Subject: [PATCH] Update make.ps1 to respect client repo Signed-off-by: John Stephens --- hack/make.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/make.ps1 b/hack/make.ps1 index 903b9bd9db..f60c252958 100644 --- a/hack/make.ps1 +++ b/hack/make.ps1 @@ -397,12 +397,13 @@ Try { # Perform the actual build if ($Daemon) { Execute-Build "daemon" "daemon" "dockerd" } if ($Client) { - $dockerCliCommit=$(findstr DOCKERCLI_COMMIT hack\dockerfile\binaries-commits) + $dockerCliRepo = (findstr DOCKERCLI_REPO hack\dockerfile\binaries-commits).split("=")[1] + $dockerCliCommit = (findstr DOCKERCLI_COMMIT hack\dockerfile\binaries-commits).split("=")[1] Push-Location .. # TODO: check if cli folder exists already - git clone https://github.com/docker/cli + git clone $dockerCliRepo cd cli - git checkout $dockerCliCommit.split("=")[1] + git checkout $dockerCliCommit # TODO: update CI script to not assume binary is in docker/docker go build -o ..\docker\bundles\docker.exe github.com/docker/cli/cmd/docker Pop-Location