Merge branch 'dm-plugin-dockerfile' into 0.6.5-dm-plugin

This commit is contained in:
Solomon Hykes 2013-11-04 23:41:23 +00:00
commit 66bf395e4d
1 changed files with 14 additions and 5 deletions

View File

@ -57,6 +57,15 @@ run apt-get install -y -q iptables
run apt-get install -y -q lxc run apt-get install -y -q lxc
run apt-get install -y -q aufs-tools run apt-get install -y -q aufs-tools
# Get lvm2 source for compiling statically
run git clone git://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout v2_02_103
# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
# note: we can't use "git clone -b" above because it requires at least git 1.7.10 to be able to use that on a tag instead of a branch and we only have 1.7.9.5
# Compile and install lvm2
run cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
volume /var/lib/docker volume /var/lib/docker
workdir /go/src/github.com/dotcloud/docker workdir /go/src/github.com/dotcloud/docker