Merge pull request #17918 from anusha-ragunathan/fsMagic

Include xfsprogs in build environment.
This commit is contained in:
Michael Crosby 2015-11-11 15:43:52 -08:00
commit b664a8825e
4 changed files with 6 additions and 3 deletions

View File

@ -58,6 +58,7 @@ RUN apt-get update && apt-get install -y \
ruby1.9.1-dev \
s3cmd=1.1.0* \
ubuntu-zfs \
xfsprogs \
libzfs-dev \
--no-install-recommends

View File

@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
e2fsprogs \
iptables \
procps \
xfsprogs \
xz-utils \
\
aufs-tools \

View File

@ -260,11 +260,11 @@ options for `zfs` start with `zfs`.
* `dm.fs`
Specifies the filesystem type to use for the base device. The supported
options are "ext4" and "xfs". The default is "ext4"
options are "ext4" and "xfs". The default is "xfs"
Example use:
$ docker daemon --storage-opt dm.fs=xfs
$ docker daemon --storage-opt dm.fs=ext4
* `dm.mkfsarg`

View File

@ -266,7 +266,8 @@ installed and available at runtime:
* iptables version 1.4 or later
* procps (or similar provider of a "ps" executable)
* e2fsprogs version 1.4.12 or later (in use: mkfs.ext4, mkfs.xfs, tune2fs)
* e2fsprogs version 1.4.12 or later (in use: mkfs.ext4, tune2fs)
* xfsprogs (in use: mkfs.xfs)
* XZ Utils version 4.9 or later
* a [properly
mounted](https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount)