From cb89c420d7eee1554e7a7808826be2a5b71d386a Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 16 May 2014 22:12:02 -0500
Subject: [PATCH] allow the vagrant box to be configurable

---
 README.md  | 9 ++++++++-
 docker-osx | 7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 25e69e7..e60d13b 100644
--- a/README.md
+++ b/README.md
@@ -106,16 +106,23 @@ The URL used to download the docker client.
 
 Default: <http://get.docker.io/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz>
 
+### VAGRANT_BOX
+
+The name of the vagrant box to use.
+
+Default: `docker-0.8.0`
+
 ### VAGRANT_BOX_URL
 
 The URL used to download the vagrant box.
 
-Default: <http://static.orchardup.com/binaries/vagrant/vagrant-docker-0.8.0-virtualbox.box>
+Default: <http://static.orchardup.com/binaries/vagrant/vagrant-${VAGRANT_BOX}-virtualbox.box>
 
 ## Contributors
 
 * [Julien Duponchelle](https://github.com/noplay/) – Original author
 * [Ben Firshman](https://github.com/bfirsh) – Faster and simpler installation with Vagrant image and pre-built binary
+* [Michael Merickel](https://github.com/mmerickel) - Support for defaults.
 
 
 ## Alternatives
diff --git a/docker-osx b/docker-osx
index a781ead..b27c0c3 100755
--- a/docker-osx
+++ b/docker-osx
@@ -26,7 +26,8 @@ DOCKER_IP="172.16.42.43"
 DOCKER_DOMAIN="localdocker"
 DOCKER_PORT="4243"
 
-DOCKER_VERSION="1.0.0"
+DOCKER_VERSION="1.1.0"
+VAGRANT_BOX="docker-0.8.0"
 
 DOCKER_BIN="/usr/local/bin/docker"
 
@@ -43,7 +44,7 @@ then
 fi
 if [ -z "$VAGRANT_BOX_URL" ]
 then
-    VAGRANT_BOX_URL="http://static.orchardup.com/binaries/vagrant/vagrant-docker-0.8.0-virtualbox.box"
+    VAGRANT_BOX_URL="http://static.orchardup.com/binaries/vagrant/vagrant-${VAGRANT_BOX}-virtualbox.box"
 fi
 export DOCKER_HOST="tcp://$DOCKER_IP:$DOCKER_PORT"
 
@@ -140,7 +141,7 @@ cat > "$VAGRANT_CWD/Vagrantfile" <<EOL
 # automatically generated by docker-osx
 # do not edit this file - find the template in docker-osx script instead!
 Vagrant.configure("2") do |config|
-  config.vm.box = "docker-0.8.0"
+  config.vm.box = "$VAGRANT_BOX"
   config.vm.box_url = "$VAGRANT_BOX_URL"
 
   config.ssh.forward_agent = true