reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Vagrant to use Wily 15.10

Browse Source
This commit is contained in:
Adam Harrison committed 2016-01-20 09:17:07 +00:00
1 parent dd7271aaa2
commit 2a2b2da097
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/Vagrantfile
Vendored
+3 -3
View File
@@ -14,8 +14,8 @@ require '../vagrant-common.rb'
def configure_docker(host, hostname, ip)
pkgs = %w(docker-engine ethtool)
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.box = "ubuntu/ubuntu-15.10-amd64"
host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/wily/current/wily-server-cloudimg-amd64-vagrant-disk1.box"
host.vm.provision :shell, :inline => "hostnamectl set-hostname "+hostname
host.vm.network "private_network", ip: ip
@@ -23,7 +23,7 @@ def configure_docker(host, hostname, ip)
host.vm.synced_folder ".", "/vagrant", disabled: true
host.vm.provision :shell, :inline => "sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
host.vm.provision :shell, :inline => "echo deb https://apt.dockerproject.org/repo ubuntu-vivid main > /etc/apt/sources.list.d/docker.list"
host.vm.provision :shell, :inline => "echo deb https://apt.dockerproject.org/repo ubuntu-wily main > /etc/apt/sources.list.d/docker.list"
install_packages host.vm, pkgs
tweak_docker_daemon host.vm