From: Tom Hughes Date: Mon, 20 Feb 2017 09:05:35 +0000 (+0000) Subject: Merge remote-tracking branch 'openstreetmap/pull/1451' X-Git-Tag: live~3596 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d52424087b0c7f2c6c86692a2ea9d72ae601491c?hp=425f3f309bc7954850c1ab3b64e9ec3930651ce4 Merge remote-tracking branch 'openstreetmap/pull/1451' --- diff --git a/VAGRANT.md b/VAGRANT.md index 549e06687..3825ad988 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -6,10 +6,13 @@ On Ubuntu, it should be as simple as: sudo apt-get install vagrant ``` -Other Linux distributions should have similar installation instructions using `yum` or similar. +Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar. Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads.html) for more information. +Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers, +the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment. + # Setting up openstreetmap-website Once Vagrant has been installed, you can start an environment by checking out the openstreetmap-website code if you haven't already, then changing to the directory which contains the Vagrantfile by typing: