Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-28 16:06:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150 from rhy-jot/master

Browse Source 
Use apt to install lxc-docker vs downloading the .deb
This commit is contained in:
Jeff Lindsay
2013-08-06 11:08:10 -07:00
parent 7a24561194 d56db3457b
commit 40fa670770
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -1,8 +1,6 @@
GITRECEIVE_URL ?= https://raw.github.com/progrium/gitreceive/master/gitreceive
SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb
DOCKER_URL ?= https://launchpad.net/~dotcloud/+archive/lxc-docker/+files/lxc-docker_0.4.8-1_amd64.deb
DOCKER_BIN ?= https://s3.amazonaws.com/get.docker.io/builds/Linux/x86_64/docker-1004d57b85fc3714b089da4c457228690f254504
STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz
all: dependencies stack install plugins
@@ -33,13 +31,9 @@ pluginhook:
dpkg -i /tmp/pluginhook_0.1.0_amd64.deb
docker: aufs
wget -qO /tmp/lxc-docker_0.4.8-1_amd64.deb ${DOCKER_URL}
dpkg --force-depends -i /tmp/lxc-docker_0.4.8-1_amd64.deb && apt-get install -f -y
# newer docker 0.4.8 binary
stop docker
wget -qO /usr/bin/docker ${DOCKER_BIN}
chmod +x /usr/bin/docker
start docker
apt-add-repository -y ppa:dotcloud/lxc-docker
apt-get update
apt-get install -y lxc-docker
sleep 2 # give docker a moment i guess
aufs: