From 83fc2cf8e78cd875beeed9de179bde06b4bad3b7 Mon Sep 17 00:00:00 2001 From: Anusha Ragunathan Date: Wed, 11 Nov 2015 14:29:02 -0800 Subject: [PATCH] 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 Upstream-commit: 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1 Component: engine --- components/engine/Dockerfile | 1 + components/engine/Dockerfile.simple | 1 + components/engine/docs/reference/commandline/daemon.md | 4 ++-- components/engine/project/PACKAGERS.md | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 43f8f64cf1..2fbbfed9c4 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -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 diff --git a/components/engine/Dockerfile.simple b/components/engine/Dockerfile.simple index 507018b07c..427a0717fb 100644 --- a/components/engine/Dockerfile.simple +++ b/components/engine/Dockerfile.simple @@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ e2fsprogs \ iptables \ procps \ + xfsprogs \ xz-utils \ \ aufs-tools \ diff --git a/components/engine/docs/reference/commandline/daemon.md b/components/engine/docs/reference/commandline/daemon.md index 8e3200d0ac..3cb93b375f 100644 --- a/components/engine/docs/reference/commandline/daemon.md +++ b/components/engine/docs/reference/commandline/daemon.md @@ -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` diff --git a/components/engine/project/PACKAGERS.md b/components/engine/project/PACKAGERS.md index 962be12c32..5ea659fa44 100644 --- a/components/engine/project/PACKAGERS.md +++ b/components/engine/project/PACKAGERS.md @@ -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)