Selaa lähdekoodia

Updated ubuntu install

Thatcher Peskens 12 vuotta sitten
vanhempi
commit
0731d1a582
1 muutettua tiedostoa jossa 20 lisäystä ja 34 poistoa
  1. 20 34
      docs/sources/installation/ubuntulinux.rst

+ 20 - 34
docs/sources/installation/ubuntulinux.rst

@@ -1,56 +1,42 @@
-.. _ubuntu_linux:
+Docker on Ubuntu
+================
 
-Ubuntu Linux
-============
+Docker is now available as a Ubuntu PPA (Personal Package Archive), which makes installing Docker on Ubuntu super easy!
 
-  **Please note this project is currently under heavy development. It should not be used in production.**
+**The Requirements**
 
+* Ubuntu 12.04 (LTS) or Ubuntu 12.10
+* **64-bit Operating system**
 
 
-Installing on Ubuntu 12.04 and 12.10
+Add the custom package sources to your apt sources list. Copy and paste both the following lines at once.
 
-Right now, the officially supported distributions are:
+.. code-block:: bash
 
-Ubuntu 12.04 (precise LTS)
-Ubuntu 12.10 (quantal)
-Docker probably works on other distributions featuring a recent kernel, the AUFS patch, and up-to-date lxc. However this has not been tested.
+   sudo sh -c "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' \
+   >> /etc/apt/sources.list"
 
-Install dependencies:
----------------------
 
-::
+Update your sources. You will see a warning that GPG signatures cannot be verified
 
-    sudo apt-get install lxc wget bsdtar curl
-    sudo apt-get install linux-image-extra-`uname -r`
+.. code-block:: bash
 
-The linux-image-extra package is needed on standard Ubuntu EC2 AMIs in order to install the aufs kernel module.
+   sudo apt-get update
 
-Install the latest docker binary:
 
-::
+Now install it, you will see another warning that the package cannot be authenticated.
 
-    wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz
-    tar -xf docker-master.tgz
+.. code-block:: bash
 
-Run your first container!
+   sudo apt-get install lxc-docker
 
-::
 
-    cd docker-master
+**Run!**
 
-::
+.. code-block:: bash
 
-    sudo ./docker run -i -t base /bin/bash
+   docker
 
 
-To run docker as a daemon, in the background, and allow non-root users to run ``docker`` start
-docker -d
 
-::
-
-    sudo ./docker -d &
-
-
-Consider adding docker to your PATH for simplicity.
-
-Continue with the :ref:`hello_world` example.
+Probably you would like to continue with the :ref:`hello_world` example.