From: Tom Hughes Date: Wed, 26 Apr 2023 17:19:52 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4023' X-Git-Tag: live~1775 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ce256ee661d92aff564825fa8e5768d8dca6725b?hp=7a85ce0c12cf4d75561c35e2ff28e718a390d622 Merge remote-tracking branch 'upstream/pull/4023' --- diff --git a/INSTALL.md b/INSTALL.md index 9ea442476..ea892ae29 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,7 +33,7 @@ These can be installed on Ubuntu 20.04 or later with: sudo apt-get update sudo apt-get install ruby2.7 libruby2.7 ruby2.7-dev \ libvips-dev libxml2-dev libxslt1-dev nodejs \ - apache2 apache2-dev build-essential git-core firefox-geckodriver \ + build-essential git-core firefox-geckodriver \ postgresql postgresql-contrib libpq-dev libsasl2-dev \ libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg sudo gem2.7 install bundler diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index dfca85e79..afabc4885 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -18,7 +18,7 @@ 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 \ + build-essential git-core firefox-geckodriver \ 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