Merge pull request #1169 from deis/coreos-343.0.0

chore(contrib): bump coreos to v349.0.0

Author: Matthew Fisher

Makefile

@@ -19,7 +19,7 @@ define deis_units
 	  sed -n 's/\(deis-.*\.service\).*/\1/p' | tr '\n' ' ')
 endef
 
-# TODO: re-evaluate the fragile start order now that we're on fleet 0.3.2.
+# TODO: re-evaluate the fragile start order
 COMPONENTS=builder cache controller database logger registry
 ALL_COMPONENTS=$(COMPONENTS) router
 START_COMPONENTS=registry logger cache database

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.3.2 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-324.2.0"
-  config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.2.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/324.2.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|

builder/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get install -yq aufs-tools iptables ca-certificates lxc
 RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
 RUN apt-get update -qy
-RUN apt-get install -yq lxc-docker-0.11.1
+RUN apt-get install -yq lxc-docker-1.0.0
 
 # install recent pip
 RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -

contrib/ec2/deis.template

@@ -4,28 +4,28 @@
   "Mappings" : {
       "RegionMap" : {
           "ap-northeast-1" : {
-              "AMI" : "ami-25175a24"
+              "AMI" : "ami-253b7324"
           },
           "sa-east-1" : {
-              "AMI" : "ami-b96fc3a4"
+              "AMI" : "ami-8fab0492"
           },
           "ap-southeast-2" : {
-              "AMI" : "ami-792ab043"
+              "AMI" : "ami-9f0c68a5"
           },
           "ap-southeast-1" : {
-              "AMI" : "ami-58c9940a"
+              "AMI" : "ami-ac1b44fe"
           },
           "us-east-1" : {
-              "AMI" : "ami-8a53a6e2"
+              "AMI" : "ami-820ff0ea"
           },
           "us-west-2" : {
-              "AMI" : "ami-a7d1a197"
+              "AMI" : "ami-7b8ff24b"
           },
           "us-west-1" : {
-              "AMI" : "ami-debdb89b"
+              "AMI" : "ami-ea5650af"
           },
           "eu-west-1" : {
-              "AMI" : "ami-1df4396a"
+              "AMI" : "ami-a73bf2d0"
           }
       }
   },

controller/scheduler/coreos.py

@@ -197,9 +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) ; /usr/bin/docker run --name {name} -P -e PORT=$port {image} {command}"
-ExecStartPost=/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"; \
-    /bin/sh -c "arping -Idocker0 -c1 `docker inspect -f '{{{{ .NetworkSettings.IPAddress }}}}' {name}`"
+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
 """
@@ -225,8 +223,8 @@ def attach(self, name):
 BindsTo={name}.service
 
 [Service]
-ExecStartPre=/bin/sh -c "until /usr/bin/docker inspect {name} >/dev/null 2>&1; do sleep 1; done"
-ExecStart=/bin/sh -c "/usr/bin/docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host | cut -d ':' -f1) --port $(etcdctl get /deis/logs/port | cut -d ':' -f2)"
+ExecStartPre=/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"
+ExecStart=/bin/sh -c "docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host | cut -d ':' -f1) --port $(etcdctl get /deis/logs/port | cut -d ':' -f2)"
 
 [X-Fleet]
 X-ConditionMachineOf={name}.service