From 90e3e9ce2f9e362e4d0725db35acb2b61ba6bd18 Mon Sep 17 00:00:00 2001
From: Jeff Lindsay <progrium@gmail.com>
Date: Sun, 9 Jun 2013 19:42:06 -0700
Subject: [PATCH] download buildstep container instead of build it

---
 README.md    |  4 ++--
 bootstrap.sh | 24 +++++++++++++-----------
 receiver     |  1 -
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 234c432c8..1e704436c 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ You're done!
 
 ## Advanced installation (for development)
 
-The bootstrap script allows source git repository URLs to be overridden to include customizations from your own 
-repositories. The GITRECEIVE_URL, BUILDSTEP_REPO and DOKKU_REPO environment variables
+The bootstrap script allows source URLs to be overridden to include customizations from your own 
+repositories. The GITRECEIVE_URL, BUILDSTEP_URL, BUILDSTEP_CONTAINER and DOKKU_REPO environment variables
 may be set to override the defaults (see the bootstrap.sh script for how these apply):
 
 Example:
diff --git a/bootstrap.sh b/bootstrap.sh
index 45a2653f7..9d6a73c14 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,8 +1,9 @@
-# Repository locations - set environment variables to override defaults
-#  e.g. OVERRIDE_DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh
-GITRECEIVE_URL=${GITRECEIVE_URL:-"https://raw.github.com/progrium/gitreceive/master/gitreceive"}
-BUILDSTEP_REPO=${BUILDSTEP_REPO:-"https://github.com/progrium/buildstep.git"}
+# Source locations - set environment variables to override defaults
+#  e.g. DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh
 DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
+GITRECEIVE_URL=${GITRECEIVE_URL:-"https://raw.github.com/progrium/gitreceive/master/gitreceive"}
+BUILDSTEP_URL=${BUILDSTEP_URL:-"https://raw.github.com/progrium/buildstep/master/buildstep"}
+BUILDSTEP_CONTAINER=${BUILDSTEP_CONTAINER:-"progrium/buildstep"}
 
 # Docker and base dependencies
 apt-get install -y linux-image-extra-`uname -r`
@@ -12,18 +13,19 @@ apt-get update
 apt-get install -y lxc-docker
 apt-get install -y git ruby nginx make
 
-# gitreceive
+# install and init gitreceive
 cd /usr/local/bin
 wget ${GITRECEIVE_URL}
 chmod +x gitreceive
 gitreceive init
 
-# buildstep
-cd ~
-git clone ${BUILDSTEP_REPO}
-cd buildstep
-cp buildstep /home/git/buildstep
-make
+# install buildstep script
+cd /home/git
+wget ${BUILDSTEP_URL}
+chmod +x buildstep
+
+# fetch prebuilt buildstep container
+docker pull ${BUILDSTEP_CONTAINER}
 
 # dokku (this!)
 cd ~
diff --git a/receiver b/receiver
index de3632fbf..470e46504 100755
--- a/receiver
+++ b/receiver
@@ -9,7 +9,6 @@ echo "-----> Build complete!"
 
 echo "-----> Deploying $APP ..."
 $HOME/deploystep $APP $CONTAINER
-echo
 echo "-----> Application deployed:"
 echo "       http://$(< "$HOME/$APP/HOSTNAME")"
 echo
\ No newline at end of file