From 3ba3666c3a03e1bb9951dd05dafcc50d2ca8453d Mon Sep 17 00:00:00 2001 From: Alvin Deng Date: Wed, 19 Apr 2017 16:35:04 -0500 Subject: [PATCH 1/2] Add examples of storage-opts and log-opts for the daemon Signed-off-by: Alvin Deng Upstream-commit: c79bf50ba6cd68267f3d87f40dcd25167b750ea4 Component: engine --- .../docs/reference/commandline/dockerd.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/components/engine/docs/reference/commandline/dockerd.md b/components/engine/docs/reference/commandline/dockerd.md index c9fceba7b3..b523a1aaa8 100644 --- a/components/engine/docs/reference/commandline/dockerd.md +++ b/components/engine/docs/reference/commandline/dockerd.md @@ -302,6 +302,24 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`. #### Devicemapper options +This is an example of the configuration file for devicemapper on Linux: + +```json +{ + "storage-driver": "devicemapper", + "storage-opts": [ + "dm.thinpooldev=/dev/mapper/thin-pool", + "dm.use_deferred_deletion=true", + "dm.use_deferred_removal=true" + ], + "log-driver": "json-file", + "log-opts": { + "max-size": "10m", + "max-file": "10" + } +} +``` + ##### `dm.thinpooldev` Specifies a custom block storage device to use for the thin pool. From a4980cfd507695a8fe62221aa76ade1333b23487 Mon Sep 17 00:00:00 2001 From: Alvin Deng Date: Thu, 20 Apr 2017 21:26:12 -0500 Subject: [PATCH 2/2] Update dockerd.md Signed-off-by: Alvin Deng Upstream-commit: 427a521b025afaa967c701e234f5366cc633cf77 Component: engine --- components/engine/docs/reference/commandline/dockerd.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/components/engine/docs/reference/commandline/dockerd.md b/components/engine/docs/reference/commandline/dockerd.md index b523a1aaa8..1fc3ee196f 100644 --- a/components/engine/docs/reference/commandline/dockerd.md +++ b/components/engine/docs/reference/commandline/dockerd.md @@ -311,12 +311,7 @@ This is an example of the configuration file for devicemapper on Linux: "dm.thinpooldev=/dev/mapper/thin-pool", "dm.use_deferred_deletion=true", "dm.use_deferred_removal=true" - ], - "log-driver": "json-file", - "log-opts": { - "max-size": "10m", - "max-file": "10" - } + ] } ```