diff --git a/docs/drivers/aws.md b/docs/drivers/aws.md index eb3c796889..5710b17858 100644 --- a/docs/drivers/aws.md +++ b/docs/drivers/aws.md @@ -9,12 +9,31 @@ parent="smn_machine_drivers" # Amazon Web Services -Create machines on [Amazon Web Services](http://aws.amazon.com). You will need -an Access Key ID, Secret Access Key and a VPC ID. To find the VPC ID, login to -the AWS console and go to Services -> VPC -> Your VPCs. Select the one where you -would like to launch the instance. +Create machines on [Amazon Web Services](http://aws.amazon.com). To create machines on [Amazon Web Services](http://aws.amazon.com), you must supply three required parameters: -Options: + - Access Key ID + - Secret Access Key + - VPC ID + +Obtain your IDs and Keys from AWS. To find the VPC ID: + + 1. Login to the AWS console + 2. Go to **Services -> VPC -> Your VPCs**. + 3. Locate the VPC ID you want from the *VPC* column. + 4. Go to **Services -> VPC -> Subnets**. Examine the *Availability Zone* column to verify that zone `a` exists and matches your VPC ID. + + For example, `us-east1-a` is in the `a` availability zone. If the `a` zone is not present, you can create a new subnet in that zone or specify a different zone when you create the machine. + +To create the machine instance, specify `--driver amazonec2` and the three required parameters. + +``` +$ docker-machine create --driver amazonec2 --amazonec2-access-key AKI******* --amazonec2-secret-key 8T93C********* --amazonec2-vpc-id vpc-****** aws01 +``` + +This example assumes the VPC ID was found in the `a` availability zone. Use the` --amazonec2-zone` flag to specify a zone other than the `a` zone. For example, `--amazonec2-zone c` signifies `us-east1-c`. + + +### Options - `--amazonec2-access-key`: **required** Your access key id for the Amazon Web Services API. - `--amazonec2-secret-key`: **required** Your secret access key for the Amazon Web Services API. @@ -71,4 +90,3 @@ Environment variables and default values: | `--amazonec2-spot-price` | - | `0.50` | | `--amazonec2-private-address-only` | - | `false` | | `--amazonec2-monitoring` | - | `false` | - diff --git a/docs/install-machine.md b/docs/install-machine.md index 6fc9869d55..0b544b2770 100644 --- a/docs/install-machine.md +++ b/docs/install-machine.md @@ -31,39 +31,31 @@ target="_blank">the Docker binary. 2. Download the archive containing the Docker Machine binaries and extract them to your PATH. -Linux: + Linux: -``` -$ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_linux-amd64.zip >machine.zip && \ - unzip machine.zip && \ - rm machine.zip && \ - mv docker-machine* /usr/local/bin -``` + $ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_linux-amd64.zip >machine.zip && \ + unzip machine.zip && \ + rm machine.zip && \ + mv docker-machine* /usr/local/bin -OSX: + OSX: -``` -$ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_darwin-amd64.zip >machine.zip && \ - unzip machine.zip && \ - rm machine.zip && \ - mv docker-machine* /usr/local/bin -``` + $ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_darwin-amd64.zip >machine.zip && \ + unzip machine.zip && \ + rm machine.zip && \ + mv docker-machine* /usr/local/bin -Windows (using Git Bash): + Windows (using Git Bash): -``` -$ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_windows-amd64.zip >machine.zip && \ - unzip machine.zip && \ - rm machine.zip && \ - mv docker-machine* /usr/local/bin -``` + $ curl -L https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_windows-amd64.zip >machine.zip && \ + unzip machine.zip && \ + rm machine.zip && \ + mv docker-machine* /usr/local/bin -3. Check the installation by displaying the Machine version: +4. Check the installation by displaying the Machine version: -``` -$ docker-machine -v -machine version 0.5.0 (3e06852) -``` + $ docker-machine -v + machine version 0.5.0 (3e06852) ## Where to go next