diff options
Diffstat (limited to 'docs/sources/installation')
| -rw-r--r-- | docs/sources/installation/amazon.rst | 32 | ||||
| -rw-r--r-- | docs/sources/installation/binaries.rst | 15 | ||||
| -rw-r--r-- | docs/sources/installation/fedora.rst | 8 | ||||
| -rw-r--r-- | docs/sources/installation/index.rst | 1 | ||||
| -rw-r--r-- | docs/sources/installation/mac.rst | 11 | ||||
| -rw-r--r-- | docs/sources/installation/rhel.rst | 4 | ||||
| -rw-r--r-- | docs/sources/installation/softlayer.rst | 25 | ||||
| -rw-r--r-- | docs/sources/installation/ubuntulinux.rst | 31 |
8 files changed, 107 insertions, 20 deletions
diff --git a/docs/sources/installation/amazon.rst b/docs/sources/installation/amazon.rst index b5465e25f8..b062a15e1e 100644 --- a/docs/sources/installation/amazon.rst +++ b/docs/sources/installation/amazon.rst @@ -9,6 +9,7 @@ Amazon EC2 There are several ways to install Docker on AWS EC2: +* :ref:`amazonquickstart_new` or * :ref:`amazonquickstart` or * :ref:`amazonstandard` @@ -61,6 +62,37 @@ for every Docker command. Once you've got Docker installed, you're ready to try it out -- head on over to the :doc:`../use/basics` or :doc:`../examples/index` section. +.. _amazonquickstart_new: + +Amazon QuickStart (Release Candidate - March 2014) +-------------------------------------------------- + +Amazon just published new Docker-ready AMIs (2014.03 Release Candidate). Docker packages +can now be installed from Amazon's provided Software Repository. + +1. **Choose an image:** + + * Launch the `Create Instance Wizard + <https://console.aws.amazon.com/ec2/v2/home?#LaunchInstanceWizard:>`_ menu + on your AWS Console. + + * Click the ``Community AMI`` menu option on the left side + + * Search for '2014.03' and select one of the Amazon provided AMI, for example ``amzn-ami-pv-2014.03.rc-0.x86_64-ebs`` + + * For testing you can use the default (possibly free) + ``t1.micro`` instance (more info on `pricing + <http://aws.amazon.com/en/ec2/pricing/>`_). + + * Click the ``Next: Configure Instance Details`` button at the bottom right. + +2. After a few more standard choices where defaults are probably ok, your Amazon + Linux instance should be running! + +3. SSH to your instance to install Docker : ``ssh -i <path to your private key> ec2-user@<your public IP address>`` + +4. Once connected to the instance, type ``sudo yum install -y docker ; sudo service docker start`` to install and start Docker + .. _amazonstandard: Standard Ubuntu Installation diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index bfdfbe211f..c31e19acc4 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -29,6 +29,12 @@ To run properly, docker needs the following software to be installed at runtime: - iptables version 1.4 or later - Git version 1.7 or later - XZ Utils 4.9 or later +- a `properly mounted + <https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount>`_ + cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount point `is + <https://github.com/dotcloud/docker/issues/2683>`_ `not + <https://github.com/dotcloud/docker/issues/3485>`_ `sufficient + <https://github.com/dotcloud/docker/issues/4568>`_) Check kernel dependencies @@ -37,6 +43,9 @@ Check kernel dependencies Docker in daemon mode has specific kernel requirements. For details, check your distribution in :ref:`installation_list`. +In general, a 3.8 Linux kernel (or higher) is preferred, as some of the +prior versions have known issues that are triggered by Docker. + Note that Docker also has a client mode, which can run on virtually any Linux kernel (it even builds on OSX!). @@ -49,6 +58,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 --------------------- @@ -77,7 +89,8 @@ always run as the root user, but if you run the ``docker`` client as a user in the *docker* group then you don't need to add ``sudo`` to all the client commands. -.. warning:: The *docker* group is root-equivalent. +.. warning:: The *docker* group (or the group specified with ``-G``) is + root-equivalent; see :ref:`dockersecurity_daemon` details. Upgrades diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index 7e0aee78fd..3b95f04f7f 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -23,15 +23,15 @@ The ``docker-io`` package provides Docker on Fedora. If you have the (unrelated) ``docker`` package installed already, it will conflict with ``docker-io``. There's a `bug report`_ filed for it. -To proceed with ``docker-io`` installation on Fedora 19, please remove -``docker`` first. +To proceed with ``docker-io`` installation on Fedora 19 or Fedora 20, please +remove ``docker`` first. .. code-block:: bash sudo yum -y remove docker -For Fedora 20 and later, the ``wmdocker`` package will provide the same -functionality as ``docker`` and will also not conflict with ``docker-io``. +For Fedora 21 and later, the ``wmdocker`` package will provide the same +functionality as the old ``docker`` and will also not conflict with ``docker-io``. .. code-block:: bash diff --git a/docs/sources/installation/index.rst b/docs/sources/installation/index.rst index 39c1f6a292..ae0e9196fa 100644 --- a/docs/sources/installation/index.rst +++ b/docs/sources/installation/index.rst @@ -30,4 +30,5 @@ Contents: amazon rackspace google + softlayer binaries diff --git a/docs/sources/installation/mac.rst b/docs/sources/installation/mac.rst index 5139324d0b..9ce3961f7e 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 ${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/ && \ + cp $DIR/usr/local/bin/docker ./docker # Set the environment variable for the docker daemon export DOCKER_HOST=tcp://127.0.0.1:4243 diff --git a/docs/sources/installation/rhel.rst b/docs/sources/installation/rhel.rst index 7930da6309..151fba6f1f 100644 --- a/docs/sources/installation/rhel.rst +++ b/docs/sources/installation/rhel.rst @@ -22,6 +22,9 @@ for the RHEL distribution. Also note that due to the current Docker limitations, Docker is able to run only on the **64 bit** architecture. +You will need `RHEL 6.5`_ or higher, with a RHEL 6 kernel version 2.6.32-431 or higher +as this has specific kernel fixes to allow Docker to work. + Installation ------------ @@ -78,4 +81,5 @@ If you have any issues - please report them directly in the `Red Hat Bugzilla fo .. _EPEL installation instructions: https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F .. _Red Hat Bugzilla for docker-io component : https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=docker-io .. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676 +.. _RHEL 6.5: https://access.redhat.com/site/articles/3078#RHEL6 diff --git a/docs/sources/installation/softlayer.rst b/docs/sources/installation/softlayer.rst new file mode 100644 index 0000000000..0fe3d6df5a --- /dev/null +++ b/docs/sources/installation/softlayer.rst @@ -0,0 +1,25 @@ +:title: Installation on IBM SoftLayer +:description: Please note this project is currently under heavy development. It should not be used in production. +:keywords: IBM SoftLayer, virtualization, cloud, docker, documentation, installation + +IBM SoftLayer +============= + +.. include:: install_header.inc + +IBM SoftLayer QuickStart +------------------------- + +1. Create an `IBM SoftLayer account <https://www.softlayer.com/cloudlayer/>`_. +2. Log in to the `SoftLayer Console <https://control.softlayer.com/devices/>`_. +3. Go to `Order Hourly Computing Instance Wizard <https://manage.softlayer.com/Sales/orderHourlyComputingInstance>`_ on your SoftLayer Console. +4. Create a new *CloudLayer Computing Instance* (CCI) using the default values for all the fields and choose: + +- *First Available* as ``Datacenter`` and +- *Ubuntu Linux 12.04 LTS Precise Pangolin - Minimal Install (64 bit)* as ``Operating System``. + +5. Click the *Continue Your Order* button at the bottom right and select *Go to checkout*. +6. Insert the required *User Metadata* and place the order. +7. Then continue with the :ref:`ubuntu_linux` instructions. + +Continue with the :ref:`hello_world` example.
\ No newline at end of file diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index 416d56765e..51f303e88a 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -64,15 +64,26 @@ Installation an earlier version, you will need to follow them again. Docker is available as a Debian package, which makes installation -easy. **See the :ref:`installmirrors` section below if you are not in +easy. **See the** :ref:`installmirrors` **section below if you are not in the United States.** Other sources of the Debian packages may be faster for you to install. -First add the Docker repository key to your local keychain. +First, check that your APT system can deal with ``https`` URLs: +the file ``/usr/lib/apt/methods/https`` should exist. If it doesn't, +you need to install the package ``apt-transport-https``. + +.. code-block:: bash + + [ -e /usr/lib/apt/methods/https ] || { + apt-get update + apt-get install apt-transport-https + } + +Then, add the Docker repository key to your local keychain. .. code-block:: bash - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 + sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 Add the Docker repository to your apt sources list, update and install the ``lxc-docker`` package. @@ -82,7 +93,7 @@ continue installation.* .. code-block:: bash - sudo sh -c "echo deb http://get.docker.io/ubuntu docker main\ + sudo sh -c "echo deb https://get.docker.io/ubuntu docker main\ > /etc/apt/sources.list.d/docker.list" sudo apt-get update sudo apt-get install lxc-docker @@ -144,7 +155,7 @@ First add the Docker repository key to your local keychain. .. code-block:: bash - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 + sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 Add the Docker repository to your apt sources list, update and install the ``lxc-docker`` package. @@ -186,7 +197,7 @@ client commands. As of 0.9.0, you can specify that a group other than ``docker`` should own the Unix socket with the ``-G`` option. .. warning:: The *docker* group (or the group specified with ``-G``) is - root-equivalent. + root-equivalent; see :ref:`dockersecurity_daemon` details. **Example:** @@ -282,8 +293,6 @@ incoming connections on the Docker port (default 4243): sudo ufw allow 4243/tcp -.. _installmirrors: - Docker and local DNS server warnings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -309,9 +318,9 @@ daemon for the containers: sudo nano /etc/default/docker --- # Add: - DOCKER_OPTS="-dns 8.8.8.8" + DOCKER_OPTS="--dns 8.8.8.8" # 8.8.8.8 could be replaced with a local DNS server, such as 192.168.1.1 - # multiple DNS servers can be specified: -dns 8.8.8.8 -dns 192.168.1.1 + # multiple DNS servers can be specified: --dns 8.8.8.8 --dns 192.168.1.1 The Docker daemon has to be restarted: @@ -342,6 +351,8 @@ NetworkManager and Docker need to be restarted afterwards: .. warning:: This might make DNS resolution slower on some networks. +.. _installmirrors: + Mirrors ^^^^^^^ |