github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix the build w/ docker 1.3.0 on OS X

Browse Source
This commit is contained in:
Brendan Burns 2014-10-17 23:09:03 -07:00
parent 783c0d7532
commit ed0b94de5a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/common.sh
View File

@ -374,6 +374,13 @@ function kube::build::run_build_command() {
# If the Docker server is remote, copy the results back out.
function kube::build::copy_output() {
if kube::build::is_osx; then
# Docker 1.3 on OS X handles this properly, so bail.
docker_version=$(docker version 2> /dev/null | sed -n 1p | awk '{ print $3 }')
# TODO: this will start breaking with Docker 1.4, but at that point we should
# just delete this whole function and force people to upgrade.
if [[ "$docker_version" == "1.3."* ]]; then
return
fi
# When we are on the Mac with boot2docker we need to copy the results back
# out. Ideally we would leave the container around and use 'docker cp' to
# copy the results out. However, that doesn't work for mounted volumes