Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docs: fix storage driver options list 

This fixes the indentation of the storage driver
options list.

Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML

Fixes #17140

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2015-10-17 19:06:21 -07:00 committed by Tibor Vass
parent 4c506e1df7
commit 91e898094f
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
docs/reference/commandline/daemon.md
View File

@ -205,7 +205,8 @@ options for `zfs` start with `zfs`.
Example use:
docker daemon --storage-opt dm.thinpooldev=/dev/mapper/thin-pool
$ docker daemon \
--storage-opt dm.thinpooldev=/dev/mapper/thin-pool
* `dm.basesize`
@ -229,7 +230,9 @@ options for `zfs` start with `zfs`.
* `dm.loopdatasize`
>**Note**: This option configures devicemapper loopback, which should not be used in production.
> **Note**:
> This option configures devicemapper loopback, which should not
> be used in production.
Specifies the size to use when creating the loopback file for the
"data" device which is used for the thin pool. The default size is
@ -242,7 +245,9 @@ options for `zfs` start with `zfs`.
* `dm.loopmetadatasize`
>**Note**: This option configures devicemapper loopback, which should not be used in production.
> **Note**:
> This option configures devicemapper loopback, which should not
> be used in production.
Specifies the size to use when creating the loopback file for the
"metadata" device which is used for the thin pool. The default size
@ -290,7 +295,9 @@ options for `zfs` start with `zfs`.
Example use:
$ docker daemon --storage-opt dm.datadev=/dev/sdb1 --storage-opt dm.metadatadev=/dev/sdc1
$ docker daemon \
--storage-opt dm.datadev=/dev/sdb1 \
--storage-opt dm.metadatadev=/dev/sdc1
* `dm.metadatadev`
@ -308,7 +315,9 @@ options for `zfs` start with `zfs`.
Example use:
$ docker daemon --storage-opt dm.datadev=/dev/sdb1 --storage-opt dm.metadatadev=/dev/sdc1
$ docker daemon \
--storage-opt dm.datadev=/dev/sdb1 \
--storage-opt dm.metadatadev=/dev/sdc1
* `dm.blocksize`
@ -385,7 +394,9 @@ options for `zfs` start with `zfs`.
system to schedule the device for deferred removal. It does not wait in a
loop trying to remove a busy device.
Example use: `docker daemon --storage-opt dm.use_deferred_removal=true`
Example use:
$ docker daemon --storage-opt dm.use_deferred_removal=true
* `dm.use_deferred_deletion`
@ -394,12 +405,14 @@ options for `zfs` start with `zfs`.
the Docker daemon removes any associated devices. If the storage driver
can not remove a device, the container deletion fails and daemon returns.
`Error deleting container: Error response from daemon: Cannot destroy container`
Error deleting container: Error response from daemon: Cannot destroy container
To avoid this failure, enable both deferred device deletion and deferred
device removal on the daemon.
`docker daemon --storage-opt dm.use_deferred_deletion=true --storage-opt dm.use_deferred_removal=true`
$ docker daemon \
--storage-opt dm.use_deferred_deletion=true \
--storage-opt dm.use_deferred_removal=true
With these two options enabled, if a device is busy when the driver is
deleting a container, the driver marks the device as deleted. Later, when