removing buildstep submodule and replacing it with the buildstep script that dokku actually uses. the buildstep project is otherwise completely separate other than the artifact it builds (the progrium/buildstep container)

.gitignore

@@ -1 +1,2 @@
 .vagrant
+.DS_Store

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "buildstep"]
-	path = buildstep
-	url = https://github.com/progrium/buildstep.git

Makefile

@@ -7,15 +7,11 @@ install: submodule gitreceive sshcommand
 	cp dokku /usr/local/bin/dokku
 	cp receiver /home/git/receiver
 	cp deploystep /home/git/deploystep
-	cp buildstep/buildstep /home/git/buildstep
+	cp buildstep /home/git/buildstep
 	cp nginx-app-conf /home/git/nginx-app-conf
 	cp nginx-reloader.conf /etc/init/nginx-reloader.conf
 	echo "include /home/git/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf
 
-submodule:
-	git submodule init
-	git submodule update
-
 gitreceive:
 	wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL}
 	chmod +x /usr/local/bin/gitreceive
@@ -27,4 +23,4 @@ sshcommand:
 	sshcommand create dokku /usr/local/bin/dokku
 
 count:
-	cat receiver deploystep bootstrap.sh nginx-app-conf nginx-reloader.conf | wc -l
+	cat receiver deploystep buildstep bootstrap.sh nginx-app-conf nginx-reloader.conf | wc -l

README.md

@@ -70,13 +70,6 @@ To update the deploy step (this is updated less frequently):
     $ git pull origin master
     $ sudo make install
 
-More frequently, the build step is updated. This is where the app "stack" lives and where buildpacks
-are supported. You can update this by running:
-
-    $ cd ~/dokku/buildstep
-    $ git pull origin master
-    $ sudo make build
-
 Nothing needs to be restarted. Changes will take effect on the next push / deployment.
 
 ## Support

bootstrap.sh

@@ -15,11 +15,7 @@ sed -i.bak 's/docker -d/docker -d -r=true/' /etc/init/docker.conf # Docker shoul
 
 cd ~ && git clone ${DOKKU_REPO}
 cd dokku && make install
-if [[ $DOKKU_STACK ]]; then
+curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
-  curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
-else
-  cd buildstep && make build
-fi
 
 [[ -f /etc/nginx/nginx.conf ]] && sed -i 's/# server_names_hash_bucket_size/server_names_hash_bucket_size/' /etc/nginx/nginx.conf
 

buildstep

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+NAME="$1"
+
+# Place the app inside the container 
+ID=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
+test $(docker wait $ID) -eq 0
+docker commit $ID $NAME > /dev/null
+
+# Run the builder script and attach to view output
+ID=$(docker run -d $NAME /build/builder)
+docker attach $ID
+test $(docker wait $ID) -eq 0
+docker commit $ID $NAME > /dev/null