X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/43776279fb7bb1103a52ee72af2b3497a1274995..14883a01f78fa11de915b3c1a185245f61eb667c:/Vagrantfile?ds=sidebyside diff --git a/Vagrantfile b/Vagrantfile index d10934b37..2ef899123 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,23 +4,26 @@ Vagrant.configure("2") do |config| # use official ubuntu image for virtualbox config.vm.provider "virtualbox" do |vb, override| - override.vm.box = "ubuntu/xenial64" + 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 = "generic/ubuntu1604" - 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 = "generic/ubuntu1604" - 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