diff options
| author | James Turnbull <james@lovedthanlost.net> | 2014-04-07 11:54:27 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2014-04-07 11:54:27 -0700 |
| commit | 7fddec4a65656844fd8c6aad85198273185450a2 (patch) | |
| tree | c656b8d1ada5ff43186d63a84535f37579bfa046 | |
| parent | 2fde8dfb832b9041364e3f87b8d145256f3f0891 (diff) | |
| parent | 04d1e686398fff0784a47cb85c37db629d40f5b5 (diff) | |
| download | docker-7fddec4a65656844fd8c6aad85198273185450a2.tar.gz | |
Merge pull request #4764 from SvenDowideit/use-docker-tgz
Use docker tgz file to download on OSX
| -rw-r--r-- | docs/sources/installation/binaries.rst | 3 | ||||
| -rw-r--r-- | docs/sources/installation/mac.rst | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index 7ba8c596ef..c31e19acc4 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -58,6 +58,9 @@ Get the docker binary: wget https://get.docker.io/builds/Linux/x86_64/docker-latest -O docker chmod +x docker +.. note:: + If you have trouble downloading the binary, you can also get the smaller + compressed release file: https://get.docker.io/builds/Linux/x86_64/docker-latest.tgz Run the docker daemon --------------------- diff --git a/docs/sources/installation/mac.rst b/docs/sources/installation/mac.rst index 5139324d0b..9ce3961f7e 100644 --- a/docs/sources/installation/mac.rst +++ b/docs/sources/installation/mac.rst @@ -65,11 +65,12 @@ Run the following commands to get it downloaded and set up: .. code-block:: bash - # Get the file - curl -o docker https://get.docker.io/builds/Darwin/x86_64/docker-latest - - # Mark it executable - chmod +x docker + # Get the docker client file + DIR=$(mktemp -d ${TMPDIR:-/tmp}/dockerdl.XXXXXXX) && \ + curl -f -o $DIR/ld.tgz https://get.docker.io/builds/Darwin/x86_64/docker-latest.tgz && \ + gunzip $DIR/ld.tgz && \ + tar xvf $DIR/ld.tar -C $DIR/ && \ + cp $DIR/usr/local/bin/docker ./docker # Set the environment variable for the docker daemon export DOCKER_HOST=tcp://127.0.0.1:4243 |