Skip to content

Commit 8174622

Browse files
committed
chore(*): update base CoreOS to 494.5.0
Includes Docker 1.3.3 with several security fixes. See https://coreos.com/releases/#494.5.0
1 parent aba19e7 commit 8174622

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ end
4545

4646
Vagrant.configure("2") do |config|
4747
config.vm.box = "coreos-%s" % $update_channel
48-
config.vm.box_version = ">= 494.4.0"
48+
config.vm.box_version = ">= 494.5.0"
4949
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
5050

5151
config.vm.provider :virtualbox do |vb, override|

contrib/ec2/deis.template.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484

8585
"Mappings" : {
8686
"CoreOSAMIs" : {
87-
"eu-central-1" : { "PV" : "ami-12c0f10f", "HVM" : "ami-10c0f10d" },
88-
"ap-northeast-1" : { "PV" : "ami-dc6566dd", "HVM" : "ami-da6566db" },
89-
"sa-east-1" : { "PV" : "ami-9bda6a86", "HVM" : "ami-99da6a84" },
90-
"ap-southeast-2" : { "PV" : "ami-abc8a191", "HVM" : "ami-a9c8a193" },
91-
"ap-southeast-1" : { "PV" : "ami-977559c5", "HVM" : "ami-957559c7" },
92-
"us-east-1" : { "PV" : "ami-f469f29c", "HVM" : "ami-f669f29e" },
93-
"us-west-2" : { "PV" : "ami-dbf8afeb", "HVM" : "ami-d9f8afe9" },
94-
"us-west-1" : { "PV" : "ami-af0516ea", "HVM" : "ami-ad0516e8" },
95-
"eu-west-1" : { "PV" : "ami-f6853881", "HVM" : "ami-f4853883" }
87+
"eu-central-1" : { "PV" : "ami-4e7d4d53", "HVM" : "ami-487d4d55" },
88+
"ap-northeast-1" : { "PV" : "ami-dccfc0dd", "HVM" : "ami-decfc0df" },
89+
"sa-east-1" : { "PV" : "ami-c904b4d4", "HVM" : "ami-cb04b4d6" },
90+
"ap-southeast-2" : { "PV" : "ami-d7e981ed", "HVM" : "ami-d1e981eb" },
91+
"ap-southeast-1" : { "PV" : "ami-81406fd3", "HVM" : "ami-83406fd1" },
92+
"us-east-1" : { "PV" : "ami-7e5d3d16", "HVM" : "ami-705d3d18" },
93+
"us-west-2" : { "PV" : "ami-4fd4857f", "HVM" : "ami-4dd4857d" },
94+
"us-west-1" : { "PV" : "ami-15fae850", "HVM" : "ami-17fae852" },
95+
"eu-west-1" : { "PV" : "ami-7a3a840d", "HVM" : "ami-783a840f" }
9696

9797
},
9898
"RootDevices" : {

contrib/rackspace/provision-rackspace-cluster.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ $CONTRIB_DIR/util/check-user-data.sh
4848

4949
i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
5050
echo_yellow "Provisioning deis-$i..."
51-
# TODO: update to CoreOS 494.4.0 when it's in the stable channel at Rackspace
52-
# This image is CoreOS 494.0.0 in their alpha channel
53-
supernova $ENV boot --image 1c423602-ea76-4263-b56b-0a2fa3e8c663 --flavor $FLAVOR --key-name $1 --user-data $CONTRIB_DIR/coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
51+
# TODO: update to CoreOS 494.5.0 when it's in the stable channel at Rackspace
52+
# This image is CoreOS 494.1.0 in their beta channel
53+
supernova $ENV boot --image 0c9c575e-6af8-4acd-96b0-c04ff0184718 --flavor $FLAVOR --key-name $1 --user-data $CONTRIB_DIR/coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
5454
((i = i + 1)) ; \
5555
done
5656

docs/installing_deis/baremetal.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ machine running entirely from RAM. Then, you can `install CoreOS to disk`_.
1616

1717
.. important::
1818

19-
Deis runs on CoreOS version 494.4.0 or later in the Stable channel.
19+
Deis runs on CoreOS version 494.5.0 or later in the Stable channel.
2020

2121

2222
Check System Requirements
@@ -99,8 +99,8 @@ Start the installation
9999
100100
101101
This will install the latest `CoreOS`_ stable release to disk. The Deis provision scripts for other
102-
platforms typically specify a CoreOS version - currently, ``494.4.0``. To specify a CoreOS
103-
version, append the ``-V`` parameter to the install command, e.g. ``-V 494.4.0``.
102+
platforms typically specify a CoreOS version - currently, ``494.5.0``. To specify a CoreOS
103+
version, append the ``-V`` parameter to the install command, e.g. ``-V 494.5.0``.
104104

105105
After the installation has finished, reboot your server. Once your machine is back up, you should
106106
be able to log in as the `core` user using the `deis` ssh key.

docs/installing_deis/gce.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
119119

120120
.. code-block:: console
121121
122-
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-stable-494-4-0-v20141204 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
122+
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-stable-494-5-0-v20141215 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
123123
124124
Table of resources:
125125

0 commit comments

Comments
 (0)