X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fb63a7418e6034f152d70b818b40ed68eb7a6c05..9be227f436cc2d38f9614ecceb67ead18103fd2d:/Vagrantfile?ds=inline diff --git a/Vagrantfile b/Vagrantfile index 033e1507..57e64c2c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,6 +17,14 @@ Vagrant.configure("2") do |config| checkout = "no" end + config.vm.provider "hyperv" do |hv, override| + hv.memory = 2048 + hv.linked_clone = true + if ENV['CHECKOUT'] != 'y' then + override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: "smb", smb_host: ENV['SMB_HOST'] || ENV['COMPUTERNAME'] + end + end + config.vm.provider "virtualbox" do |vb, override| vb.gui = false vb.memory = 2048 @@ -34,77 +42,57 @@ Vagrant.configure("2") do |config| end end - config.vm.define "ubuntu", primary: true do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu22", primary: true do |sub| + sub.vm.box = "generic/ubuntu2204" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-22.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "ubuntu-apache" do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu22-apache" do |sub| + sub.vm.box = "generic/ubuntu2204" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-22.sh" s.privileged = false s.args = [checkout, "install-apache"] end end - config.vm.define "ubuntu-nginx" do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu22-nginx" do |sub| + sub.vm.box = "generic/ubuntu2204" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-22.sh" s.privileged = false s.args = [checkout, "install-nginx"] end end - config.vm.define "ubuntu18" do |sub| - sub.vm.box = "generic/ubuntu1804" + config.vm.define "ubuntu20" do |sub| + sub.vm.box = "generic/ubuntu2004" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" + s.path = "vagrant/Install-on-Ubuntu-20.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "ubuntu18-apache" do |sub| - sub.vm.box = "generic/ubuntu1804" + config.vm.define "ubuntu20-apache" do |sub| + sub.vm.box = "generic/ubuntu2004" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" + s.path = "vagrant/Install-on-Ubuntu-20.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 "ubuntu20-nginx" do |sub| + sub.vm.box = "generic/ubuntu2004" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" + s.path = "vagrant/Install-on-Ubuntu-20.sh" s.privileged = false s.args = [checkout, "install-nginx"] end end - - config.vm.define "centos7" do |sub| - sub.vm.box = "centos/7" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Centos-7.sh" - s.privileged = false - s.args = [checkout] - end - end - - config.vm.define "centos" do |sub| - sub.vm.box = "generic/centos8" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Centos-8.sh" - s.privileged = false - s.args = [checkout] - end - end - - end