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

[rails.git] / script / vagrant / setup / provision.sh

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 2ca780ff1b5faac36fc84958a5efad2ec42655ae..af183a5ffdbb9e0a8bcad2be79b8f3e7286082f3 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,13 +16,13 @@ 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.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
                      postgresql postgresql-contrib libpq-dev libvips-dev \
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev

-gem2.7 install rake
-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
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website


@@ -47,5 +47,5 @@ if [ ! -f config/storage.yml ]; then
 fi
 touch config/settings.local.yml
 # migrate the database to the latest version
 fi
 touch config/settings.local.yml
 # migrate the database to the latest version

-sudo -u vagrant bundle exec rake db:migrate
+sudo -u vagrant bundle exec rails db:migrate

 popd
 popd