Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch vagrant to use Debian 12 #5158

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
# use official ubuntu image for virtualbox
# use official debian image
config.vm.box = "debian/bookworm64"

# configure virtualbox provider
config.vm.provider "virtualbox" do |vb, override|
override.vm.box = "ubuntu/jammy64"
override.vm.synced_folder ".", "/srv/openstreetmap-website"
vb.customize ["modifyvm", :id, "--memory", "4096"]
vb.customize ["modifyvm", :id, "--cpus", "2"]
Expand All @@ -14,16 +16,16 @@ Vagrant.configure("2") do |config|
# Use sshfs sharing if available, otherwise NFS sharing
sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs"

# use third party image and sshfs or NFS sharing for lxc
# configure lxc provider
config.vm.provider "lxc" do |_, override|
override.vm.box = "generic/ubuntu2204"
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/ubuntu2204"
# configure libvirt provider
config.vm.provider "libvirt" do |libvirt, override|
override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
libvirt.memory = 4096
libvirt.cpus = 2
end

# configure shared package cache if possible
Expand Down
8 changes: 1 addition & 7 deletions script/vagrant/setup/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
# abort on error
set -e

# set locale to UTF-8 compatible. apologies to non-english speakers...
locale-gen en_GB.utf8
update-locale LANG=en_GB.utf8 LC_ALL=en_GB.utf8
export LANG=en_GB.utf8
export LC_ALL=en_GB.utf8

# make sure we have up-to-date packages
apt-get update

Expand All @@ -18,7 +12,7 @@ apt-get upgrade -y
# install packages as explained in INSTALL.md
apt-get install -y ruby ruby-dev ruby-bundler \
libxml2-dev libxslt1-dev nodejs npm \
build-essential git-core \
build-essential git-core firefox-esr \
postgresql postgresql-contrib libpq-dev libvips-dev libyaml-dev \
libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
npm install --global yarn
Expand Down