X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cf49a070fdd9b71b86da43e2361c49d58bc5be62..968f1cd45393015975e658fc6b70065a3bfd3c94:/Vagrantfile diff --git a/Vagrantfile b/Vagrantfile index 7f5f2459..99aa8449 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -34,6 +34,14 @@ Vagrant.configure("2") do |config| 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 @@ -69,28 +77,32 @@ Vagrant.configure("2") do |config| 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| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" 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| - 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 - 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| - 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