updated templates and docs for aws beta 16 (docker-archive#632)

Signed-off-by: Ken Cochrane <[email protected]>
chungers · Jan 13, 2017 · 501801c · 501801c
1 parent d54b37e
commit 501801c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 36 deletions.
diff --git a/aws/cloudformation/docker_for_aws.json b/aws/cloudformation/docker_for_aws.json
@@ -1,7 +1,7 @@
 {
     "AWSTemplateFormatVersion": "2010-09-09",
 
-    "Description": "Docker for AWS 1.13.0-rc5 (beta15)",
+    "Description": "Docker for AWS 1.13.0-rc6 (beta16)",
 
     "Parameters": {
         "KeyName": {
@@ -227,8 +227,8 @@
 
         "DockerForAWS" : {
             "version" : {
-                "docker": "1.13.0-rc5",
-                "forAws": "aws-v1.13.0-rc5-beta15"
+                "docker": "1.13.0-rc6",
+                "forAws": "aws-v1.13.0-rc6-beta16"
             }
         },
 
@@ -383,59 +383,59 @@
         },
         "AWSRegionArch2AMI": {
             "ap-northeast-1": {
-                "HVM64": "ami-2a23504d",
+                "HVM64": "ami-7d58241a",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-northeast-2": {
-                "HVM64": "ami-ee5c8a80",
+                "HVM64": "ami-919d4cff",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-south-1": {
-                "HVM64": "ami-5d5f2932",
+                "HVM64": "ami-ba9bedd5",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-southeast-1": {
-                "HVM64": "ami-86933be5",
+                "HVM64": "ami-5a933839",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-southeast-2": {
-                "HVM64": "ami-1a262379",
+                "HVM64": "ami-5c74703f",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ca-central-1": {
-                "HVM64": "ami-8f18aaeb",
+                "HVM64": "ami-12f84576",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "eu-central-1": {
-                "HVM64": "ami-16a16c79",
+                "HVM64": "ami-6edb1701",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "eu-west-1": {
-                "HVM64": "ami-15745d66",
+                "HVM64": "ami-43072d30",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "eu-west-2": {
-                "HVM64": "ami-56f7fd32",
+                "HVM64": "ami-e7848e83",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "sa-east-1": {
-                "HVM64": "ami-af178cc3",
+                "HVM64": "ami-4557cd29",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-east-1": {
-                "HVM64": "ami-e3b652f5",
+                "HVM64": "ami-cb9479dd",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-east-2": {
-                "HVM64": "ami-09e7bd6c",
+                "HVM64": "ami-02705567",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-west-1": {
-                "HVM64": "ami-e7d18187",
+                "HVM64": "ami-d897c4b8",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-west-2": {
-                "HVM64": "ami-cea013ae",
+                "HVM64": "ami-f5962b95",
                 "HVMG2": "NOT_SUPPORTED"
             }
         }

diff --git a/aws/cloudformation/docker_for_aws_cloud.json b/aws/cloudformation/docker_for_aws_cloud.json
@@ -1,7 +1,7 @@
 {
     "AWSTemplateFormatVersion": "2010-09-09",
 
-    "Description": "Docker for AWS 1.13.0-rc2 (beta12) Cloud",
+    "Description": "Docker for AWS 1.13.0-rc6 (beta16) Cloud",
 
     "Parameters": {
         "KeyName": {
@@ -95,8 +95,8 @@
 
         "DockerForAWS" : {
             "version" : {
-                "docker": "1.13.0-rc2",
-                "forAws": "aws-v1.13.0-rc2-beta12"
+                "docker": "1.13.0-rc6",
+                "forAws": "aws-v1.13.0-rc6-beta16"
             }
         },
 
@@ -117,7 +117,6 @@
                 "cidr": "172.31.48.0/20"
             }
         },
-
         "AWSInstanceType2Arch": {
             "t2.micro": {
                 "Arch": "HVM64"
@@ -245,54 +244,61 @@
         },
         "AWSRegionArch2AMI": {
             "ap-northeast-1": {
-                "HVM64": "ami-b8be09d9",
+                "HVM64": "ami-7d58241a",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-northeast-2": {
-                "HVM64": "ami-65dc0b0b",
+                "HVM64": "ami-919d4cff",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-south-1": {
-                "HVM64": "ami-562d5a39",
+                "HVM64": "ami-ba9bedd5",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-southeast-1": {
-                "HVM64": "ami-f35bf990",
+                "HVM64": "ami-5a933839",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "ap-southeast-2": {
-                "HVM64": "ami-2bc8f648",
+                "HVM64": "ami-5c74703f",
+                "HVMG2": "NOT_SUPPORTED"
+            },
+            "ca-central-1": {
+                "HVM64": "ami-12f84576",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "eu-central-1": {
-                "HVM64": "ami-8efd39e1",
+                "HVM64": "ami-6edb1701",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "eu-west-1": {
-                "HVM64": "ami-33297540",
+                "HVM64": "ami-43072d30",
+                "HVMG2": "NOT_SUPPORTED"
+            },
+            "eu-west-2": {
+                "HVM64": "ami-e7848e83",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "sa-east-1": {
-                "HVM64": "ami-29861845",
+                "HVM64": "ami-4557cd29",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-east-1": {
-                "HVM64": "ami-d9c4f4ce",
+                "HVM64": "ami-cb9479dd",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-east-2": {
-                "HVM64": "ami-d29fc5b7",
+                "HVM64": "ami-02705567",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-west-1": {
-                "HVM64": "ami-fc7e2a9c",
+                "HVM64": "ami-d897c4b8",
                 "HVMG2": "NOT_SUPPORTED"
             },
             "us-west-2": {
-                "HVM64": "ami-71bb1411",
+                "HVM64": "ami-f5962b95",
                 "HVMG2": "NOT_SUPPORTED"
             }
-        }
     },
     "Resources": {
 

diff --git a/docs/content/aws/release-notes.md b/docs/content/aws/release-notes.md
@@ -16,11 +16,18 @@ weight="400"
 
 # Docker for AWS Release notes
 
+## 1.13.0-rc6-beta16
+Release date: 1/13/2017
+
+<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://docker-for-aws.s3.amazonaws.com/aws/beta/aws-v1.13.0-rc6-beta16.json" data-rel="Beta-16" target="blank" id="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
+
+### New
+- Docker Engine upgraded to [Docker 1.13.0-rc6](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+
+
 ## 1.13.0-rc5-beta15
 Release date: 1/05/2017
 
-<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://docker-for-aws.s3.amazonaws.com/aws/beta/aws-v1.13.0-rc5-beta15.json" data-rel="Beta-15" target="blank" id="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
-
 ### New
 - Docker Engine upgraded to [Docker 1.13.0-rc5](https://github.com/docker/docker/blob/master/CHANGELOG.md)