Skip to content

Commit 5e6b879

Browse files
committed
Update build.sh to build PR 27455 docker manifest command
1 parent 7e80760 commit 5e6b879

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

docker/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ if [ $1 != "" ]; then
1717
git checkout pr$1
1818
image=dockerpr$1
1919
fi
20-
docker rm -f $image
20+
docker rm -f $image || true
21+
DOCKER_GITCOMMIT=(git rev-parse --short HEAD)
2122
docker build -t $image -f Dockerfile.windows .
22-
docker run --name $image $image 'hack\make.ps1' -Binary
23+
docker run -e DOCKER_GITCOMMIT=$DOCKER_GITCOMMIT --name $image $image 'hack\make.ps1' -Binary
2324
docker cp $image:C:/go/src/github.com/docker/docker/bundles/docker.exe ../binary/docker.exe
2425
docker cp $image:C:/go/src/github.com/docker/docker/bundles/dockerd.exe ../binary/dockerd.exe
2526
popd

0 commit comments

Comments
 (0)