From d7a77ed2cd55b404cfec288d0a58c86573ca9b50 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Fri, 21 Jun 2013 15:25:05 -0300 Subject: [PATCH 1/2] bumped buildstep submodule dependency to latest master --- buildstep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildstep b/buildstep index 73f59b90c5c..7b0d89fd0b8 160000 --- a/buildstep +++ b/buildstep @@ -1 +1 @@ -Subproject commit 73f59b90c5c92f2fe30cdf2d12d7c66c8039ca78 +Subproject commit 7b0d89fd0b8729b42e78e4c595241e611254d0d5 From 1f175f7d12ca098d8c4aae407b380c9d94ed4bd0 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Fri, 21 Jun 2013 15:25:27 -0300 Subject: [PATCH 2/2] installs docker 0.4.2 instead of the latest available --- bootstrap.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index bb99b7e7c00..9655de8a7fe 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,10 +1,17 @@ DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"} DOKKU_STACK=${DOKKU_STACK:-"https://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz"} +DOCKER_PKG=${DOCKER_PKG:-"https://launchpad.net/~dotcloud/+archive/lxc-docker/+files/lxc-docker_0.4.2-1_amd64.deb"} +apt-get update apt-get install -y linux-image-extra-`uname -r` apt-get install -y python-software-properties -add-apt-repository -y ppa:dotcloud/lxc-docker -apt-get update && apt-get install -y lxc-docker git ruby nginx make curl dnsutils +apt-get install -y git ruby nginx make curl dnsutils + +cd /tmp +wget "$DOCKER_PKG" +dpkg -i lxc-docker_0.4.2-1_amd64.deb +apt-get install -f -y +rm lxc-docker_0.4.2-1_amd64.deb cd ~ && git clone ${DOKKU_REPO} cd dokku && make install