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

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 24d62bb7a4a95e56a4d2ad01526c6cce533061d2..44d914d75a1816c9b5f7591274c70e96e182f54e 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,20 +3,22 @@
 
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
 
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox

-  config.vm.provider "virtualbox" do |_, override|
-    override.vm.box = "ubuntu/trusty64"
+  config.vm.provider "virtualbox" do |vb, override|
+    override.vm.box = "ubuntu/xenial64"

     override.vm.synced_folder ".", "/srv/openstreetmap-website"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"

+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]

   end
 
   # use third party image and NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|
   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.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
 
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
   end