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

Update aws.md (#3320)

This commit is contained in:
Wang Jie 2017-05-24 01:10:20 +08:00 committed by Misty Stanley-Jones
parent 0c044d01a1
commit 2b79393e81
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
machine/drivers/aws.md
View File

@ -42,14 +42,14 @@ You can use environment variables:
## Options
- `--amazonec2-access-key`: Your access key id for the Amazon Web Services API.
- `--amazonec2-access-key`: Your access key ID for the Amazon Web Services API.
- `--amazonec2-secret-key`: Your secret access key for the Amazon Web Services API.
- `--amazonec2-session-token`: Your session token for the Amazon Web Services API.
- `--amazonec2-ami`: The AMI ID of the instance to use.
- `--amazonec2-region`: The region to use when launching the instance.
- `--amazonec2-vpc-id`: Your VPC ID to launch the instance in.
- `--amazonec2-zone`: The AWS zone to launch the instance in (i.e. one of a,b,c,d,e).
- `--amazonec2-subnet-id`: AWS VPC subnet id.
- `--amazonec2-subnet-id`: AWS VPC subnet ID.
- `--amazonec2-security-group`: AWS VPC security group name.
- `--amazonec2-tags`: AWS extra tag key-value pairs (comma-separated, e.g. key1,value1,key2,value2).
- `--amazonec2-instance-type`: The instance type to run.
@ -65,7 +65,7 @@ You can use environment variables:
- `--amazonec2-monitoring`: Enable CloudWatch Monitoring.
- `--amazonec2-use-ebs-optimized-instance`: Create an EBS Optimized Instance, instance type must support it.
- `--amazonec2-ssh-keypath`: Path to Private Key file to use for instance. Matching public key with .pub extension should exist
- `--amazonec2-retries`: Set retry count for recoverable failures (use -1 to disable)
- `--amazonec2-retries`: Set retry count for recoverable failures (use -1 to disable)
#### Environment variables and default values:
@ -125,11 +125,11 @@ Note that a security group will be created and associated to the host. This secu
- swarm (3376/tcp), only if the node is a swarm master
If you specify a security group yourself using the `--amazonec2-security-group` flag, the above ports will be checked and opened and the security group modified.
If you want more ports to be opened, like application specific ports, use the aws console and modify the configuration manually.
If you want more ports to be opened, like application specific ports, use the AWS console and modify the configuration manually.
## VPC ID
We determine your default vpc id at the start of a command.
We determine your default VPC ID at the start of a command.
In some cases, either because your account does not have a default vpc, or you don't want to use the default one, you can specify a vpc with the `--amazonec2-vpc-id` flag.
To find the VPC ID:
@ -141,7 +141,7 @@ To find the 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 a machine with a non-default vpc-id:
To create a machine with a non-default VPC-ID:
$ docker-machine create --driver amazonec2 --amazonec2-access-key AKI******* --amazonec2-secret-key 8T93C********* --amazonec2-vpc-id vpc-****** aws02