From fdc7f5b86a9c56cb9a507166f5b12765c18da721 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 9 Jan 2016 16:31:37 -0800 Subject: [PATCH] Vagrantfile: Default to using LXC when Virtualbox is also available. This solves the problem reported in #331 with needing to specify --provider=lxc to use the LXC provider in an Ubuntu Linux environment; additionally, it adds the LXC option needed to run LXC on Ubuntu 15.10, but not on 14.04 where that option is unavailable and would totally break LXC. --- Vagrantfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index edf48c73e9..c01f830044 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,6 +13,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/srv/zulip" + # Specify LXC provider before VirtualBox provider so it's preferred. + config.vm.provider "lxc" do |lxc| + LXC_VERSION = `lxc-ls --version`.strip unless defined? LXC_VERSION + if LXC_VERSION >= "1.1.0" + # Allow start without AppArmor, otherwise Box will not Start on Ubuntu 14.10 + # see https://github.com/fgrehm/vagrant-lxc/issues/333 + lxc.customize 'aa_allow_incomplete', 1 + end + end + config.vm.provider "virtualbox" do |vb, override| override.vm.box = "ubuntu/trusty64" # 2GiB seemed reasonable here. The VM OOMs with only 1024MiB.