Merge pull request docker-archive-public#1085 from zchee/update-amazonec2-ami

ehazlett · ehazlett · commit 6036c28fa5d6 · 2015-05-01T16:40:57.000-04:00
[EC2] Update AMI to release 20150417
diff --git a/docs/index.md b/docs/index.md
@@ -926,7 +926,7 @@ Create machines on [Amazon Web Services](http://aws.amazon.com).  You will need
 Options:
 
  - `--amazonec2-access-key`: **required** Your access key id for the Amazon Web Services API.
- - `--amazonec2-ami`: The AMI ID of the instance to use  Default: `ami-4ae27e22`
+ - `--amazonec2-ami`: The AMI ID of the instance to use  Default: `ami-cc3b3ea4`
  - `--amazonec2-instance-type`: The instance type to run.  Default: `t2.micro`
  - `--amazonec2-iam-instance-profile`: The AWS IAM role name to be used as the instance profile
  - `--amazonec2-region`: The region to use when launching the instance.  Default: `us-east-1`
@@ -943,17 +943,17 @@ By default, the Amazon EC2 driver will use a daily image of Ubuntu 14.04 LTS.
 
 | Region        | AMI ID     |
 |:--------------|:-----------|
-|ap-northeast-1 |ami-44f1e245|
-|ap-southeast-1 |ami-f95875ab|
-|ap-southeast-2 |ami-890b62b3|
-|cn-north-1     |ami-fe7ae8c7|
-|eu-west-1      |ami-823686f5|
-|eu-central-1   |ami-ac1524b1|
-|sa-east-1      |ami-c770c1da|
-|us-east-1      |ami-4ae27e22|
-|us-west-1      |ami-d1180894|
-|us-west-2      |ami-898dd9b9|
-|us-gov-west-1  |ami-cf5630ec|
+|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|
 
 #### Digital Ocean
 
diff --git a/drivers/amazonec2/utils.go b/drivers/amazonec2/utils.go
@@ -17,17 +17,17 @@ type region struct {
 }
 
 var regionDetails map[string]*region = map[string]*region{
-	"ap-northeast-1": {"ami-44f1e245"},
-	"ap-southeast-1": {"ami-f95875ab"},
-	"ap-southeast-2": {"ami-890b62b3"},
-	"cn-north-1":     {"ami-fe7ae8c7"},
-	"eu-west-1":      {"ami-823686f5"},
-	"eu-central-1":   {"ami-ac1524b1"},
-	"sa-east-1":      {"ami-c770c1da"},
-	"us-east-1":      {"ami-4ae27e22"},
-	"us-west-1":      {"ami-d1180894"},
-	"us-west-2":      {"ami-898dd9b9"},
-	"us-gov-west-1":  {"ami-cf5630ec"},
+	"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"},
 }
 
 func awsRegionsList() []string {
