From d06b17750837f124382812ee26d3794fbca83cba Mon Sep 17 00:00:00 2001
From: Amir Gur <amir.gur@kohls.com>
Date: Mon, 3 Mar 2014 18:39:28 -0800
Subject: [PATCH 1/4] - Parametrize - Print docker version - Add a d alias to
 docker - Cleanup

---
 Vagrantfile | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ee31732..3399321 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,29 +3,37 @@
 ROOT = File.dirname(File.expand_path(__FILE__))
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
+
+BASE_BOX_URL    = ENV['BASE_BOX_URL'   ] || "https://oss-binaries.phusionpassenger.com/vagrant/boxes/"
+VAGRANT_BOX_URL = ENV['VAGRANT_BOX_URL'] || BASE_BOX_URL + "ubuntu-12.04.3-amd64-vbox.box"
+VMWARE_BOX_URL  = ENV['VMWARE_BOX_URL' ] || BASE_BOX_URL + "ubuntu-12.04.3-amd64-vmwarefusion.box"
+
+$script = <<SCRIPT
+wget -q -O - https://get.docker.io/gpg | apt-key add -
+echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
+apt-get update -qq
+apt-get install -q -y --force-yes lxc-docker
+usermod -a -G docker vagrant
+docker version
+su - vagrant -c 'echo alias d=docker >> ~/.bash_aliases'
+SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "phusion-open-ubuntu-12.04-amd64"
-  config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vbox.box"
+  config.vm.box = 'phusion-open-ubuntu-12.04-amd64'
+  config.vm.box_url = VAGRANT_BOX_URL
   config.ssh.forward_agent = true
-  if File.directory?("#{ROOT}/../passenger-docker")
-    config.vm.synced_folder File.expand_path("#{ROOT}/../passenger-docker"),
-      "/vagrant/passenger-docker"
+  passenger_path = "#{ROOT}/../passenger-docker"
+  if File.directory?(passenger_path)
+    config.vm.synced_folder File.expand_path(passenger_path), "/vagrant/passenger-docker"
   end
 
   config.vm.provider :vmware_fusion do |f, override|
-    override.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vmwarefusion.box"
-    f.vmx["displayName"] = "baseimage-docker"
+    override.vm.box_url = VMWARE_BOX_URL
+    f.vmx['displayName'] = 'baseimage-docker'
   end
 
   if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
-    # Add lxc-docker package
-    pkg_cmd = "wget -q -O - https://get.docker.io/gpg | apt-key add -;" \
-      "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list;" \
-      "apt-get update -qq; apt-get install -q -y --force-yes lxc-docker; "
-    # Add vagrant user to the docker group
-    pkg_cmd << "usermod -a -G docker vagrant; "
-    config.vm.provision :shell, :inline => pkg_cmd
+    config.vm.provision :shell, :inline => $script
   end
 end

From ac7f9b078534be5e04ebbfcff96605bee2c38919 Mon Sep 17 00:00:00 2001
From: Amir Gur <amir.gur@kohls.com>
Date: Tue, 4 Mar 2014 14:33:57 -0800
Subject: [PATCH 2/4] - Parametrized passenger-docker location

---
 Vagrantfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3399321..2889573 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,9 +5,12 @@ ROOT = File.dirname(File.expand_path(__FILE__))
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = '2'
 
