Browse code

docs: move zfs.fsname option to storage option section

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>

Jörg Thalheim authored on 2015/04/03 04:56:18
Showing 1 changed files
... ...
@@ -275,8 +275,7 @@ share executable memory between devices. Use `docker -d -s btrfs -g /mnt/btrfs_p
275 275
 The `zfs` driver is probably not fast as `btrfs` but has a longer track record
276 276
 on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
277 277
 cached only once. Use `docker -d -s zfs`. To select a different zfs filesystem
278
-as backingstore use the storage option `zfs.fsname`:
279
-`docker -d -s zfs --storage-opt zfs.fsname=zroot/docker`
278
+set `zfs.fsname` option as described in [Storage driver options](#storage-driver-options):
280 279
 
281 280
 The `overlay` is a very fast union filesystem. It is now merged in the main
282 281
 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.
288 288
 #### Storage driver options
289 289
 
290 290
 Particular storage-driver can be configured with options specified with
291
-`--storage-opt` flags. The only driver accepting options is `devicemapper` as
292
-of now. All its options are prefixed with `dm`.
291
+`--storage-opt` flags. Options for `devicemapper` are prefixed with `dm` and
292
+options for `zfs` start with `zfs`.
293 293
 
294
-Currently supported options are:
294
+Currently supported options of `devicemapper`:
295 295
 
296 296
  *  `dm.basesize`
297 297
 
... ...
@@ -450,6 +449,17 @@ Currently supported options are:
450 450
     > daemon with a supported environment.
451 451
 
452 452
 ### Docker execdriver option
453
+Currently supported options of `zfs`:
454
+
455
+ * `zfs.fsname`
456
+
457
+    Set zfs filesystem under which docker will create its own datasets.
458
+    By default docker will pick up the zfs filesystem where docker graph
459
+    (`/var/lib/docker`) is located.
460
+
461
+    Example use:
462
+
463
+       $ docker -d -s zfs --storage-opt zfs.fsname=zroot/docker
453 464
 
454 465
 The Docker daemon uses a specifically built `libcontainer` execution driver as its
455 466
 interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.