From 0264a3c6fb8a50f1e3c797bbf5d4eb7a90a189cb Mon Sep 17 00:00:00 2001 From: Matt Palmer Date: Sun, 18 Oct 2015 13:52:30 +1100 Subject: [PATCH] Tweak the Vagrantfile for more CPUs, earlier proxy config --- Vagrantfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3dc50f7..d9064a6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,12 +1,20 @@ Vagrant.configure(2) do |config| config.vm.provider "virtualbox" do |v| v.memory = 2048 + v.cpus = 4 end config.vm.define :dockerhost do |config| config.vm.box = "trusty64" config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" + if ENV["http_proxy"] + config.vm.provision "shell", inline: <<-EOF + echo "Acquire::http::Proxy \\"#{ENV['http_proxy']}\\";" >/etc/apt/apt.conf.d/50proxy + echo "http_proxy=\"#{ENV['http_proxy']}\"" >/etc/profile.d/http_proxy.sh + EOF + end + config.vm.provision "shell", inline: <<-EOF set -e @@ -23,12 +31,5 @@ Vagrant.configure(2) do |config| ln -s /vagrant /var/discourse EOF - - if ENV["http_proxy"] - config.vm.provision "shell", inline: <<-EOF - echo "Acquire::http::Proxy \\"#{ENV['http_proxy']}\\";" >/etc/apt/apt.conf.d/50proxy - echo "http_proxy=\"#{ENV['http_proxy']}\"" >/etc/profile.d/http_proxy.sh - EOF - end end end -- 2.25.1