Added Docker for AWS Test channel and release notes (docker#2749)

Signed-off-by: Ken Cochrane <[email protected]>
cambridgeconsultants · May 8, 2017 · 3421497 · 3421497
1 parent 84c8ff4
commit 3421497
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/_includes/d4a_buttons.md b/_includes/d4a_buttons.md
@@ -1,5 +1,6 @@
 {% assign d4a_stable = "CE-Stable-1" %}
 {% assign d4a_edge = "CE-Edge-1" %}
+{% assign d4a_test = "CE-Test-1" %}
 {% assign edition_version = "17.03.0-ce" %}
 
 
@@ -13,6 +14,10 @@
 <div class="clearfix"></div>
 {% endcapture %}
 
+{% capture aws_blue_test %}
+<a class="button outline-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/test/Docker.tmpl" data-rel="{{ d4a_test }}" target="blank">Deploy Docker Community Edition (CE) for AWS (test)</a>
+{% endcapture %}
+
 {% capture aws_blue_vpc_latest %}
 <a class="button outline-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker-no-vpc.tmpl" data-rel="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) for AWS (stable)<br/><small>uses your existing VPC</small></a>
 <div class="clearfix"></div>
@@ -23,6 +28,10 @@
 <div class="clearfix"></div>
 {% endcapture %}
 
+{% capture aws_blue_vpc_test %}
+<a class="button outline-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/test/Docker-no-vpc.tmpl" data-rel="{{ d4a_test }}" target="blank">Deploy Docker Community Edition (CE) for AWS (test)<br/><small>uses your existing VPC</small></a>
+{% endcapture %}
+
 {% capture azure_blue_latest %}
 <a class="button outline-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) for Azure (stable)</a>
 <div class="clearfix"></div>

diff --git a/docker-for-aws/index.md b/docker-for-aws/index.md
@@ -29,19 +29,25 @@ using CloudFormation. For more about stable and edge channels, see the
   <tr>
     <th style="font-size: x-large; font-family: arial">Stable channel</th>
     <th style="font-size: x-large; font-family: arial">Edge channel</th>
+    <th style="font-size: x-large; font-family: arial">Test channel</th>
   </tr>
   <tr valign="top">
-    <td width="50%">This deployment is fully baked and tested, and comes with the latest CE version of Docker. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>Stable is released quarterly and is for users that want an easier-to-maintain release pace.</td>
-    <td width="50%">This deployment offers cutting edge features of the CE version of Docker and comes with experimental features turned on, described in the <a href="https://github.com/moby/moby/tree/master/experimental">Docker Experimental Features README</a> on GitHub.<br><br>This is the best channel to use if you want to experiment with features under development, and can weather some instability and bugs. Edge is for users wanting a drop of the latest and greatest features every month <br><br>We collect usage data on edges across the board.</td>
+    <td width="33%">This deployment is fully baked and tested, and comes with the latest CE version of Docker. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>Stable is released quarterly and is for users that want an easier-to-maintain release pace.</td>
+    <td width="34%">This deployment offers cutting edge features of the CE version of Docker and comes with experimental features turned on, described in the <a href="https://github.com/moby/moby/tree/master/experimental">Docker Experimental Features README</a> on GitHub.<br><br>This is the best channel to use if you want to experiment with features under development, and can weather some instability and bugs. Edge is for users wanting a drop of the latest and greatest features every month <br><br>We collect usage data on edges across the board.</td>
+    <td width="33%">This is the test channel. It is used for testing release candidates for upcoming releases. Use this channel if you want to test out the new releases before they are available.</td>
   </tr>
   <tr valign="top">
-  <td width="50%">
+  <td width="33%">
   {{aws_blue_latest}}
   </td>
-  <td width="50%">
+  <td width="34%">
   {{aws_blue_edge}}
   {{aws_blue_vpc_edge}}
   </td>
+  <td width="34%">
+  {{aws_blue_test}}
+  {{aws_blue_vpc_test}}
+  </td>
   </tr>
 </table>
 

diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md
@@ -289,6 +289,20 @@ Release date: 7/13/2016
  * To assist with debugging, the Docker Engine API is available internally in the AWS VPC on TCP port 2375. These ports cannot be accessed from outside the cluster, but could be used from within the cluster to obtain privileged access on other cluster nodes. In future releases, direct remote access to the Docker API will not be available.
  * Likewise, swarm-mode is configured to auto-accept both manager and worker nodes inside the VPC. This policy will be changed to be more restrictive by default in the future.
 
+## Test Channel
+
+### 17.05.0-ce-rc1
+
+Release date: 04/12/2017
+
+{{aws_blue_test}}
+
+**New**
+
+- Docker Engine upgraded to [Docker 17.05.0 CE RC1](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+- Terminated instances will now automatically be removed from the Swarm.
+- [Bug Fix] [meta-server] fixed crashing issue, when an instance had no public IP address.
+
 ## Template Archive
 
 If you are looking for templates from older releases, please check out the [template archive](/docker-for-aws/archive.md).