docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2264 from dgageot/2255-fix-in-container-build 

FIX #2255 - make cross should copy binaries
This commit is contained in:
David Gageot 2015-11-12 16:20:21 +01:00
parent f38d8efb3b 3d72f50c61
commit 9dd438e1f6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -10,3 +10,4 @@ ENV USER root
WORKDIR /go/src/github.com/docker/machine WORKDIR /go/src/github.com/docker/machine
ADD . /go/src/github.com/docker/machine ADD . /go/src/github.com/docker/machine
RUN mkdir bin

6
script/build_in_container.sh
View File

@ -26,10 +26,8 @@ docker run --name $DOCKER_CONTAINER_NAME \
$DOCKER_IMAGE_NAME \ $DOCKER_IMAGE_NAME \
make "$@" make "$@"
if [[ -d bin ]]; then if [[ "$@" == *"clean"* ]] && [[ -d bin ]]; then
rm -Rf bin rm -Rf bin
fi fi
if [[ "$@" == *"build"* ]]; then docker cp $DOCKER_CONTAINER_NAME:/go/src/github.com/docker/machine/bin .
docker cp $DOCKER_CONTAINER_NAME:/go/src/github.com/docker/machine/bin bin
fi