0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33123 from johnstep/windows-respect-client-repo

Browse source 
Update make.ps1 to respect client repo
This commit is contained in:
Tibor Vass 2017-05-09 19:03:50 -07:00 • committed by GitHub
commit c68612de0c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hack/make.ps1
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