ソースを参照

docs: move zfs.fsname option to storage option section

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Jörg Thalheim 10 年 前
コミット
bdf784ae4a
1 ファイル変更15 行追加5 行削除
  1. 15 5
      docs/sources/reference/commandline/cli.md

+ 15 - 5
docs/sources/reference/commandline/cli.md

@@ -275,8 +275,7 @@ share executable memory between devices. Use `docker -d -s btrfs -g /mnt/btrfs_p
 The `zfs` driver is probably not fast as `btrfs` but has a longer track record
 The `zfs` driver is probably not fast as `btrfs` but has a longer track record
 on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
 on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
 cached only once. Use `docker -d -s zfs`. To select a different zfs filesystem
 cached only once. Use `docker -d -s zfs`. To select a different zfs filesystem
-as backingstore use the storage option `zfs.fsname`:
-`docker -d -s zfs --storage-opt zfs.fsname=zroot/docker`
+set `zfs.fsname` option as described in [Storage driver options](#storage-driver-options):
 
 
 The `overlay` is a very fast union filesystem. It is now merged in the main
 The `overlay` is a very fast union filesystem. It is now merged in the main
 Linux kernel as of [3.18.0](https://lkml.org/lkml/2014/10/26/137).
 Linux kernel as of [3.18.0](https://lkml.org/lkml/2014/10/26/137).
@@ -288,10 +287,10 @@ Call `docker -d -s overlay` to use it.
 #### Storage driver options
 #### Storage driver options
 
 
 Particular storage-driver can be configured with options specified with
 Particular storage-driver can be configured with options specified with
-`--storage-opt` flags. The only driver accepting options is `devicemapper` as
-of now. All its options are prefixed with `dm`.
+`--storage-opt` flags. Options for `devicemapper` are prefixed with `dm` and
+options for `zfs` start with `zfs`.
 
 
-Currently supported options are:
+Currently supported options of `devicemapper`:
 
 
  *  `dm.basesize`
  *  `dm.basesize`
 
 
@@ -450,6 +449,17 @@ Currently supported options are:
     > daemon with a supported environment.
     > daemon with a supported environment.
 
 
 ### Docker execdriver option
 ### Docker execdriver option
+Currently supported options of `zfs`:
+
+ * `zfs.fsname`
+
+    Set zfs filesystem under which docker will create its own datasets.
+    By default docker will pick up the zfs filesystem where docker graph
+    (`/var/lib/docker`) is located.
+
+    Example use:
+
+       $ docker -d -s zfs --storage-opt zfs.fsname=zroot/docker
 
 
 The Docker daemon uses a specifically built `libcontainer` execution driver as its
 The Docker daemon uses a specifically built `libcontainer` execution driver as its
 interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.
 interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.