From be180016bdf26a7dcbb8b9238d52b5c703ed9d3a Mon Sep 17 00:00:00 2001 From: Robert Kaye Date: Fri, 15 Jul 2016 16:29:43 +0200 Subject: [PATCH] More vagrant work, but still not quite working well --- Vagrantfile | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 56dd6e6731..5779e0b2e1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,24 +1,27 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -# vagrant plugin install vagrant-docker-compose -# vagrant up --provider=docker -# password: tcuser - VAGRANTFILE_API_VERSION = "2" +NCPUS = ENV['CB_NCPUS'] || '2' +MEM = ENV['CB_MEM'] || '2048' + Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + config.vm.box = "ubuntu/trusty64" + config.vm.network "private_network", ip: "10.2.2.2", virtualbox__intnet: true - config.vm.provider "docker" do |d| - d.image = "ubuntu:16.04" + config.vm.provider "virtualbox" do |v| + v.memory = MEM.to_i + v.cpus = NCPUS.to_i + v.customize "pre-boot", ["modifyvm", :id, "--name", "listenbrainz-vm"] end - config.vm.provision :docker - config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: true, run: "always" + config.vm.synced_folder ".", "/vagrant" + config.vm.provision :shell, path: "vagrant/bootstrap.sh" - # web interface - config.vm.network "forwarded_port", guest: 8000, host: 8000 + # web + config.vm.network "forwarded_port", guest: 80, host: 8080 # PostgreSQL - config.vm.network "forwarded_port", guest: 5432, host: 5432 + config.vm.network "forwarded_port", guest: 5432, host: 15432 end