Skip to content

Commit

Permalink
Merge pull request docker#2651 from synhaptein/patch-1
Browse files Browse the repository at this point in the history
Update aws.md
  • Loading branch information
jeanlaurent committed Dec 22, 2015
2 parents 01873fe + f6a67ef commit f2ca6b8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/drivers/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ This example assumes the VPC ID was found in the `a` availability zone. Use the`
- `--amazonec2-ssh-user`: SSH Login user name.
- `--amazonec2-request-spot-instance`: Use spot instances.
- `--amazonec2-spot-price`: Spot instance bid price (in dollars). Require the `--amazonec2-request-spot-instance` flag.
- `--amazonec2-use-private-address`: Use the private IP address for docker-machine, but still create a public IP address.
- `--amazonec2-private-address-only`: Use the private IP address only.
- `--amazonec2-monitoring`: Enable CloudWatch Monitoring.

Expand Down Expand Up @@ -86,5 +87,6 @@ Environment variables and default values:
| `--amazonec2-ssh-user` | `AWS_SSH_USER` | `ubuntu` |
| `--amazonec2-request-spot-instance` | - | `false` |
| `--amazonec2-spot-price` | - | `0.50` |
| `--amazonec2-use-private-address` | - | `false` |
| `--amazonec2-private-address-only` | - | `false` |
| `--amazonec2-monitoring` | - | `false` |

0 comments on commit f2ca6b8

Please sign in to comment.