X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f3519e97819cc5a5e2c2f9931c7d565b8e5227c8..d7eac9b5a8f4cbbeb4ed3d73464993bfd5888935:/Vagrantfile diff --git a/Vagrantfile b/Vagrantfile index 7b033146c..2ef899123 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,32 +1,29 @@ # -*- mode: ruby -*- # vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--memory", "8192"] - end -end - Vagrant.configure("2") do |config| # use official ubuntu image for virtualbox config.vm.provider "virtualbox" do |vb, override| - override.vm.box = "ubuntu/trusty64" + override.vm.box = "ubuntu/focal64" override.vm.synced_folder ".", "/srv/openstreetmap-website" - vb.customize ["modifyvm", :id, "--memory", "1024"] + vb.customize ["modifyvm", :id, "--memory", "4096"] vb.customize ["modifyvm", :id, "--cpus", "2"] + vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"] end - # use third party image and NFS sharing for lxc + # Use sshfs sharing if available, otherwise NFS sharing + sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs" + + # use third party image and sshfs or NFS sharing for lxc config.vm.provider "lxc" do |_, override| - override.vm.box = "sputnik13/trusty64" - override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs" + override.vm.box = "generic/ubuntu2004" + override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type end - # use third party image and NFS sharing for libvirt + # use third party image and sshfs or NFS sharing for libvirt config.vm.provider "libvirt" do |_, override| - override.vm.box = "sputnik13/trusty64" - override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs" + override.vm.box = "generic/ubuntu2004" + override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type end # configure shared package cache if possible