docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes broken RST links; clarifies AWS instructions

This commit is contained in:
John Feminella 2013-11-23 15:36:09 -05:00
parent c9432cf51a
commit 6c70d23e0d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/sources/installation/amazon.rst
View File

@ -22,24 +22,34 @@ Amazon QuickStart
1. **Choose an image:** 1. **Choose an image:**
* Launch the `Create Instance Wizard` * Launch the `Create Instance Wizard
<https://console.aws.amazon.com/ec2/v2/home?#LaunchInstanceWizard:> menu on <https://console.aws.amazon.com/ec2/v2/home?#LaunchInstanceWizard:>`_ menu
your AWS Console on your AWS Console.
* Select "Community AMIs" option and serch for ``amd64 precise`` (click enter * When picking the source AMI for your instance type, select "Community
to search) AMIs".
* If you choose a EBS enabled AMI you will be able to launch a `t1.micro` * Search for ``amd64 precise``. Pick one of the amd64 Ubuntu images.
instance (more info on `pricing` <http://aws.amazon.com/en/ec2/pricing/> )
* If you choose a EBS enabled AMI, you'll also be able to launch a
``t1.micro`` instance (more info on `pricing
<http://aws.amazon.com/en/ec2/pricing/>`_). ``t1.micro`` instances are
eligible for Amazon's Free Usage Tier.
* When you click select you'll be taken to the instance setup, and you're one * When you click select you'll be taken to the instance setup, and you're one
click away from having your Ubuntu VM up and running. click away from having your Ubuntu VM up and running.
2. **Tell CloudInit to install Docker:** 2. **Tell CloudInit to install Docker:**
* When you're on the "Configure Instance Details" step, expand the "Advanced
Details" section.
* Under "User data", select "As text".
* Enter ``#include https://get.docker.io`` into the instance *User Data*. * Enter ``#include https://get.docker.io`` into the instance *User Data*.
`CloudInit <https://help.ubuntu.com/community/CloudInit>`_ is part of the `CloudInit <https://help.ubuntu.com/community/CloudInit>`_ is part of the
Ubuntu image you chose and it bootstraps from this *User Data*. Ubuntu image you chose; it will bootstrap Docker by running the shell
script located at this URL.
3. After a few more standard choices where defaults are probably ok, your AWS 3. After a few more standard choices where defaults are probably ok, your AWS
Ubuntu instance with Docker should be running! Ubuntu instance with Docker should be running!
@ -159,7 +169,7 @@ Docker that way too. Vagrant 1.1 or higher is required.
includes rights to SSH (port 22) to your container. includes rights to SSH (port 22) to your container.
If you have an advanced AWS setup, you might want to have a look at If you have an advanced AWS setup, you might want to have a look at
https://github.com/mitchellh/vagrant-aws `vagrant-aws <https://github.com/mitchellh/vagrant-aws>`_.
7. Connect to your machine 7. Connect to your machine