From d479efc01ead3da7b57c85a493f957e46c5fa0d1 Mon Sep 17 00:00:00 2001
From: Ken Cochrane <kencochrane@gmail.com>
Date: Wed, 13 Mar 2013 13:30:13 -0700
Subject: [PATCH] updated Vagrant to support new single binary, and exposing
 the vagrant shared folder, and setting some ENV variables

---
 Vagrantfile                                  |  2 +-
 puppet/modules/docker/templates/dockerd.conf |  2 +-
 puppet/modules/docker/templates/profile      | 27 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 puppet/modules/docker/templates/profile

diff --git a/Vagrantfile b/Vagrantfile
index c823a39581..31b6bf5b32 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,7 +34,7 @@ Vagrant::Config.run do |config|
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
   # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+  config.vm.share_folder "v-data", "~/docker", "~/docker"
 
   # Enable provisioning with Puppet stand alone.  Puppet manifests
   # are contained in a directory path relative to this Vagrantfile.
diff --git a/puppet/modules/docker/templates/dockerd.conf b/puppet/modules/docker/templates/dockerd.conf
index c05f606391..2d77c301f0 100644
--- a/puppet/modules/docker/templates/dockerd.conf
+++ b/puppet/modules/docker/templates/dockerd.conf
@@ -8,5 +8,5 @@ respawn
 
 script
     test -f /etc/default/locale && . /etc/default/locale || true
-    LANG=$LANG LC_ALL=$LANG /usr/local/bin/dockerd
+    LANG=$LANG LC_ALL=$LANG /usr/local/bin/docker -d
 end script
diff --git a/puppet/modules/docker/templates/profile b/puppet/modules/docker/templates/profile
new file mode 100644
index 0000000000..c52d87387c
--- /dev/null
+++ b/puppet/modules/docker/templates/profile
@@ -0,0 +1,27 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+        . "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set ~/docker as the go path
+export GOPATH=~/docker
+# add go to the PATH
+export PATH=$PATH:/usr/local/go/bin
\ No newline at end of file