Merge pull request #3591 from lonvia/increase-required-postgresql

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 57e64c2c090bcb3addc53e5ffac801f214ddf7d7..99aa84491159c81b0f3a588267652caa4ccc8d6d 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,11 +34,19 @@ Vagrant.configure("2") do |config|
     end
   end
 
     end
   end
 

+  config.vm.provider "parallels" do |prl, override|
+    prl.update_guest_tools = false
+    prl.memory = 2048
+    if ENV['CHECKOUT'] != 'y' then
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim"
+    end
+  end
+

   config.vm.provider "libvirt" do |lv, override|
     lv.memory = 2048
     lv.nested = true
     if ENV['CHECKOUT'] != 'y' then
   config.vm.provider "libvirt" do |lv, override|
     lv.memory = 2048
     lv.nested = true
     if ENV['CHECKOUT'] != 'y' then

-      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs', nfs_udp: false

     end
   end
 
     end
   end
 


@@ -69,28 +77,32 @@ Vagrant.configure("2") do |config|
       end
   end
 
       end
   end
 

-  config.vm.define "ubuntu20" do |sub|
-      sub.vm.box = "generic/ubuntu2004"
+  config.vm.define "ubuntu24" do |sub|
+      sub.vm.box = "bento/ubuntu-24.04"
+      if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
+        # Apple M processor
+        sub.vm.box = 'gutehall/ubuntu24-04'
+      end

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.path = "vagrant/Install-on-Ubuntu-24.sh"

         s.privileged = false
         s.args = [checkout]
       end
   end
 
         s.privileged = false
         s.args = [checkout]
       end
   end
 

-  config.vm.define "ubuntu20-apache" do |sub|
-      sub.vm.box = "generic/ubuntu2004"
+  config.vm.define "ubuntu24-apache" do |sub|
+      sub.vm.box = "bento/ubuntu-24.04"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.path = "vagrant/Install-on-Ubuntu-24.sh"

         s.privileged = false
         s.args = [checkout, "install-apache"]
       end
   end
 
         s.privileged = false
         s.args = [checkout, "install-apache"]
       end
   end
 

-  config.vm.define "ubuntu20-nginx" do |sub|
-      sub.vm.box = "generic/ubuntu2004"
+  config.vm.define "ubuntu24-nginx" do |sub|
+      sub.vm.box = "bento/ubuntu-24.04"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.path = "vagrant/Install-on-Ubuntu-24.sh"

         s.privileged = false
         s.args = [checkout, "install-nginx"]
       end
         s.privileged = false
         s.args = [checkout, "install-nginx"]
       end