mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #9947 from jfrazelle/lxc-version
Install lxc from source.
This commit is contained in:
commit
645a752f17
2 changed files with 10 additions and 2 deletions
10
Dockerfile
10
Dockerfile
|
@ -39,7 +39,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
libapparmor-dev \
|
libapparmor-dev \
|
||||||
libcap-dev \
|
libcap-dev \
|
||||||
libsqlite3-dev \
|
libsqlite3-dev \
|
||||||
lxc=1.0* \
|
|
||||||
mercurial \
|
mercurial \
|
||||||
parallel \
|
parallel \
|
||||||
python-mock \
|
python-mock \
|
||||||
|
@ -62,6 +61,15 @@ RUN cd /usr/local/lvm2 \
|
||||||
&& make install_device-mapper
|
&& make install_device-mapper
|
||||||
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
# 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
|
# Install Go
|
||||||
RUN curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz
|
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
|
ENV PATH /usr/local/go/bin:$PATH
|
||||||
|
|
|
@ -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
|
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:
|
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
|
* AUFS graph driver (requires AUFS patches/support enabled in the kernel, and at
|
||||||
least the "auplink" utility from aufs-tools)
|
least the "auplink" utility from aufs-tools)
|
||||||
* BTRFS graph driver (requires BTRFS support enabled in the kernel)
|
* BTRFS graph driver (requires BTRFS support enabled in the kernel)
|
||||||
|
|
Loading…
Add table
Reference in a new issue