Skip to content

Commit 6acc718

Browse files
committed
chore(coreos): upgrade to 379.3.0
This also bumps Docker to 1.1.1. Note that this also changes the device names for EC2 and DigitalOcean, as CoreOS changed these as of 379.0.0.
1 parent e80ef8e commit 6acc718

6 files changed

Lines changed: 18 additions & 16 deletions

File tree

Vagrantfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ else
1111
cpus = 1
1212
end
1313

14+
COREOS_VERSION = "379.3.0"
15+
1416
Vagrant.configure("2") do |config|
15-
config.vm.box = "coreos-349.0.0"
16-
config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/349.0.0/coreos_production_vagrant.box"
17+
config.vm.box = "coreos-#{COREOS_VERSION}"
18+
config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant.box"
1719

1820
config.vm.provider :vmware_fusion do |vb, override|
19-
override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/349.0.0/coreos_production_vagrant_vmware_fusion.box"
21+
override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant_vmware_fusion.box"
2022
end
2123

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

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -yq \
99
openssh-server git \
1010
aufs-tools iptables lxc \
1111
curl \
12-
lxc-docker-1.0.0
12+
lxc-docker-1.1.1
1313

1414
# configure ssh server
1515
RUN rm /etc/ssh/ssh_host_*

contrib/digitalocean/cloud-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ coreos:
1515
- name: public.network
1616
content: |
1717
[Match]
18-
Name=ens3
18+
Name=eth0
1919
2020
[Network]
2121
Address=PUBLIC_IP

contrib/digitalocean/coreos-setup-environment

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
sed -i -e '/^COREOS_PUBLIC_IPV4=/d;/^COREOS_PRIVATE_IPV4=/d' $ENV
1717

18-
COREOS_PUBLIC_IPV4=$(ip -4 -o addr show dev ens3 | awk '{ print $4; }' | cut -d / -f1)
18+
COREOS_PUBLIC_IPV4=$(ip -4 -o addr show dev eth0 | awk '{ print $4; }' | cut -d / -f1)
1919
COREOS_PRIVATE_IPV4=$(ip -4 -o addr show dev ens4v1 | awk '{ print $4; }' | cut -d / -f1)
2020
echo COREOS_PUBLIC_IPV4=$COREOS_PUBLIC_IPV4 >> $ENV
2121
echo COREOS_PRIVATE_IPV4=$COREOS_PRIVATE_IPV4 >> $ENV

contrib/digitalocean/update-coreos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
COREOS_VERSION=349.0.0
5+
COREOS_VERSION=379.3.0
66
BASE_URL="http://storage.core-os.net/coreos/amd64-usr/$COREOS_VERSION"
77

88
KERNEL="/boot/coreos/vmlinuz"

contrib/ec2/deis.template.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
"Mappings" : {
55
"RegionMap" : {
66
"ap-northeast-1" : {
7-
"AMI" : "ami-253b7324"
7+
"AMI" : "ami-d7dc8cd6"
88
},
99
"sa-east-1" : {
10-
"AMI" : "ami-8fab0492"
10+
"AMI" : "ami-0d329c10"
1111
},
1212
"ap-southeast-2" : {
13-
"AMI" : "ami-9f0c68a5"
13+
"AMI" : "ami-4d8fe877"
1414
},
1515
"ap-southeast-1" : {
16-
"AMI" : "ami-ac1b44fe"
16+
"AMI" : "ami-5695cc04"
1717
},
1818
"us-east-1" : {
19-
"AMI" : "ami-820ff0ea"
19+
"AMI" : "ami-3c66ab54"
2020
},
2121
"us-west-2" : {
22-
"AMI" : "ami-7b8ff24b"
22+
"AMI" : "ami-bbb9c08b"
2323
},
2424
"us-west-1" : {
25-
"AMI" : "ami-ea5650af"
25+
"AMI" : "ami-7d414238"
2626
},
2727
"eu-west-1" : {
28-
"AMI" : "ami-a73bf2d0"
28+
"AMI" : "ami-0573a472"
2929
}
3030
}
3131
},
@@ -182,7 +182,7 @@
182182
"UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] } },
183183
"BlockDeviceMappings" : [
184184
{
185-
"DeviceName" : "/dev/sda",
185+
"DeviceName" : "/dev/xvda",
186186
"Ebs" : { "VolumeSize" : "100" }
187187
}
188188
]

0 commit comments

Comments
 (0)