FIX docker#2255 - make cross should copy binaries

Signed-off-by: David Gageot <[email protected]>
afbjorklund · Nov 12, 2015 · 3d72f50 · 3d72f50
1 parent b90ffae
commit 3d72f50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,3 +10,4 @@ ENV USER root
 WORKDIR /go/src/github.com/docker/machine
 
 ADD . /go/src/github.com/docker/machine
+RUN mkdir bin
diff --git a/script/build_in_container.sh b/script/build_in_container.sh
@@ -26,10 +26,8 @@ docker run --name $DOCKER_CONTAINER_NAME \
   $DOCKER_IMAGE_NAME \
   make "$@"
 
-if [[ -d bin ]]; then
+if [[ "$@" == *"clean"* ]] && [[ -d bin ]]; then
   rm -Rf bin
 fi
 
-if [[ "$@" == *"build"* ]]; then
-  docker cp $DOCKER_CONTAINER_NAME:/go/src/github.com/docker/machine/bin bin
-fi
+docker cp $DOCKER_CONTAINER_NAME:/go/src/github.com/docker/machine/bin .
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ ENV USER root
		WORKDIR /go/src/github.com/docker/machine

		ADD . /go/src/github.com/docker/machine
		RUN mkdir bin