Merge remote-tracking branch 'upstream/pull/1964'

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 0cd5ac72aa760553b8fdbada019af56c46cd19b4..d10934b3736b0c3c3f936deee7a885824b4c36f2 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,21 +4,22 @@
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|
-    override.vm.box = "ubuntu/trusty64"
+    override.vm.box = "ubuntu/xenial64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"
     vb.customize ["modifyvm", :id, "--memory", "1024"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
   end
 
   # use third party image and NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|
-    override.vm.box = "sputnik13/trusty64"
+    override.vm.box = "generic/ubuntu1604"
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
   end
 
   # use third party image and NFS sharing for libvirt
   config.vm.provider "libvirt" do |_, override|
-    override.vm.box = "sputnik13/trusty64"
+    override.vm.box = "generic/ubuntu1604"
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
   end