From 0fabd390a91ae34d85bb873d05ce7132266ce3a4 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Mon, 6 May 2013 13:11:08 -0700 Subject: [PATCH 1/2] Update ubuntulinux.rst --- docs/sources/installation/ubuntulinux.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index 3082e98da5..955e8eb3b0 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -48,8 +48,7 @@ Now install it, you will see another warning that the package cannot be authenti .. code-block:: bash - curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz | tar -zxf- docker-master/docker - sudo cp docker-master/docker /usr/local/bin/docker + curl get.docker.io | sudo sh -x Verify it worked From 87cc8b6058c8cf185825a039d2320af578cb8f8a Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Mon, 6 May 2013 13:26:23 -0700 Subject: [PATCH 2/2] Update documentation, use docker-latest instead of docker-master --- contrib/install.sh | 4 ++-- docs/sources/installation/binaries.rst | 8 ++++---- docs/sources/installation/upgrading.rst | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/install.sh b/contrib/install.sh index d7c6e66466..7db577a9da 100755 --- a/contrib/install.sh +++ b/contrib/install.sh @@ -36,9 +36,9 @@ else fi echo "Downloading docker binary and uncompressing into /usr/local/bin..." -curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz | +curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-latest.tgz | tar -C /usr/local/bin --strip-components=1 -zxf- \ -docker-master/docker +docker-latest/docker if [ -f /etc/init/dockerd.conf ] then diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index 3428f9f279..2607f3680f 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -26,9 +26,9 @@ Install the docker binary: :: - wget http://get.docker.io/builds/Linux/x86_64/docker-master.tgz - tar -xf docker-master.tgz - sudo cp ./docker-master /usr/local/bin + wget http://get.docker.io/builds/Linux/x86_64/docker-latest.tgz + tar -xf docker-latest.tgz + sudo cp ./docker-latest/docker /usr/local/bin Note: docker currently only supports 64-bit Linux hosts. @@ -50,4 +50,4 @@ Run your first container! -Continue with the :ref:`hello_world` example. \ No newline at end of file +Continue with the :ref:`hello_world` example. diff --git a/docs/sources/installation/upgrading.rst b/docs/sources/installation/upgrading.rst index 66825ac643..a5172b6d76 100644 --- a/docs/sources/installation/upgrading.rst +++ b/docs/sources/installation/upgrading.rst @@ -11,7 +11,7 @@ Get the latest docker binary: :: - wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz + wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-latest.tgz @@ -19,7 +19,7 @@ Unpack it to your current dir :: - tar -xf docker-master.tgz + tar -xf docker-latest.tgz Stop your current daemon. How you stop your daemon depends on how you started it. @@ -38,4 +38,4 @@ Now start the daemon sudo ./docker -d & -Alternatively you can replace the docker binary in ``/usr/local/bin`` \ No newline at end of file +Alternatively you can replace the docker binary in ``/usr/local/bin``