Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Repair docker setup / upgrade (#158)
Browse files Browse the repository at this point in the history
Docker does not provide the prebuild docker binaries (1.11.2). Instead a tarball containing a directory 'docker' containing the docker binary with executable bit already set is provided.
  • Loading branch information
martinhoefling authored and rimusz committed Nov 14, 2016
1 parent 3798a65 commit 585dd9e
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions src/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,13 @@ if [ ! -f ~/kube-solo/bin/docker ]; then
cd ~/kube-solo/bin
echo " "
echo "Downloading docker $DOCKER_VERSION client for macOS"
curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
# Make it executable
chmod +x ~/kube-solo/bin/docker
curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
# tarball with directory docker containing docker executable
tar -xzf docker-$DOCKER_VERSION.tgz
mv docker dockerdir
mv dockerdir/docker .
rm docker-$DOCKER_VERSION.tgz
rmdir dockerdir
else
# docker client version
INSTALLED_VERSION=$(~/kube-solo/bin/docker version | grep 'Version:' | awk '{print $2}' | tr -d '\r' | head -1 )
Expand All @@ -235,9 +239,13 @@ else
cd ~/kube-solo/bin
echo " "
echo "Downloading docker $DOCKER_VERSION client for macOS"
curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
# Make it executable
chmod +x ~/kube-solo/bin/docker
curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
# tarball with directory docker containing docker executable
tar -xzf docker-$DOCKER_VERSION.tgz
mv docker dockerdir
mv dockerdir/docker .
rm docker-$DOCKER_VERSION.tgz
rmdir dockerdir
else
echo " "
echo "macOS docker client is up to date with VM's version ..."
Expand Down

0 comments on commit 585dd9e

Please sign in to comment.