Simplify ruby installations

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index e114f46166b6f27875b1298eec8e8e21b7c5edfb..8fb296ae6ea303461e2ca38827184522c6f21e0f 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,13 +16,12 @@ 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 \
-                     apache2 apache2-dev build-essential git-core firefox-geckodriver \
+apt-get install -y ruby ruby-dev ruby-bundler \
+                     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 rake
-gem2.7 install --version "~> 2.1.4" bundler
+npm install --global yarn
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
@@ -47,5 +46,5 @@ if [ ! -f config/storage.yml ]; then
 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