X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d1b1acaf1dce32d0e7dfd6879459e51fd6d55535..8eed1a8bec5e1e3273e399dd0aba42a781cc38a7:/Vagrantfile?ds=sidebyside diff --git a/Vagrantfile b/Vagrantfile index 09e7eab9..d369fcd6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,21 +8,37 @@ Vagrant.configure("2") do |config| # If true, then any SSH connections made will enable agent forwarding. config.ssh.forward_agent = true + checkout = "yes" if ENV['CHECKOUT'] != 'y' then config.vm.synced_folder ".", "/home/vagrant/Nominatim" + checkout = "no" end - config.vm.define "ubuntu" do |sub| - sub.vm.box = "ubuntu/trusty64" - sub.vm.provision :shell, :path => "vagrant/ubuntu-trusty-provision.sh" + config.vm.define "ubuntu", primary: true do |sub| + sub.vm.box = "bento/ubuntu-16.04" + sub.vm.provision :shell do |s| + s.path = "vagrant/Install-on-Ubuntu-16.sh" + s.privileged = false + s.args = [checkout] + end end - config.vm.define "ubuntu-php7" do |sub| - sub.vm.box = "ubuntu/trusty64" - sub.vm.provision :shell, :path => "vagrant/ubuntu-trusty-php7-provision.sh" + + config.vm.define "travis" do |sub| + sub.vm.box = "bento/ubuntu-14.04" + sub.vm.provision :shell do |s| + s.path = "vagrant/install-on-travis-ci.sh" + s.privileged = false + s.args = [checkout] + end end - config.vm.define "centos" do |sub| + + config.vm.define "centos" do |sub| sub.vm.box = "bento/centos-7.2" - sub.vm.provision :shell, :path => "vagrant/install-on-centos-7.sh" + sub.vm.provision :shell do |s| + s.path = "vagrant/Install-on-Centos-7.sh" + s.privileged = false + s.args = [checkout] + end end # configure shared package cache if possible