Skip to content

Commit

Permalink
Attempt to modernise vagrant configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Aug 25, 2020
1 parent 2b7e62b commit e9483dc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/bionic64"
override.vm.box = "ubuntu/focal64"
override.vm.synced_folder ".", "/srv/openstreetmap-website"
vb.customize ["modifyvm", :id, "--memory", "1024"]
vb.customize ["modifyvm", :id, "--cpus", "2"]
Expand All @@ -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/ubuntu1804"
override.vm.box = "generic/ubuntu2004"
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/ubuntu1804"
override.vm.box = "generic/ubuntu2004"
override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
end

Expand Down
10 changes: 6 additions & 4 deletions script/vagrant/setup/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@ apt-get update
apt-get upgrade -y

# install packages as explained in INSTALL.md
apt-get install -y ruby2.5 libruby2.5 ruby2.5-dev \
libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
libmagickwand-dev libxml2-dev libxslt1-dev nodejs yarnpkg \
apache2 apache2-dev build-essential git-core firefox-geckodriver \
postgresql postgresql-contrib libpq-dev \
libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
gem2.5 install rake
gem2.5 install --version "~> 1.16.2" bundler
gem2.7 install rake
gem2.7 install --version "~> 2.1.4" bundler

## install the bundle necessary for openstreetmap-website
pushd /srv/openstreetmap-website
# do bundle install as a convenience
bundle install --retry=10 --jobs=2
# do yarn install as a convenience
bundle exec rake yarn:install
# create user and database for openstreetmap-website
db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
if [ "$db_user_exists" != "1" ]; then
Expand Down

0 comments on commit e9483dc

Please sign in to comment.