From 22aa07cf7a536a4037aa6dd458a792117f930ddd Mon Sep 17 00:00:00 2001 From: John Feminella Date: Sat, 23 Nov 2013 15:30:29 -0500 Subject: [PATCH 1/2] Reformats source text to proper widths Upstream-commit: c9432cf51aea9351cc88791036b986e6662a49b8 Component: engine --- .../docs/sources/installation/amazon.rst | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/components/engine/docs/sources/installation/amazon.rst b/components/engine/docs/sources/installation/amazon.rst index 0c36dbfc33..5e92fa8df3 100644 --- a/components/engine/docs/sources/installation/amazon.rst +++ b/components/engine/docs/sources/installation/amazon.rst @@ -22,20 +22,27 @@ Amazon QuickStart 1. **Choose an image:** - * Launch the `Create Instance Wizard` menu on your AWS Console - * Select "Community AMIs" option and serch for ``amd64 precise`` (click enter to search) - * If you choose a EBS enabled AMI you will be able to launch a `t1.micro` instance (more info on `pricing` ) - * 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. + * Launch the `Create Instance Wizard` + menu on + your AWS Console + + * Select "Community AMIs" option and serch for ``amd64 precise`` (click enter + to search) + + * If you choose a EBS enabled AMI you will be able to launch a `t1.micro` + instance (more info on `pricing` ) + + * 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. 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*. + * 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! +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 From 1ba0ef805d5efd54c108eb9b8aae46705953b327 Mon Sep 17 00:00:00 2001 From: John Feminella Date: Sat, 23 Nov 2013 15:36:09 -0500 Subject: [PATCH 2/2] Fixes broken RST links; clarifies AWS instructions Upstream-commit: 6c70d23e0d850b31fce0e658ad9ddd7a167bcdcb Component: engine --- .../docs/sources/installation/amazon.rst | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/components/engine/docs/sources/installation/amazon.rst b/components/engine/docs/sources/installation/amazon.rst index 5e92fa8df3..273eceb05f 100644 --- a/components/engine/docs/sources/installation/amazon.rst +++ b/components/engine/docs/sources/installation/amazon.rst @@ -22,24 +22,34 @@ Amazon QuickStart 1. **Choose an image:** - * Launch the `Create Instance Wizard` - menu on - your AWS Console + * Launch the `Create Instance Wizard + `_ menu + on your AWS Console. - * Select "Community AMIs" option and serch for ``amd64 precise`` (click enter - to search) + * When picking the source AMI for your instance type, select "Community + AMIs". - * If you choose a EBS enabled AMI you will be able to launch a `t1.micro` - instance (more info on `pricing` ) + * Search for ``amd64 precise``. Pick one of the amd64 Ubuntu images. + + * If you choose a EBS enabled AMI, you'll also be able to launch a + ``t1.micro`` instance (more info on `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 click away from having your Ubuntu VM up and running. 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*. `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 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. If you have an advanced AWS setup, you might want to have a look at - https://github.com/mitchellh/vagrant-aws + `vagrant-aws `_. 7. Connect to your machine