From 92194f613e37aeb8a387920c3bee42480da0d2ac Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 19 Mar 2014 14:12:47 +1000 Subject: [PATCH 1/3] use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/installation/mac.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/sources/installation/mac.rst b/docs/sources/installation/mac.rst index 5139324d0b..f4c771cf9f 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) && \ + 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 From 53dc2d67fb65037d9891e2fa0f6559d5e4e2ddcc Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 19 Mar 2014 14:24:49 +1000 Subject: [PATCH 2/3] mention the tgz - other people might like to know Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/installation/binaries.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index bfdfbe211f..fe03d21859 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -49,6 +49,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 --------------------- From 04d1e686398fff0784a47cb85c37db629d40f5b5 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 31 Mar 2014 11:05:21 +1000 Subject: [PATCH 3/3] OSX mktemp is different - hopfully this will now work on HP/UX >:} Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/installation/mac.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/mac.rst b/docs/sources/installation/mac.rst index f4c771cf9f..9ce3961f7e 100644 --- a/docs/sources/installation/mac.rst +++ b/docs/sources/installation/mac.rst @@ -66,7 +66,7 @@ Run the following commands to get it downloaded and set up: .. code-block:: bash # Get the docker client file - DIR=$(mktemp -d) && \ + 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/ && \