p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21388 from zhuguihua/move_zfs_options_to_correct_place_in_man_page

Browse Source 
Move ZFS options to correct place in man page
Upstream-commit: 77203387133ecc2c5c1f40e8ea2f7b547adc2bd8
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-03-22 08:26:54 +01:00
parent 288aa38b5e 748927baa7
commit 20b3ca18bd
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/engine/man/docker-daemon.8.md
View File

@ -465,16 +465,6 @@ this topic, see
Otherwise, set this flag for migrating existing Docker daemons to a
daemon with a supported environment.
## ZFS options
#### 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 daemon -s zfs --storage-opt zfs.fsname=zroot/docker`
#### dm.min_free_space
Specifies the min free space percent in thin pool require for new device
@ -499,6 +489,16 @@ that should resolve the issue.
Example use: `docker daemon --storage-opt dm.min_free_space_percent=10%`
## ZFS options
#### 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 daemon -s zfs --storage-opt zfs.fsname=zroot/docker`
# CLUSTER STORE OPTIONS
The daemon uses libkv to advertise