Merge remote-tracking branch 'upstream/pull/1963'

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index ab0702a1c1768088a93edd8c8ad5b64700cdabfb..d10934b3736b0c3c3f936deee7a885824b4c36f2 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,15 +2,36 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  
-  # port forward for webrick on 3000
-  config.vm.network :forwarded_port, guest: 3000, host: 3000
+  # use official ubuntu image for virtualbox
+  config.vm.provider "virtualbox" do |vb, override|
+    override.vm.box = "ubuntu/xenial64"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website"
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
+  end
+
+  # use third party image and NFS sharing for lxc
+  config.vm.provider "lxc" do |_, override|
+    override.vm.box = "generic/ubuntu1604"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+  end
+
+  # use third party image and NFS sharing for libvirt
+  config.vm.provider "libvirt" do |_, override|
+    override.vm.box = "generic/ubuntu1604"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+  end
 
-  # set up synced folder to source in /srv/openstreetmap-website
-  config.vm.synced_folder ".", "/srv/openstreetmap-website"
+  # configure shared package cache if possible
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.enable :apt
+    config.cache.scope = :box
+  end
+
+  # port forward for webrick on 3000
+  config.vm.network :forwarded_port, :guest => 3000, :host => 3000
 
   # provision using a simple shell script
-  config.vm.provision :shell, :path => "config/vagrant/provision.sh"
+  config.vm.provision :shell, :path => "script/vagrant/setup/provision.sh"
 end