github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use apt to install lxc-docker vs downloading the .deb

Browse Source
This commit is contained in:
rhy-jot
2013-08-05 13:47:44 -07:00
parent 7a24561194
commit d56db3457b
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 GITRECEIVE_URL ?= https://raw.github.com/progrium/gitreceive/master/gitreceive
SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb 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 STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz
all: dependencies stack install plugins all: dependencies stack install plugins
@@ -33,13 +31,9 @@ pluginhook:
dpkg -i /tmp/pluginhook_0.1.0_amd64.deb dpkg -i /tmp/pluginhook_0.1.0_amd64.deb
docker: aufs docker: aufs
wget -qO /tmp/lxc-docker_0.4.8-1_amd64.deb ${DOCKER_URL} apt-add-repository -y ppa:dotcloud/lxc-docker
dpkg --force-depends -i /tmp/lxc-docker_0.4.8-1_amd64.deb && apt-get install -f -y apt-get update
# newer docker 0.4.8 binary apt-get install -y lxc-docker
stop docker
wget -qO /usr/bin/docker ${DOCKER_BIN}
chmod +x /usr/bin/docker
start docker
sleep 2 # give docker a moment i guess sleep 2 # give docker a moment i guess
aufs: aufs: