X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/85a68f1e56a42e7d6778b12b45716f0e26932766..ae8694a6a6862d7cb66cd91102d2802c9899e7cf:/Vagrantfile diff --git a/Vagrantfile b/Vagrantfile index 0cc511c5..99aa8449 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -34,11 +34,19 @@ 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 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 @@ -69,58 +77,34 @@ Vagrant.configure("2") do |config| end end - config.vm.define "ubuntu20" do |sub| - sub.vm.box = "generic/ubuntu2004" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" - s.privileged = false - s.args = [checkout] + 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 - end - - config.vm.define "ubuntu20-apache" do |sub| - sub.vm.box = "generic/ubuntu2004" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" - s.privileged = false - s.args = [checkout, "install-apache"] - end - end - - config.vm.define "ubuntu20-nginx" do |sub| - sub.vm.box = "generic/ubuntu2004" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" - s.privileged = false - s.args = [checkout, "install-nginx"] - end - end - - config.vm.define "ubuntu18" do |sub| - sub.vm.box = "generic/ubuntu1804" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "ubuntu18-apache" do |sub| - sub.vm.box = "generic/ubuntu1804" + 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-18.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout, "install-apache"] end end - config.vm.define "ubuntu18-nginx" do |sub| - sub.vm.box = "generic/ubuntu1804" + 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-18.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout, "install-nginx"] end end - end