Merge remote-tracking branch 'upstream/master'

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 4740f87944cc81f4b7468348e6de21541c380574..87118c43524dbc9a66934afa9053ec84c54b1b32 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,6 +15,15 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define "ubuntu", primary: true do |sub|
   end
 
   config.vm.define "ubuntu", primary: true do |sub|

+      sub.vm.box = "bento/ubuntu-20.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end
+  end
+
+  config.vm.define "ubuntu18", primary: true do |sub|

       sub.vm.box = "bento/ubuntu-18.04"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-18.sh"
       sub.vm.box = "bento/ubuntu-18.04"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-18.sh"


@@ -61,6 +70,18 @@ Vagrant.configure("2") do |config|
       sub.vm.synced_folder ".", "/vagrant", disabled: true
   end
 
       sub.vm.synced_folder ".", "/vagrant", disabled: true
   end
 

+  config.vm.define "centos8" 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 = "yes"
+      end
+      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
+      sub.vm.synced_folder ".", "/vagrant", disabled: true
+  end
+
+

   config.vm.provider "virtualbox" do |vb|
     vb.gui = false
     vb.memory = 2048
   config.vm.provider "virtualbox" do |vb|
     vb.gui = false
     vb.memory = 2048