Bump aws-sdk-s3 from 1.83.2 to 1.84.0

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index e4d0939db185877f05876cb09213420287f33a02..271c0b3f51602e30137abe3dbf411d2fe740bf7f 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,22 +4,26 @@
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|

-    override.vm.box = "generic/ubuntu1604"
+    override.vm.box = "ubuntu/focal64"

     override.vm.synced_folder ".", "/srv/openstreetmap-website"
     vb.customize ["modifyvm", :id, "--memory", "1024"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
     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
 
   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|
   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
 
   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|
   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
   end
 
   # configure shared package cache if possible