Attempt to modernise vagrant configuration

diff --git a/Vagrantfile b/Vagrantfile
index fcb4790fef74461c0f028afc5c1a6d8032426522..271c0b3f51602e30137abe3dbf411d2fe740bf7f 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,7 +4,7 @@
 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 = "ubuntu/bionic64"
+    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"]


@@ -16,13 +16,13 @@ Vagrant.configure("2") do |config|
 
   # use third party image and sshfs or NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|
 
   # use third party image and sshfs or NFS sharing for lxc
   config.vm.provider "lxc" do |_, override|

-    override.vm.box = "generic/ubuntu1804"
+    override.vm.box = "generic/ubuntu2004"

     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
   # use third party image and sshfs or NFS sharing for libvirt
   config.vm.provider "libvirt" do |_, override|
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
   # use third party image and sshfs or NFS sharing for libvirt
   config.vm.provider "libvirt" do |_, override|

-    override.vm.box = "generic/ubuntu1804"
+    override.vm.box = "generic/ubuntu2004"

     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
     override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 4c8adaa99baf4e2eaa5f9dcc450194b489d61fbc..ad743ae36a7efc86b7c8ce68440937c073a9ba96 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,18 +16,20 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md

-apt-get install -y ruby2.5 libruby2.5 ruby2.5-dev \
-                     libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
+apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
+                     libmagickwand-dev libxml2-dev libxslt1-dev nodejs yarnpkg \

                      apache2 apache2-dev build-essential git-core firefox-geckodriver \
                      postgresql postgresql-contrib libpq-dev \
                      libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
                      apache2 apache2-dev build-essential git-core firefox-geckodriver \
                      postgresql postgresql-contrib libpq-dev \
                      libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev

-gem2.5 install rake
-gem2.5 install --version "~> 1.16.2" bundler
+gem2.7 install rake
+gem2.7 install --version "~> 2.1.4" bundler

 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2

+# do yarn install as a convenience
+bundle exec rake yarn:install

 # create user and database for openstreetmap-website
 db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
 if [ "$db_user_exists" != "1" ]; then
 # create user and database for openstreetmap-website
 db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
 if [ "$db_user_exists" != "1" ]; then