From fbf2b28512e73b5ef4a8ab04021de52af2e74ade Mon Sep 17 00:00:00 2001
From: rhy-jot <rhy-jot@myeml.net>
Date: Fri, 23 Aug 2013 17:58:07 -0700
Subject: [PATCH] Install docker from dotCloud's new repository

---
 Makefile     | 3 ++-
 bootstrap.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6876003ce..c7f1b967c 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ docker: aufs
 	egrep -i "^docker" /etc/group || groupadd docker
 	usermod -aG docker git
 	usermod -aG docker dokku
-	apt-add-repository -y ppa:dotcloud/lxc-docker
+	curl https://get.docker.io/gpg | apt-key add -
+	echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 	apt-get update
 	apt-get install -y lxc-docker 
 	sleep 2 # give docker a moment i guess
diff --git a/bootstrap.sh b/bootstrap.sh
index 09087b613..aa619fa03 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,7 +3,7 @@ export DEBIAN_FRONTEND=noninteractive
 export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
 
 apt-get update
-apt-get install -y git make curl software-properties-common
+apt-get install -y git make curl
 
 cd ~ && test -d dokku || git clone $DOKKU_REPO
 cd dokku && test $DOKKU_BRANCH && git checkout origin/$DOKKU_BRANCH || true