kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of ssh://github.com/dotcloud/docker

This commit is contained in:
Solomon Hykes 2013-05-06 14:13:27 -07:00
parent 8646f7f11c 87cc8b6058
commit b38fc9fcdc
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/install.sh
View File

@ -36,9 +36,9 @@ else
fi fi
echo "Downloading docker binary and uncompressing into /usr/local/bin..." 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- \ tar -C /usr/local/bin --strip-components=1 -zxf- \
docker-master/docker docker-latest/docker
if [ -f /etc/init/dockerd.conf ] if [ -f /etc/init/dockerd.conf ]
then then

8
docs/sources/installation/binaries.rst
View File

@ -26,9 +26,9 @@ Install the docker binary:
:: ::
wget http://get.docker.io/builds/Linux/x86_64/docker-master.tgz wget http://get.docker.io/builds/Linux/x86_64/docker-latest.tgz
tar -xf docker-master.tgz tar -xf docker-latest.tgz
sudo cp ./docker-master /usr/local/bin sudo cp ./docker-latest/docker /usr/local/bin
Note: docker currently only supports 64-bit Linux hosts. Note: docker currently only supports 64-bit Linux hosts.
@ -50,4 +50,4 @@ Run your first container!
Continue with the :ref:`hello_world` example. Continue with the :ref:`hello_world` example.

3
docs/sources/installation/ubuntulinux.rst
View File

@ -48,8 +48,7 @@ Now install it, you will see another warning that the package cannot be authenti
.. code-block:: bash .. code-block:: bash
curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz | tar -zxf- docker-master/docker curl get.docker.io | sudo sh -x
sudo cp docker-master/docker /usr/local/bin/docker
Verify it worked Verify it worked

6
docs/sources/installation/upgrading.rst
View File

@ -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. 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 & sudo ./docker -d &
Alternatively you can replace the docker binary in ``/usr/local/bin`` Alternatively you can replace the docker binary in ``/usr/local/bin``