From db8016112e74208024ac64d2a9240fda51390ed1 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jul 2015 18:28:11 +0100 Subject: [PATCH 1/2] Upgrade to Ubuntu 15.04 --- test/Vagrantfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/Vagrantfile b/test/Vagrantfile index 1a888f4068..070110d09b 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -14,10 +14,10 @@ require '../vagrant-common.rb' def configure_docker(host, hostname, ip) pkgs = %w(lxc-docker ethtool) - host.vm.box = "ubuntu/ubuntu-14.10-amd64" - host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/utopic/current/utopic-server-cloudimg-amd64-vagrant-disk1.box" + host.vm.box = "ubuntu/ubuntu-15.04-amd64" + host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box" - host.vm.hostname = hostname + host.vm.provision :shell, :inline => "hostnamectl set-hostname "+hostname host.vm.network "private_network", ip: ip host.vm.synced_folder ".", "/vagrant", disabled: true @@ -29,8 +29,11 @@ def configure_docker(host, hostname, ip) host.vm.provision :shell, :inline => "usermod -a -G docker vagrant; " # Listen on the remote API - host.vm.provision :shell, :inline => "echo 'DOCKER_OPTS=\"-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375\"' >> /etc/default/docker" - host.vm.provision :shell, :inline => "service docker restart" + host.vm.provision :shell, :inline => "sed -i -e's%-H fd://%-H fd:// -H tcp://0.0.0.0:2375%' /lib/systemd/system/docker.service" + host.vm.provision :shell, :inline => "systemctl daemon-reload" + + host.vm.provision :shell, :inline => "systemctl start docker" + host.vm.provision :shell, :inline => "systemctl enable docker" cleanup(host.vm) end From 4853a1da05ae7ebc7b6308dffcaa0d2cc802a3f4 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jul 2015 18:28:29 +0100 Subject: [PATCH 2/2] Tell Docker to use 'overlay' storage driver --- test/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Vagrantfile b/test/Vagrantfile index 070110d09b..c150129cca 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -28,8 +28,8 @@ def configure_docker(host, hostname, ip) install_packages host.vm, pkgs host.vm.provision :shell, :inline => "usermod -a -G docker vagrant; " - # Listen on the remote API - host.vm.provision :shell, :inline => "sed -i -e's%-H fd://%-H fd:// -H tcp://0.0.0.0:2375%' /lib/systemd/system/docker.service" + # Listen on the remote API and use overlay storage driver + host.vm.provision :shell, :inline => "sed -i -e's%-H fd://%-H fd:// -H tcp://0.0.0.0:2375 -s overlay%' /lib/systemd/system/docker.service" host.vm.provision :shell, :inline => "systemctl daemon-reload" host.vm.provision :shell, :inline => "systemctl start docker"