From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:37:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4052'
X-Git-Tag: live~1744
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e9de1537f924c0ceb9c42086da5a54abba268126?hp=7842c1f283590a4a6b89930c644fb14bf29e68ee

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

diff --git a/Dockerfile b/Dockerfile
index 78be28838..c85a64046 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,11 +25,10 @@ RUN apt-get update \
       software-properties-common \
       tzdata \
       unzip \
- && curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && add-apt-repository -y -U https://deb.nodesource.com/node_18.x \
- && apt-get install --no-install-recommends -y \
       nodejs \
+      npm \
  && npm install --global yarn \
+ # We can't use snap packages for firefox inside a container, so we need to get firefox+geckodriver elsewhere
  && add-apt-repository -y ppa:mozillateam/ppa \
  && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \
  && apt-get install --no-install-recommends -y \
diff --git a/INSTALL.md b/INSTALL.md
index 787c81ee7..99db9c037 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -33,10 +33,11 @@ These can be installed on Ubuntu 22.04 or later with:
 sudo apt-get update
 sudo apt-get install ruby3.0 libruby3.0 ruby3.0-dev \
                      libvips-dev libxml2-dev libxslt1-dev nodejs \
-                     build-essential git-core firefox-geckodriver \
+                     build-essential git-core \
                      postgresql postgresql-contrib libpq-dev libsasl2-dev \
-                     libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg
+                     libffi-dev libgd-dev libarchive-dev libbz2-dev npm
 sudo gem3.0 install bundler
+sudo npm install --global yarn
 ```
 
 ### Alternative platforms
diff --git a/Vagrantfile b/Vagrantfile
index 2ef899123..7895d3b86 100644
--- 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|
-    override.vm.box = "ubuntu/focal64"
+    override.vm.box = "ubuntu/jammy64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"
     vb.customize ["modifyvm", :id, "--memory", "4096"]
     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|
-    override.vm.box = "generic/ubuntu2004"
+    override.vm.box = "generic/ubuntu2204"
     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/ubuntu2004"
+    override.vm.box = "generic/ubuntu2204"
     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 074a77277..d48fb9d0b 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,12 +16,13 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
-apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
-                     libxml2-dev libxslt1-dev nodejs yarnpkg \
-                     build-essential git-core firefox-geckodriver \
+apt-get install -y ruby3.0 libruby3.0 ruby3.0-dev \
+                     libxml2-dev libxslt1-dev nodejs npm \
+                     build-essential git-core \
                      postgresql postgresql-contrib libpq-dev libvips-dev \
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
-gem2.7 install --version "~> 2.1.4" bundler
+gem3.0 install --version "~> 2.1.4" bundler
+npm install --global yarn
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website