From deb2f0462013b812ea18432ef49b306623febdd3 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 6 Jan 2015 23:10:05 -0800 Subject: [PATCH 1/2] Install lxc from source. Haters gunna hate, cache bust. But this fixes a bunch of tests. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: e3b3719f16cbae506d15474c122276e21f59d3a5 Component: engine --- components/engine/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 86130c4caa..b38c142c3e 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -39,7 +39,6 @@ RUN apt-get update && apt-get install -y \ libapparmor-dev \ libcap-dev \ libsqlite3-dev \ - lxc=1.0* \ mercurial \ parallel \ python-mock \ @@ -62,6 +61,15 @@ RUN cd /usr/local/lvm2 \ && make install_device-mapper # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# Install lxc +RUN mkdir -p /usr/src/lxc \ + && curl -sSL https://linuxcontainers.org/downloads/lxc/lxc-1.0.7.tar.gz | tar -v -C /usr/src/lxc/ -xz --strip-components=1 +RUN cd /usr/src/lxc \ + && ./configure \ + && make \ + && make install \ + && ldconfig + # Install Go RUN curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz ENV PATH /usr/local/go/bin:$PATH From bfb2a1f1761f7b10e7eb0f3d0a36eeb332cfdccc Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 7 Jan 2015 09:43:07 -0800 Subject: [PATCH 2/2] Update the LXC version to 1.0.7 in PACKAGERS.md Signed-off-by: Jessica Frazelle Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 17373ca54b9caf2bc24d8a69c6b9639d167cb0cb Component: engine --- components/engine/project/PACKAGERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/project/PACKAGERS.md b/components/engine/project/PACKAGERS.md index 7aba36c890..701e552d59 100644 --- a/components/engine/project/PACKAGERS.md +++ b/components/engine/project/PACKAGERS.md @@ -306,7 +306,7 @@ the client will even run on alternative platforms such as Mac OS X / Darwin. Some of Docker's features are activated by using optional command-line flags or by having support for them in the kernel or userspace. A few examples include: -* LXC execution driver (requires version 1.0 or later of the LXC utility scripts) +* LXC execution driver (requires version 1.0.7 or later of lxc and the lxc-libs) * AUFS graph driver (requires AUFS patches/support enabled in the kernel, and at least the "auplink" utility from aufs-tools) * BTRFS graph driver (requires BTRFS support enabled in the kernel)