toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update make.ps1 to respect client repo

Browse Source 
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 2bc6fffacbec76a49d2e43ddf06e9f80c4651e8d
Component: engine
This commit is contained in:
John Stephens
2017-05-09 13:07:09 -07:00
parent 6044c2ae89
commit d8ca5cea6c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/make.ps1
+4 -3
View File
@@ -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