Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build environment. Also update docs to reflect the new default. Signed-off-by: Anusha Ragunathan <anusha@docker.com>
This commit is contained in:
parent
6c82fba2b3
commit
2b766a455c
|
@ -58,6 +58,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
ruby1.9.1-dev \
|
ruby1.9.1-dev \
|
||||||
s3cmd=1.1.0* \
|
s3cmd=1.1.0* \
|
||||||
ubuntu-zfs \
|
ubuntu-zfs \
|
||||||
|
xfsprogs \
|
||||||
libzfs-dev \
|
libzfs-dev \
|
||||||
--no-install-recommends
|
--no-install-recommends
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
e2fsprogs \
|
e2fsprogs \
|
||||||
iptables \
|
iptables \
|
||||||
procps \
|
procps \
|
||||||
|
xfsprogs \
|
||||||
xz-utils \
|
xz-utils \
|
||||||
\
|
\
|
||||||
aufs-tools \
|
aufs-tools \
|
||||||
|
|
|
@ -260,11 +260,11 @@ options for `zfs` start with `zfs`.
|
||||||
* `dm.fs`
|
* `dm.fs`
|
||||||
|
|
||||||
Specifies the filesystem type to use for the base device. The supported
|
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:
|
Example use:
|
||||||
|
|
||||||
$ docker daemon --storage-opt dm.fs=xfs
|
$ docker daemon --storage-opt dm.fs=ext4
|
||||||
|
|
||||||
* `dm.mkfsarg`
|
* `dm.mkfsarg`
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,8 @@ installed and available at runtime:
|
||||||
|
|
||||||
* iptables version 1.4 or later
|
* iptables version 1.4 or later
|
||||||
* procps (or similar provider of a "ps" executable)
|
* 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
|
* XZ Utils version 4.9 or later
|
||||||
* a [properly
|
* a [properly
|
||||||
mounted](https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount)
|
mounted](https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount)
|
||||||
|
|
Loading…
Reference in New Issue