diff --git a/docs/sources/installation/amazon.rst b/docs/sources/installation/amazon.rst index b9344042fa..c7979553c9 100644 --- a/docs/sources/installation/amazon.rst +++ b/docs/sources/installation/amazon.rst @@ -1,24 +1,77 @@ :title: Installation on Amazon EC2 -:description: Docker installation on Amazon EC2 with a single vagrant command. Vagrant 1.1 or higher is required. +:description: Docker installation on Amazon EC2 :keywords: amazon ec2, virtualization, cloud, docker, documentation, installation -Using Vagrant (Amazon EC2) -========================== - -This page explains how to setup and run an Amazon EC2 instance from -your local machine. **Vagrant is not necessary to run Docker on -EC2.** You can follow the :ref:`ubuntu_linux` instructions installing -Docker on any EC2 instance running Ubuntu. - -Installation ------------- +Amazon EC2 +========== .. include:: install_header.inc +There are several ways to install Docker on AWS EC2: + +* :ref:`amazonquickstart` or +* :ref:`amazonstandard` or +* :ref:`amazonvagrant` + +**You'll need an** `AWS account `_ **first, of course.** + +.. _amazonquickstart: + +Amazon QuickStart +----------------- + +1. **Choose an image:** + + * Open http://cloud-images.ubuntu.com/locator/ec2/ + * Enter ``amd64 precise`` in the search field (it will search as you + type) + * Pick an image by clicking on the image name. *An EBS-enabled + image will let you t1.micro instance.* Clicking on the image name + will take you to your AWS Console. + +2. **Tell CloudInit to install Docker:** + + * Enter ``#include https://get.docker.io`` into the instance *User + Data*. `CloudInit `_ + is part of the Ubuntu image you chose and it bootstraps from this + *User Data*. + +3. After a few more standard choices where defaults are probably ok, your + AWS Ubuntu instance with Docker should be running! + +**If this is your first AWS instance, you may need to set up your +Security Group to allow SSH.** By default all incoming ports to your +new instance will be blocked by the AWS Security Group, so you might +just get timeouts when you try to connect. + +Installing with ``get.docker.io`` (as above) will create a service +named ``dockerd``. You may want to set up a :ref:`docker group +` and add the *ubuntu* user to it so that you don't have +to use ``sudo`` 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. + +.. _amazonstandard: + +Standard Ubuntu Installation +---------------------------- + +If you want a more hands-on installation, then you can follow the +:ref:`ubuntu_linux` instructions installing Docker on any EC2 instance +running Ubuntu. Just follow Step 1 from :ref:`amazonquickstart` to +pick an image (or use one of your own) and skip the step with the +*User Data*. Then continue with the :ref:`ubuntu_linux` instructions. + +.. _amazonvagrant: + +Use Vagrant +----------- + .. include:: install_unofficial.inc -Docker can now be installed on Amazon EC2 with a single vagrant -command. Vagrant 1.1 or higher is required. +And finally, if you prefer to work through Vagrant, you can install +Docker that way too. Vagrant 1.1 or higher is required. 1. Install vagrant from http://www.vagrantup.com/ (or use your package manager) 2. Install the vagrant aws plugin @@ -37,16 +90,17 @@ command. Vagrant 1.1 or higher is required. 4. Check your AWS environment. - Create a keypair specifically for EC2, give it a name and save it to your disk. *I usually store these in my ~/.ssh/ folder*. - - Check that your default security group has an inbound rule to accept SSH (port 22) connections. - + Create a keypair specifically for EC2, give it a name and save it + to your disk. *I usually store these in my ~/.ssh/ folder*. + Check that your default security group has an inbound rule to + accept SSH (port 22) connections. 5. Inform Vagrant of your settings - Vagrant will read your access credentials from your environment, so we need to set them there first. Make sure - you have everything on amazon aws setup so you can (manually) deploy a new image to EC2. + Vagrant will read your access credentials from your environment, so + we need to set them there first. Make sure you have everything on + amazon aws setup so you can (manually) deploy a new image to EC2. :: @@ -60,7 +114,8 @@ command. Vagrant 1.1 or higher is required. * ``AWS_ACCESS_KEY_ID`` - The API key used to make requests to AWS * ``AWS_SECRET_ACCESS_KEY`` - The secret key to make AWS API requests * ``AWS_KEYPAIR_NAME`` - The name of the keypair used for this EC2 instance - * ``AWS_SSH_PRIVKEY`` - The path to the private key for the named keypair, for example ``~/.ssh/docker.pem`` + * ``AWS_SSH_PRIVKEY`` - The path to the private key for the named + keypair, for example ``~/.ssh/docker.pem`` You can check if they are set correctly by doing something like @@ -75,10 +130,12 @@ command. Vagrant 1.1 or higher is required. vagrant up --provider=aws - If it stalls indefinitely on ``[default] Waiting for SSH to become available...``, Double check your default security - zone on AWS includes rights to SSH (port 22) to your container. + If it stalls indefinitely on ``[default] Waiting for SSH to become + available...``, Double check your default security zone on AWS + includes rights to SSH (port 22) to your container. - If you have an advanced AWS setup, you might want to have a look at https://github.com/mitchellh/vagrant-aws + If you have an advanced AWS setup, you might want to have a look at + https://github.com/mitchellh/vagrant-aws 7. Connect to your machine diff --git a/docs/sources/terms/images/docker-filesystems-busyboxrw.png b/docs/sources/terms/images/docker-filesystems-busyboxrw.png index 24277dc1f4..ad41c940e4 100644 Binary files a/docs/sources/terms/images/docker-filesystems-busyboxrw.png and b/docs/sources/terms/images/docker-filesystems-busyboxrw.png differ diff --git a/docs/sources/terms/images/docker-filesystems-debian.png b/docs/sources/terms/images/docker-filesystems-debian.png index 8411733a5f..823a215d3e 100644 Binary files a/docs/sources/terms/images/docker-filesystems-debian.png and b/docs/sources/terms/images/docker-filesystems-debian.png differ diff --git a/docs/sources/terms/images/docker-filesystems-debianrw.png b/docs/sources/terms/images/docker-filesystems-debianrw.png index b7b16c1cc2..97c69a9944 100644 Binary files a/docs/sources/terms/images/docker-filesystems-debianrw.png and b/docs/sources/terms/images/docker-filesystems-debianrw.png differ diff --git a/docs/sources/terms/images/docker-filesystems-generic.png b/docs/sources/terms/images/docker-filesystems-generic.png index a6710680a9..fb734b75c6 100644 Binary files a/docs/sources/terms/images/docker-filesystems-generic.png and b/docs/sources/terms/images/docker-filesystems-generic.png differ diff --git a/docs/sources/terms/images/docker-filesystems-multilayer.png b/docs/sources/terms/images/docker-filesystems-multilayer.png index 025a9d47bd..0b3ae19c2c 100644 Binary files a/docs/sources/terms/images/docker-filesystems-multilayer.png and b/docs/sources/terms/images/docker-filesystems-multilayer.png differ diff --git a/docs/sources/terms/images/docker-filesystems-multiroot.png b/docs/sources/terms/images/docker-filesystems-multiroot.png index 42a710cc82..5e864273f3 100644 Binary files a/docs/sources/terms/images/docker-filesystems-multiroot.png and b/docs/sources/terms/images/docker-filesystems-multiroot.png differ diff --git a/docs/sources/terms/images/docker-filesystems.svg b/docs/sources/terms/images/docker-filesystems.svg index 13d61dc1eb..d41aff2522 100644 --- a/docs/sources/terms/images/docker-filesystems.svg +++ b/docs/sources/terms/images/docker-filesystems.svg @@ -26,16 +26,16 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.82666667" - inkscape:cx="382.45968" - inkscape:cy="348.3871" + inkscape:cx="236.08871" + inkscape:cy="300" inkscape:document-units="px" - inkscape:current-layer="layer4" + inkscape:current-layer="layer2" showgrid="false" width="800px" inkscape:window-width="1327" inkscape:window-height="714" - inkscape:window-x="616" - inkscape:window-y="1483" + inkscape:window-x="686" + inkscape:window-y="219" inkscape:window-maximized="0" showguides="false" inkscape:guide-bbox="true" @@ -48,98 +48,98 @@ inkscape:snap-bbox="false" inkscape:snap-grids="false"> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + + - - + id="guide5235" /> + id="guide5237" /> + id="guide5239" /> + - - + inkscape:vp_z="1199.1838 : 590.41154 : 1" + inkscape:persp3d-origin="406.04839 : 290.19023 : 1" + id="perspective4014" /> + id="perspective4012" /> + + inkscape:vp_z="1200.5884 : 584.76404 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="-407.35594 : 591.07573 : 1" + sodipodi:type="inkscape:persp3d" /> @@ -149,1392 +149,1393 @@ image/svg+xml - + + id="layer8" + inkscape:groupmode="layer" + sodipodi:insensitive="true"> + height="600" + width="800" + id="rect8704" + style="fill:#f0f0f0;fill-opacity:0.51111115;stroke:none" /> + id="layer2" + inkscape:groupmode="layer"> + inkscape:corner0="0.49469727 : -0.063230334 : 0 : 1" + inkscape:perspectiveID="#perspective3054" + id="g3999" + style="fill:#aad3d3;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:type="inkscape:box3d" + inkscape:export-filename="/Users/arothfusz/src/metalivedev/docker/docs/sources/terms/images/docker-filesystems-multiroot.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + style="fill:#afafde;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4009" + sodipodi:type="inkscape:box3dside" /> + style="fill:#353564;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4001" + sodipodi:type="inkscape:box3dside" /> + style="fill:#e9e9ff;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4011" + sodipodi:type="inkscape:box3dside" /> + style="fill:#bbdbdb;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4003" + sodipodi:type="inkscape:box3dside" /> + style="fill:#91c6c6;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4007" + sodipodi:type="inkscape:box3dside" /> - - - - - - - - - + style="fill:#a9d2d2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.4000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4005" + sodipodi:type="inkscape:box3dside" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + transform="matrix(0.75405944,0,0,0.75405944,111.78234,89.235813)" + inkscape:export-filename="/Users/arothfusz/src/metalivedev/docker/docs/sources/terms/images/docker-filesystems-multiroot.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +