Browse code

Update lxc requirement to 1.0 Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby authored on 2014/05/21 04:05:57
Showing 2 changed files
... ...
@@ -41,6 +41,7 @@ RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
41 41
 	libapparmor-dev \
42 42
 	libcap-dev \
43 43
 	libsqlite3-dev \
44
+	lxc=1.0* \
44 45
 	mercurial \
45 46
 	pandoc \
46 47
 	reprepro \
... ...
@@ -49,10 +50,6 @@ RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
49 49
 	s3cmd=1.1.0* \
50 50
 	--no-install-recommends
51 51
 
52
-# Get and compile LXC 0.8 (since it is the most stable)
53
-RUN	git clone --no-checkout https://github.com/lxc/lxc.git /usr/local/lxc && cd /usr/local/lxc && git checkout -q lxc-0.8.0
54
-RUN	cd /usr/local/lxc && ./autogen.sh && ./configure --disable-docs && make && make install
55
-
56 52
 # Get lvm2 source for compiling statically
57 53
 RUN	git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103
58 54
 # see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
... ...
@@ -297,7 +297,7 @@ the client will even run on alternative platforms such as Mac OS X / Darwin.
297 297
 Some of Docker's features are activated by using optional command-line flags or
298 298
 by having support for them in the kernel or userspace. A few examples include:
299 299
 
300
-* LXC execution driver (requires version 0.8 or later of the LXC utility scripts)
300
+* LXC execution driver (requires version 1.0 or later of the LXC utility scripts)
301 301
 * AUFS graph driver (requires AUFS patches/support enabled in the kernel, and at
302 302
   least the "auplink" utility from aufs-tools)
303 303
 * experimental BTRFS graph driver (requires BTRFS support enabled in the kernel)