X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Vagrantfile;h=254e14119f6a604e61516e979351536efd77c801;hb=70a33234631fea8a6b04d2fdef507c178fc19272;hp=3dc50f7a157f4f0732236e7fb4324b4c38967dee;hpb=992f060d183f4ad87fd5316847d8ab4cc758ffa2;p=discourse_docker.git

diff --git a/Vagrantfile b/Vagrantfile
index 3dc50f7..254e141 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,11 +1,26 @@
 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"
+    config.vm.box = "ubuntu/xenial64"
+    config.vm.network "private_network", ip: ENV["DISCOURSE_DOCKER_HOST_IP"] || "192.168.33.11"
+
+    if Vagrant.has_plugin?("vagrant-disksize")
+      config.disksize.size = ENV["DISCOURSE_DOCKER_HOST_DISKSIZE"] || "50GB"
+    else
+      raise "The vagrant-disksize plugin required to expand the vm disk size. " +
+            "Run 'vagrant plugin install vagrant-disksize'."
+    end
+
+    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
@@ -17,18 +32,7 @@ Vagrant.configure(2) do |config|
       echo "Apt::Install-Recommends 'false';" >/etc/apt/apt.conf.d/02no-recommends
       echo "Acquire::Languages { 'none' };" >/etc/apt/apt.conf.d/05no-languages
       apt-get update
-      apt-get -y remove --purge puppet juju
-      apt-get -y autoremove --purge
       wget -qO- https://get.docker.com/ | sh
-
-      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