Merge pull request deis#3316 from carmstrong/coreos_607.0.0

chore(*): bump CoreOS to 607.0.0; Docker to 1.5.0
ehowe · Mar 17, 2015 · 6f00f9b · 6f00f9b
2 parents eeab1df + 7c96ef4
commit 6f00f9b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -54,7 +54,7 @@ Vagrant.configure("2") do |config|
   config.ssh.insert_key = false
 
   config.vm.box = "coreos-%s" % $update_channel
-  config.vm.box_version = ">= 557.2.0"
+  config.vm.box_version = ">= 607.0.0"
   config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware|

diff --git a/builder/image/Dockerfile b/builder/image/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F9
 RUN apt-get update && apt-get install -yq \
     openssh-server git \
     aufs-tools iptables lxc \
-    lxc-docker-1.4.1
+    lxc-docker-1.5.0
 
 # configure ssh server
 RUN rm /etc/ssh/ssh_host_*

diff --git a/contrib/azure/azure-coreos-cluster b/contrib/azure/azure-coreos-cluster
@@ -33,8 +33,8 @@ parser.add_argument('--location', default='West US',
                    help='optional, [West US]')
 parser.add_argument('--ssh', default=22001, type=int,
                    help='optional, starts with 22001 and +1 for each machine in cluster')
-parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-557.2.0',
-                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-557.2.0]')
+parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-607.0.0',
+                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-607.0.0]')
 parser.add_argument('--num-nodes', default=3, type=int,
                    help='optional, number of nodes to create (or add), defaults to 3')
 parser.add_argument('--virtual-network-name',

diff --git a/contrib/ec2/deis.template.json b/contrib/ec2/deis.template.json
@@ -103,15 +103,15 @@
 
   "Mappings" : {
     "CoreOSAMIs" : {
-      "eu-central-1"   : { "PV" : "ami-88c1f295", "HVM" : "ami-8ec1f293" },
-      "ap-northeast-1" : { "PV" : "ami-ea5c46eb", "HVM" : "ami-e85c46e9" },
-      "sa-east-1"      : { "PV" : "ami-2fe95632", "HVM" : "ami-2de95630" },
-      "ap-southeast-2" : { "PV" : "ami-4fd3a775", "HVM" : "ami-4dd3a777" },
-      "ap-southeast-1" : { "PV" : "ami-70dcf622", "HVM" : "ami-72dcf620" },
-      "us-east-1"      : { "PV" : "ami-8097d4e8", "HVM" : "ami-8297d4ea" },
-      "us-west-2"      : { "PV" : "ami-f3702bc3", "HVM" : "ami-f1702bc1" },
-      "us-west-1"      : { "PV" : "ami-26b5ad63", "HVM" : "ami-24b5ad61" },
-      "eu-west-1"      : { "PV" : "ami-5b911f2c", "HVM" : "ami-5d911f2a" }
+      "eu-central-1"   : { "PV" : "ami-0c300d11", "HVM" : "ami-0e300d13" },
+      "ap-northeast-1" : { "PV" : "ami-b128dcb1", "HVM" : "ami-af28dcaf" },
+      "sa-east-1"      : { "PV" : "ami-2154ec3c", "HVM" : "ami-2354ec3e" },
+      "ap-southeast-2" : { "PV" : "ami-bbb5c581", "HVM" : "ami-b9b5c583" },
+      "ap-southeast-1" : { "PV" : "ami-fa0b3aa8", "HVM" : "ami-f80b3aaa" },
+      "us-east-1"      : { "PV" : "ami-343b195c", "HVM" : "ami-323b195a" },
+      "us-west-2"      : { "PV" : "ami-0989a439", "HVM" : "ami-0789a437" },
+      "us-west-1"      : { "PV" : "ami-83d533c7", "HVM" : "ami-8dd533c9" },
+      "eu-west-1"      : { "PV" : "ami-57950a20", "HVM" : "ami-55950a22" }
 
     },
     "RootDevices" : {

diff --git a/docs/installing_deis/baremetal.rst b/docs/installing_deis/baremetal.rst
@@ -104,8 +104,8 @@ Start the installation
 
 
 This will install the latest `CoreOS`_ stable release to disk. The Deis provision scripts for other
-platforms typically specify a CoreOS version - currently, ``557.2.0``. To specify a CoreOS
-version, append the ``-V`` parameter to the install command, e.g. ``-V 557.2.0``.
+platforms typically specify a CoreOS version - currently, ``607.0.0``. To specify a CoreOS
+version, append the ``-V`` parameter to the install command, e.g. ``-V 607.0.0``.
 
 After the installation has finished, reboot your server. Once your machine is back up, you should
 be able to log in as the `core` user using the `deis` ssh key.

diff --git a/docs/installing_deis/gce.rst b/docs/installing_deis/gce.rst
@@ -118,7 +118,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
       --metadata-from-file user-data=gce-user-data sshKeys=~/.ssh/deis.pub \
       --disk name=cored${num} device-name=coredocker \
       --tags deis \
-      --image coreos-stable-557-2-0-v20150210 \
+      --image coreos-stable-607-0-0-v20150317 \
       --image-project coreos-cloud;
     done