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

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index d10934b3736b0c3c3f936deee7a885824b4c36f2..617bd7b4d0884707e8f94fc1af38ffd5671523ba 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,25 +2,30 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|

-  # use official ubuntu image for virtualbox
+  # use official debian image
+  config.vm.box = "debian/bookworm64"
+
+  # configure virtualbox provider

   config.vm.provider "virtualbox" do |vb, override|
   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, "--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
 

-  # 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"
+
+  # configure lxc provider

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

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

   end
 
   end
 

-  # use third party image and NFS sharing for libvirt
-  config.vm.provider "libvirt" do |_, override|
-    override.vm.box = "generic/ubuntu1604"
-    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+  # configure libvirt provider
+  config.vm.provider "libvirt" do |libvirt, override|
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
+    libvirt.memory = 4096
+    libvirt.cpus = 2

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