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

Update AMI to release 20150603 

Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
This commit is contained in:
Koichi Shiraishi 2015-05-24 07:01:26 +09:00
parent 19d3bdd389
commit 0dc1cc0ff3
No known key found for this signature in database
GPG Key ID: A71DFD3B4DA7A79B
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/index.md
View File

@ -1054,19 +1054,19 @@ Options:
By default, the Amazon EC2 driver will use a daily image of Ubuntu 14.04 LTS.
| Region | AMI ID |
|:--------------|:-----------|
|ap-northeast-1 |ami-fc11d4fc|
|ap-southeast-1 |ami-7854692a|
|ap-southeast-2 |ami-c5611cff|
|cn-north-1 |ami-7cd84545|
|eu-west-1 |ami-2d96f65a|
|eu-central-1 |ami-3cdae621|
|sa-east-1 |ami-71b2376c|
|us-east-1 |ami-cc3b3ea4|
|us-west-1 |ami-017f9d45|
|us-west-2 |ami-55526765|
|us-gov-west-1 |ami-8ffa9bac|
| Region | AMI ID |
|----------------|--------------|
| ap-northeast-1 | ami-f4b06cf4 |
| ap-southeast-1 | ami-b899a2ea |
| ap-southeast-2 | ami-b59ce48f |
| cn-north-1 | ami-da930ee3 |
| eu-west-1 | ami-45d8a532 |
| eu-central-1 | ami-b6e0d9ab |
| sa-east-1 | ami-1199190c |
| us-east-1 | ami-5f709f34 |
| us-west-1 | ami-615cb725 |
| us-west-2 | ami-7f675e4f |
| us-gov-west-1 | ami-99a9c9ba |
Environment variables and default values:
@ -1075,7 +1075,7 @@ Environment variables and default values:
| **`--amazonec2-access-key`** | `AWS_ACCESS_KEY_ID` | - |
| **`--amazonec2-secret-key`** | `AWS_SECRET_ACCESS_KEY` | - |
| `--amazonec2-session-token` | `AWS_SESSION_TOKEN` | - |
| `--amazonec2-ami` | `AWS_AMI` | `ami-cc3b3ea4` |
| `--amazonec2-ami` | `AWS_AMI` | `ami-5f709f34` |
| `--amazonec2-region` | `AWS_DEFAULT_REGION` | `us-east-1` |
| **`--amazonec2-vpc-id`** | `AWS_VPC_ID` | - |
| `--amazonec2-zone` | `AWS_ZONE` | `a` |

23
drivers/amazonec2/utils.go
View File

@ -16,18 +16,19 @@ type region struct {
AmiId string
}
// Release 20150603
var regionDetails map[string]*region = map[string]*region{
"ap-northeast-1": {"ami-fc11d4fc"},
"ap-southeast-1": {"ami-7854692a"},
"ap-southeast-2": {"ami-c5611cff"},
"cn-north-1": {"ami-7cd84545"},
"eu-west-1": {"ami-2d96f65a"},
"eu-central-1": {"ami-3cdae621"},
"sa-east-1": {"ami-71b2376c"},
"us-east-1": {"ami-cc3b3ea4"},
"us-west-1": {"ami-017f9d45"},
"us-west-2": {"ami-55526765"},
"us-gov-west-1": {"ami-8ffa9bac"},
"ap-northeast-1": {"ami-f4b06cf4"},
"ap-southeast-1": {"ami-b899a2ea"},
"ap-southeast-2": {"ami-b59ce48f"},
"cn-north-1": {"ami-da930ee3"},
"eu-west-1": {"ami-45d8a532"},
"eu-central-1": {"ami-b6e0d9ab"},
"sa-east-1": {"ami-1199190c"},
"us-east-1": {"ami-5f709f34"},
"us-west-1": {"ami-615cb725"},
"us-west-2": {"ami-7f675e4f"},
"us-gov-west-1": {"ami-99a9c9ba"},
}
func awsRegionsList() []string {