Update build.sh to build PR 27455 docker manifest command

StefanScherer · May 17, 2017 · 5e6b879 · 5e6b879
1 parent 7e80760
commit 5e6b879
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/docker/build.sh b/docker/build.sh
@@ -17,9 +17,10 @@ if [ $1 != ""  ]; then
   git checkout pr$1
   image=dockerpr$1
 fi
-docker rm -f $image
+docker rm -f $image || true
+DOCKER_GITCOMMIT=(git rev-parse --short HEAD)
 docker build -t $image -f Dockerfile.windows .
-docker run --name $image $image 'hack\make.ps1' -Binary
+docker run -e DOCKER_GITCOMMIT=$DOCKER_GITCOMMIT --name $image $image 'hack\make.ps1' -Binary
 docker cp $image:C:/go/src/github.com/docker/docker/bundles/docker.exe ../binary/docker.exe
 docker cp $image:C:/go/src/github.com/docker/docker/bundles/dockerd.exe ../binary/dockerd.exe
 popd