-BASE_BOX_URL    = ENV['BASE_BOX_URL'   ] || "https://oss-binaries.phusionpassenger.com/vagrant/boxes/"
-VAGRANT_BOX_URL = ENV['VAGRANT_BOX_URL'] || BASE_BOX_URL + "ubuntu-12.04.3-amd64-vbox.box"
-VMWARE_BOX_URL  = ENV['VMWARE_BOX_URL' ] || BASE_BOX_URL + "ubuntu-12.04.3-amd64-vmwarefusion.box"
+# Default env properties which can be overridden
+# Example override: echo "ENV['PASSENGER_PATH_URI'] ||= '../../phusion/passenger-docker' # " >> ~/.vagrant.d/Vagrantfile
+BASE_BOX_URL       = ENV['BASE_BOX_URL'      ] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
+VAGRANT_BOX_URL    = ENV['VAGRANT_BOX_URL'   ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
+VMWARE_BOX_URL     = ENV['VMWARE_BOX_URL'    ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
+PASSENGER_PATH_URI = ENV['PASSENGER_PATH_URI'] || '../passenger-docker'
 
 $script = <<SCRIPT
 wget -q -O - https://get.docker.io/gpg | apt-key add -
@@ -23,9 +26,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'phusion-open-ubuntu-12.04-amd64'
   config.vm.box_url = VAGRANT_BOX_URL
   config.ssh.forward_agent = true
-  passenger_path = "#{ROOT}/../passenger-docker"
+  passenger_path = "#{ROOT}/#{PASSENGER_PATH_URI}"
   if File.directory?(passenger_path)
-    config.vm.synced_folder File.expand_path(passenger_path), "/vagrant/passenger-docker"
+    config.vm.synced_folder File.expand_path(passenger_path), '/vagrant/passenger-docker'
   end
 
   config.vm.provider :vmware_fusion do |f, override|

From 2ef5fa1659d88e9589342e0aca9c9cd3e7af84e4 Mon Sep 17 00:00:00 2001
From: Amir Gur <amir.gur@kohls.com>
Date: Thu, 6 Mar 2014 02:28:27 -0800
Subject: [PATCH 3/4]  * More Parametrization, example.  * All synced_folders
 are included.  * Vagrantfile of baseimage and passenger are nearly identical
 now.  (I got to that when wanting to try passenger.  But already had a
 vagrant box started from baseimage, there was no need to dup the effort, just
 reuse the existing single box for all.  Then in end of day, may not need
 multiple Vagrantfiles.  Passenger is a simple structure/process for managing
 dockers, but only needing to use baseimage once and have one VM up)

---
 Vagrantfile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2889573..ac4338f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,11 +6,15 @@ ROOT = File.dirname(File.expand_path(__FILE__))
 VAGRANTFILE_API_VERSION = '2'
 
 # Default env properties which can be overridden
-# Example override: echo "ENV['PASSENGER_PATH_URI'] ||= '../../phusion/passenger-docker' # " >> ~/.vagrant.d/Vagrantfile
-BASE_BOX_URL       = ENV['BASE_BOX_URL'      ] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
-VAGRANT_BOX_URL    = ENV['VAGRANT_BOX_URL'   ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
-VMWARE_BOX_URL     = ENV['VMWARE_BOX_URL'    ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
-PASSENGER_PATH_URI = ENV['PASSENGER_PATH_URI'] || '../passenger-docker'
+# Example overrides:
+#   echo "ENV['PASSENGER_PATH_URI' ] ||= '../../phusion/passenger-docker'   " >> ~/.vagrant.d/Vagrantfile
+#   echo "ENV['BASE_BOX_URL']        ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile
+BASE_BOX_URL        = ENV['BASE_BOX_URL'       ] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
+VAGRANT_BOX_URL     = ENV['VAGRANT_BOX_URL'    ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
+VMWARE_BOX_URL      = ENV['VMWARE_BOX_URL'     ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
+BASEIMAGE_PATH_URI  = ENV['BASEIMAGE_PATH_URI' ] || '../baseimage-docker'
+PASSENGER_PATH_URI  = ENV['PASSENGER_PATH_URI' ] || '../passenger-docker'
+DOCKERIZER_PATH_URI = ENV['DOCKERIZER_PATH_URI'] || '../dockerizer'
 
 $script = <<SCRIPT
 wget -q -O - https://get.docker.io/gpg | apt-key add -
@@ -30,6 +34,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   if File.directory?(passenger_path)
     config.vm.synced_folder File.expand_path(passenger_path), '/vagrant/passenger-docker'
   end
+  baseimage_path = "#{ROOT}/#{BASEIMAGE_PATH_URI}"
+  if File.directory?(baseimage_path)
+    config.vm.synced_folder File.expand_path(baseimage_path), '/vagrant/baseimage-docker'
+  end
+  dockerizer_path = "#{ROOT}/#{DOCKERIZER_PATH_URI}"
+  if File.directory?(dockerizer_path)
+    config.vm.synced_folder File.expand_path(dockerizer_path), '/vagrant/dockerizer'
+  end
 
   config.vm.provider :vmware_fusion do |f, override|
     override.vm.box_url = VMWARE_BOX_URL

From 55727c2f30972cc94f8d4cad62e90dff60c2d2ab Mon Sep 17 00:00:00 2001
From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
Date: Tue, 25 Mar 2014 15:36:15 +0100
Subject: [PATCH 4/4] Cleanup Amir Gur's patch

---
 Vagrantfile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ac4338f..30597b6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,20 +1,20 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-ROOT = File.dirname(File.expand_path(__FILE__))
+ROOT = File.dirname(File.absolute_path(__FILE__))
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = '2'
 
 # Default env properties which can be overridden
 # Example overrides:
-#   echo "ENV['PASSENGER_PATH_URI' ] ||= '../../phusion/passenger-docker'   " >> ~/.vagrant.d/Vagrantfile
-#   echo "ENV['BASE_BOX_URL']        ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile
-BASE_BOX_URL        = ENV['BASE_BOX_URL'       ] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
-VAGRANT_BOX_URL     = ENV['VAGRANT_BOX_URL'    ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
-VMWARE_BOX_URL      = ENV['VMWARE_BOX_URL'     ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
-BASEIMAGE_PATH_URI  = ENV['BASEIMAGE_PATH_URI' ] || '../baseimage-docker'
-PASSENGER_PATH_URI  = ENV['PASSENGER_PATH_URI' ] || '../passenger-docker'
-DOCKERIZER_PATH_URI = ENV['DOCKERIZER_PATH_URI'] || '../dockerizer'
+#   echo "ENV['PASSENGER_DOCKER_PATH'] ||= '../../phusion/passenger-docker'   " >> ~/.vagrant.d/Vagrantfile
+#   echo "ENV['BASE_BOX_URL']          ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile
+BASE_BOX_URL          = ENV['BASE_BOX_URL']    || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
+VAGRANT_BOX_URL       = ENV['VAGRANT_BOX_URL'] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
+VMWARE_BOX_URL        = ENV['VMWARE_BOX_URL']  || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
+BASEIMAGE_PATH        = ENV['BASEIMAGE_PATH' ] || '.'
+PASSENGER_DOCKER_PATH = ENV['PASSENGER_PATH' ] || '../passenger-docker'
+DOCKERIZER_PATH       = ENV['DOCKERIZER_PATH'] || '../dockerizer'
 
 $script = <<SCRIPT
 wget -q -O - https://get.docker.io/gpg | apt-key add -
@@ -30,17 +30,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'phusion-open-ubuntu-12.04-amd64'
   config.vm.box_url = VAGRANT_BOX_URL
   config.ssh.forward_agent = true
-  passenger_path = "#{ROOT}/#{PASSENGER_PATH_URI}"
-  if File.directory?(passenger_path)
-    config.vm.synced_folder File.expand_path(passenger_path), '/vagrant/passenger-docker'
+  passenger_docker_path = File.absolute_path(PASSENGER_DOCKER_PATH, ROOT)
+  if File.directory?(passenger_docker_path)
+    config.vm.synced_folder passenger_docker_path, '/vagrant/passenger-docker'
   end
-  baseimage_path = "#{ROOT}/#{BASEIMAGE_PATH_URI}"
+  baseimage_path = File.absolute_path(BASEIMAGE_PATH, ROOT)
   if File.directory?(baseimage_path)
-    config.vm.synced_folder File.expand_path(baseimage_path), '/vagrant/baseimage-docker'
+    config.vm.synced_folder baseimage_path, "/vagrant/baseimage-docker"
   end
-  dockerizer_path = "#{ROOT}/#{DOCKERIZER_PATH_URI}"
+  dockerizer_path = File.absolute_path(DOCKERIZER_PATH, ROOT)
   if File.directory?(dockerizer_path)
-    config.vm.synced_folder File.expand_path(dockerizer_path), '/vagrant/dockerizer'
+    config.vm.synced_folder dockerizer_path, '/vagrant/dockerizer'
   end
 
   config.vm.provider :vmware_fusion do |f, override|