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

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index e94ca432192aaeb9bf41bc5b63085e960a220e40..2ef8991231eefbb81141a82ab342ce3039e4fb88 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,21 +3,27 @@
 
 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|
-    config.vm.box = "ubuntu/trusty64"
+  config.vm.provider "virtualbox" do |vb, override|
+    override.vm.box = "ubuntu/focal64"

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

+    vb.customize ["modifyvm", :id, "--memory", "4096"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]

   end
 
   end
 

-  # use third party image and NFS sharing for lxc
+  # Use sshfs sharing if available, otherwise NFS sharing
+  sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs"
+
+  # use third party image and sshfs or NFS sharing for lxc

   config.vm.provider "lxc" do |_, override|
   config.vm.provider "lxc" do |_, override|

-    override.vm.box = "sputnik13/trusty64"
-    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+    override.vm.box = "generic/ubuntu2004"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type

   end
 
   end
 

-  # use third party image and NFS sharing for libvirt
+  # use third party image and sshfs or NFS sharing for libvirt

   config.vm.provider "libvirt" do |_, override|
   config.vm.provider "libvirt" do |_, override|

-    override.vm.box = "sputnik13/trusty64"
-    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+    override.vm.box = "generic/ubuntu2004"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type

   end
 
   # configure shared package cache if possible
   end
 
   # configure shared package cache if possible