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

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index fcb4790fef74461c0f028afc5c1a6d8032426522..2ef8991231eefbb81141a82ab342ce3039e4fb88 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,9 +4,9 @@
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|

-    override.vm.box = "ubuntu/bionic64"
+    override.vm.box = "ubuntu/focal64"

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

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

     vb.customize ["modifyvm", :id, "--cpus", "2"]
     vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
   end
     vb.customize ["modifyvm", :id, "--cpus", "2"]
     vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
   end


@@ -16,13 +16,13 @@ Vagrant.configure("2") do |config|
 
   # use third party image and sshfs or NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|
 
   # use third party image and sshfs or NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|

-    override.vm.box = "generic/ubuntu1804"
+    override.vm.box = "generic/ubuntu2004"

     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
   # use third party image and sshfs or NFS sharing for libvirt
   config.vm.provider "libvirt" do |_, override|
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
   # use third party image and sshfs or NFS sharing for libvirt
   config.vm.provider "libvirt" do |_, override|

-    override.vm.box = "generic/ubuntu1804"
+    override.vm.box = "generic/ubuntu2004"

     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end