Merge branch 'back-off-vmware' into develop

Makefile

@@ -1,21 +1,13 @@
 
 PACKER:=$(shell which packer)
 PACKER_BUILD=build
-.PHONY: devkit drupalbox ubuntu1404 ubuntu1604
+.PHONY: drupalbox
 
-drupalbox1404: drupalbox1404-vmware drupalbox1404-virtualbox
+all:
+	$(PACKER) $(PACKER_BUILD) -var-file=drupalbox/ubuntu.json drupalbox/drupalbox.json
 
-drupalbox1404-vmware:
-	$(PACKER) $(PACKER_BUILD) --only=vmware-iso --var-file=drupalbox/ubuntu1404.json drupalbox/drupalbox.json
+virtualbox:
+       $(PACKER) $(PACKER_BUILD) -only=virtualbox-iso -var-file=drupalbox/ubuntu.json drupalbox/drupalbox.json
 
-drupalbox1404-virtualbox:
-	$(PACKER) $(PACKER_BUILD) --only=virtualbox-iso --var-file=drupalbox/ubuntu1404.json drupalbox/drupalbox.json
-
-drupalbox1604:
-	$(PACKER) --var-file=drupalbox/ubuntu1604.json drupalbox/drupalbox.json
-
-ubuntu1404:
-	$(PACKER) ubuntu1404/ubuntu1404.json
-
-ubuntu1604:
-	$(PACKER) ubuntu1604/ubuntu1604.json
+vmware:
+       $(PACKER) $(PACKER_BUILD) -only=vmware-iso -var-file=drupalbox/ubuntu.json drupalbox/drupalbox.json

dev/Vagrantfile

@@ -23,14 +23,14 @@ Vagrant.configure("2") do |config|
   config.hostmanager.enabled = true
   config.hostmanager.manage_host = true
 
-  config.vm.provider "vmware_fusion" do |v|
-    v.vmx["memsize"] = "1024"
-  end
-
   config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--memory", 1024]
   end
 
+  config.vm.provider "vmware_fusion" do |v|
+    v.vmx["memsize"] = "1024"
+  end
+
   config.vm.provision "ansible", type: :ansible do |ansible|
     ansible.playbook = "../#{box_name}/#{box_name}.yml"
     ansible.groups = {

docs/Updating-Existing-Box.md

@@ -4,16 +4,24 @@
 
 ## Updating an existing box
 
-Use the makefile to build the drupalbox:
+Use the makefile to build both the virtualbox and vmware builds of the drupalbox:
 
 ```
-make drupalbox
+make all
+```
+
+Use the makefile to build only one of either virtualbox or vmware:
+
+```
+make virtualbox
+make vmware
 ```
 
 Or, use Packer directly to build the drupalbox:
 
 ```
 packer build -var-file=drupalbox/ubuntu.json drupalbox/drupalbox.json
+packer build -only=virtualbox-iso -var-file=drupalbox/ubuntu.json drupalbox/drupalbox.json
 ```
 
-Both of these approaches run the same command, but running packer directly gives you the opportunity to use flags to manipulate the build process. Try `packer --help build` for details.
+Both of these approaches run similar commands, but running packer directly gives you the opportunity to use flags to manipulate the build process in a one-off fashion. Try `packer --help build` for details.

drupalbox/Vagrantfile

@@ -21,12 +21,12 @@ Vagrant.configure("2") do |config|
   config.hostmanager.enabled = true
   config.hostmanager.manage_host = true
 
-  config.vm.provider "vmware_fusion" do |v|
-    v.vmx["memsize"] = "1024"
-  end
-
   config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--memory", 1024]
   end
 
+  config.vm.provider "vmware_fusion" do |v|
+    v.vmx["memsize"] = "1024"
+  end
+
 end