Fix Vagrantfile to run discourse successfully (#378)

* Update the vagrant box to "ubuntu/xenial64"

* Ignore .vagrant/

* Don't create /var/discourse symlink on vagrant's provisioning

* Add private network interface to vagrant vm

* Raise exeption if vagrant-disksize plugin is not installed

* Modify the instruction for vagrant

* Remove unnecessary dependencies

diff --git a/.gitignore b/.gitignore
index 195dd64f2e9b2866b88ce58f3ff2a22d67f6e583..ae7ea2ffd6732b2584ca73b402da5a70cd1d643c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ image/docker-squash.tar.gz
 image/discourse_dev/postgres.template.yml
 image/discourse_dev/redis.template.yml
 .gc-state/*
+.vagrant/

diff --git a/README.md b/README.md
index 4cd622699eedb86bd1ad111de3044a4a8e12c542..cfb1091f5c64437db49471bdd896b09e3c1a1517 100644 (file)
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ then run:
 This will spawn a new Ubuntu VM, install Docker, and then await your
 instructions.  You can then SSH into the VM with `vagrant ssh`, become
 `root` with `sudo -i`, and then you're right to go.  Your live git repo is
-already available at `/var/discourse`, so you can just `cd /var/discourse`
+already available at `/vagrant`, so you can just `cd /vagrant`
 and then start running `launcher`.
 
 

diff --git a/Vagrantfile b/Vagrantfile
index d9064a6c2825bc6e49de78458e9690962daffa3e..254e14119f6a604e61516e979351536efd77c801 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,8 +5,15 @@ Vagrant.configure(2) do |config|
   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
@@ -25,11 +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
   end
 end