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

Merge pull request #84 from hwartig/update-docker

Browse Source 
Update docker to latest version 0.4.8-1 .
This commit is contained in:
Jeff Lindsay
2013-07-07 12:50:38 -07:00
parent ea14fb0543 3aa6340c06
commit 3d1c8a30e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,7 +1,7 @@
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.2-1_amd64.deb DOCKER_URL ?= https://launchpad.net/~dotcloud/+archive/lxc-docker/+files/lxc-docker_0.4.8-1_amd64.deb
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
@@ -32,8 +32,8 @@ 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.2-1_amd64.deb ${DOCKER_URL} wget -qO /tmp/lxc-docker_0.4.8-1_amd64.deb ${DOCKER_URL}
dpkg --force-depends -i /tmp/lxc-docker_0.4.2-1_amd64.deb && apt-get install -f -y dpkg --force-depends -i /tmp/lxc-docker_0.4.8-1_amd64.deb && apt-get install -f -y
aufs: aufs:
modprobe aufs || apt-get install -y linux-image-extra-`uname -r` modprobe aufs || apt-get install -y linux-image-extra-`uname -r`