Upgrade dokku installation to use docker-engine

Also simplify deb-based installation everywhere.

Closes #1295
Closes #1461
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-14 22:03:47 -07:00
parent 1be4b94226
commit 1e479c63bd
8 changed files with 47 additions and 70 deletions

View File

@@ -103,14 +103,7 @@ docker: aufs
egrep -i "^docker" /etc/group || groupadd docker
usermod -aG docker dokku
ifndef CI
curl -sSL https://get.docker.com/gpg | apt-key add -
echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
apt-get update
ifdef DOCKER_VERSION
apt-get install -qq -y lxc-docker-${DOCKER_VERSION}
else
apt-get install -qq -y lxc-docker-1.6.2
endif
curl -sSL https://get.docker.com/ | sh
sleep 2 # give docker a moment i guess
endif