Pin uglify-js to 2.x for now

[discourse_docker.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 106b625b58cfef6eb86d1dd021c3a19bcd3d61e9..d9064a6c2825bc6e49de78458e9690962daffa3e 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,8 +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
 
@@ -16,13 +28,8 @@ Vagrant.configure(2) do |config|
       apt-get -y remove --purge puppet juju
       apt-get -y autoremove --purge
       wget -qO- https://get.docker.com/ | sh
-    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
+      ln -s /vagrant /var/discourse
+    EOF
   end
 end