mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #2863 from jamtur01/instsort
Installation docs update
This commit is contained in:
commit
fd7ff6411d
4 changed files with 19 additions and 20 deletions
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
.. _gentoo_linux:
|
.. _gentoo_linux:
|
||||||
|
|
||||||
Gentoo Linux
|
Gentoo
|
||||||
============
|
======
|
||||||
|
|
||||||
.. include:: install_header.inc
|
.. include:: install_header.inc
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ Installation
|
||||||
|
|
||||||
There are a number of ways to install Docker, depending on where you
|
There are a number of ways to install Docker, depending on where you
|
||||||
want to run the daemon. The :ref:`ubuntu_linux` installation is the
|
want to run the daemon. The :ref:`ubuntu_linux` installation is the
|
||||||
officially-tested version, and the community adds more techniques for
|
officially-tested version. The community adds more techniques for
|
||||||
installing Docker all the time.
|
installing Docker all the time.
|
||||||
|
|
||||||
Contents:
|
Contents:
|
||||||
|
@ -19,13 +19,13 @@ Contents:
|
||||||
|
|
||||||
ubuntulinux
|
ubuntulinux
|
||||||
fedora
|
fedora
|
||||||
binaries
|
archlinux
|
||||||
security
|
gentoolinux
|
||||||
upgrading
|
|
||||||
kernel
|
|
||||||
vagrant
|
vagrant
|
||||||
windows
|
windows
|
||||||
amazon
|
amazon
|
||||||
rackspace
|
rackspace
|
||||||
archlinux
|
kernel
|
||||||
gentoolinux
|
binaries
|
||||||
|
security
|
||||||
|
upgrading
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
:description: Installing Docker on Ubuntu proviced by Rackspace
|
:description: Installing Docker on Ubuntu proviced by Rackspace
|
||||||
:keywords: Rackspace Cloud, installation, docker, linux, ubuntu
|
:keywords: Rackspace Cloud, installation, docker, linux, ubuntu
|
||||||
|
|
||||||
===============
|
|
||||||
Rackspace Cloud
|
Rackspace Cloud
|
||||||
===============
|
===============
|
||||||
|
|
||||||
|
@ -14,14 +13,14 @@ straightforward, and you should mostly be able to follow the
|
||||||
|
|
||||||
**However, there is one caveat:**
|
**However, there is one caveat:**
|
||||||
|
|
||||||
If you are using any linux not already shipping with the 3.8 kernel
|
If you are using any Linux not already shipping with the 3.8 kernel
|
||||||
you will need to install it. And this is a little more difficult on
|
you will need to install it. And this is a little more difficult on
|
||||||
Rackspace.
|
Rackspace.
|
||||||
|
|
||||||
Rackspace boots their servers using grub's ``menu.lst`` and does not
|
Rackspace boots their servers using grub's ``menu.lst`` and does not
|
||||||
like non 'virtual' packages (e.g. xen compatible) kernels there,
|
like non 'virtual' packages (e.g. Xen compatible) kernels there,
|
||||||
although they do work. This makes ``update-grub`` to not have the
|
although they do work. This results in ``update-grub`` not having the
|
||||||
expected result, and you need to set the kernel manually.
|
expected result, and you will need to set the kernel manually.
|
||||||
|
|
||||||
**Do not attempt this on a production machine!**
|
**Do not attempt this on a production machine!**
|
||||||
|
|
||||||
|
@ -34,7 +33,7 @@ expected result, and you need to set the kernel manually.
|
||||||
apt-get install linux-generic-lts-raring
|
apt-get install linux-generic-lts-raring
|
||||||
|
|
||||||
|
|
||||||
Great, now you have kernel installed in ``/boot/``, next is to make it
|
Great, now you have the kernel installed in ``/boot/``, next you need to make it
|
||||||
boot next time.
|
boot next time.
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
@ -48,9 +47,9 @@ boot next time.
|
||||||
Now you need to manually edit ``/boot/grub/menu.lst``, you will find a
|
Now you need to manually edit ``/boot/grub/menu.lst``, you will find a
|
||||||
section at the bottom with the existing options. Copy the top one and
|
section at the bottom with the existing options. Copy the top one and
|
||||||
substitute the new kernel into that. Make sure the new kernel is on
|
substitute the new kernel into that. Make sure the new kernel is on
|
||||||
top, and double check kernel and initrd point to the right files.
|
top, and double check the kernel and initrd lines point to the right files.
|
||||||
|
|
||||||
Make special care to double check the kernel and initrd entries.
|
Take special care to double check the kernel and initrd entries.
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
@ -79,7 +78,7 @@ It will probably look something like this:
|
||||||
initrd /boot/initrd.img-3.2.0-38-virtual
|
initrd /boot/initrd.img-3.2.0-38-virtual
|
||||||
|
|
||||||
|
|
||||||
Reboot server (either via command line or console)
|
Reboot the server (either via command line or console)
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
.. _ubuntu_linux:
|
.. _ubuntu_linux:
|
||||||
|
|
||||||
Ubuntu Linux
|
Ubuntu
|
||||||
============
|
======
|
||||||
|
|
||||||
.. warning::
|
.. warning::
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue