chore(contrib): bump coreos to v349.0.0

Still waiting on Rackspace, as they're still on v338.0.0 as of
this commit.

Author: Matthew Fisher

README.md

@@ -19,8 +19,8 @@ Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io
 
 ## Install prerequisites
 On your workstation:
-* Install [Vagrant](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Install the fleetctl client: Install v0.4.0 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
+* Install [Vagrant v1.6+](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
+* Install the fleetctl client: Install v0.5.0 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
 * Install the Docker client if you want to run Docker commands locally (optional)
 
 ## Additional setup for a multi-node cluster

Vagrantfile

@@ -12,11 +12,11 @@ else
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "coreos-343.0.0"
-  config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/343.0.0/coreos_production_vagrant.box"
+  config.vm.box = "coreos-349.0.0"
+  config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/349.0.0/coreos_production_vagrant.box"
 
   config.vm.provider :vmware_fusion do |vb, override|
-    override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/343.0.0/coreos_production_vagrant_vmware_fusion.box"
+    override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/349.0.0/coreos_production_vagrant_vmware_fusion.box"
   end
 
   config.vm.provider :virtualbox do |vb, override|

contrib/ec2/deis.template

@@ -4,28 +4,28 @@
   "Mappings" : {
       "RegionMap" : {
           "ap-northeast-1" : {
-              "AMI" : "ami-03c08f02"
+              "AMI" : "ami-253b7324"
           },
           "sa-east-1" : {
-              "AMI" : "ami-fb08a4e6"
+              "AMI" : "ami-8fab0492"
           },
           "ap-southeast-2" : {
-              "AMI" : "ami-07b9dc3d"
+              "AMI" : "ami-9f0c68a5"
           },
           "ap-southeast-1" : {
-              "AMI" : "ami-0a732f58"
+              "AMI" : "ami-ac1b44fe"
           },
           "us-east-1" : {
-              "AMI" : "ami-908172f8"
+              "AMI" : "ami-820ff0ea"
           },
           "us-west-2" : {
-              "AMI" : "ami-3d42300d"
+              "AMI" : "ami-7b8ff24b"
           },
           "us-west-1" : {
-              "AMI" : "ami-fa6463bf"
+              "AMI" : "ami-ea5650af"
           },
           "eu-west-1" : {
-              "AMI" : "ami-8f30fff8"
+              "AMI" : "ami-a73bf2d0"
           }
       }
   },

controller/scheduler/coreos.py

@@ -197,7 +197,7 @@ def attach(self, name):
 [Service]
 ExecStartPre=/usr/bin/docker pull {image}
 ExecStartPre=/bin/sh -c "docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true"
-ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $k, $v := .config.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' {image} | cut -d/ -f1) ; docker run --name {name} -P -e PORT=$port {image} {command}"
+ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' {image} | cut -d/ -f1) ; docker run --name {name} -P -e PORT=$port {image} {command}"
 ExecStop=/usr/bin/docker rm -f {name}
 TimeoutStartSec=20m
 """