From 29a1f258f82e4666855c80b7a28c560634a43c6f Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 2 Aug 2017 15:11:19 -0700 Subject: [PATCH] Link to storage options from each driver's page (#4080) --- engine/userguide/storagedriver/btrfs-driver.md | 5 +++++ .../storagedriver/device-mapper-driver.md | 14 ++++++++++++-- engine/userguide/storagedriver/overlayfs-driver.md | 9 +++++++-- engine/userguide/storagedriver/zfs-driver.md | 5 +++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/engine/userguide/storagedriver/btrfs-driver.md b/engine/userguide/storagedriver/btrfs-driver.md index 27a186b2de..cda9d25e6c 100644 --- a/engine/userguide/storagedriver/btrfs-driver.md +++ b/engine/userguide/storagedriver/btrfs-driver.md @@ -110,6 +110,11 @@ This procedure is essentially identical on SLES and Ubuntu. } ``` + See all storage options for each storage driver: + + - [Stable](/engine/reference/commandline/dockerd.md#storage-driver-options) + - [Edge](/edge/engine/reference/commandline/dockerd.md#storage-driver-options) + 7. Start Docker. After it is running, verify that `btrfs` is being used as the storage driver. diff --git a/engine/userguide/storagedriver/device-mapper-driver.md b/engine/userguide/storagedriver/device-mapper-driver.md index 64bef55c2d..686c8e8743 100644 --- a/engine/userguide/storagedriver/device-mapper-driver.md +++ b/engine/userguide/storagedriver/device-mapper-driver.md @@ -68,6 +68,11 @@ For production systems, see } ``` + See all storage options for each storage driver: + + - [Stable](/engine/reference/commandline/dockerd.md#storage-driver-options) + - [Edge](/edge/engine/reference/commandline/dockerd.md#storage-driver-options) + Docker will not start if the `daemon.json` file contains badly-formed JSON. 3. Start Docker. @@ -147,7 +152,7 @@ manually](#configure-direct-lvm-mode-manually) instead. The following new configuration options have been added: | Option | Description | Required? | Default | Example | -| --- | --- | --- | --- | --- | +|:--------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------|:--------|:-----------------------------------| | `dm.directlvm_device` | The path to the block device to configure for `direct-lvm`. | Yes | | `dm.directlvm_device="/dev/xvdf"` | | `dm.thinp_percent` | The percentage of space to use for storage from the passed in block device. | No | 95 | `dm.thinp_percent=95` | | `dm.thinp_metapercent` | The percentage of space to for metadata storage from the passed=in block device. | No | 1 | `dm.thinp_metapercent=1` | @@ -168,11 +173,16 @@ options in the table above. "dm.thinp_metapercent=1", "dm.thinp_autoextend_threshold=80", "dm.thinp_autoextend_percent=20", - "dm.directlvm_device_force=false" + "dm.directlvm_device_force=false" ] } ``` +See all storage options for each storage driver: + +- [Stable](/engine/reference/commandline/dockerd.md#storage-driver-options) +- [Edge](/edge/engine/reference/commandline/dockerd.md#storage-driver-options) + Restart Docker for the changes to take effect. Docker invokes the commands to configure the block device for you. diff --git a/engine/userguide/storagedriver/overlayfs-driver.md b/engine/userguide/storagedriver/overlayfs-driver.md index 3d8fd1f076..0b96be9ed2 100644 --- a/engine/userguide/storagedriver/overlayfs-driver.md +++ b/engine/userguide/storagedriver/overlayfs-driver.md @@ -92,6 +92,11 @@ Before following this procedure, you must first meet all the } ``` + See all storage options for each storage driver: + + - [Stable](/engine/reference/commandline/dockerd.md#storage-driver-options) + - [Edge](/edge/engine/reference/commandline/dockerd.md#storage-driver-options) + Docker will not start if the `daemon.json` file contains badly-formed JSON. 5. Start Docker. @@ -493,8 +498,8 @@ filesystems: descriptors refer to different files. The `fd1` continues to reference the file in the image (`lowerdir`) and the `fd2` references the file in the container (`upperdir`). A workaround for this is to `touch` the files which causes the - copy-up operation to happen. All subsequent `open(2)` operations regardless of - read-only or read-write access mode will be referencing the file in the + copy-up operation to happen. All subsequent `open(2)` operations regardless of + read-only or read-write access mode will be referencing the file in the container (`upperdir`). `yum` is known to be affected unless the `yum-plugin-ovl` package is installed. diff --git a/engine/userguide/storagedriver/zfs-driver.md b/engine/userguide/storagedriver/zfs-driver.md index cf0d09f5ad..62f95aadf8 100644 --- a/engine/userguide/storagedriver/zfs-driver.md +++ b/engine/userguide/storagedriver/zfs-driver.md @@ -134,6 +134,11 @@ Edit `/etc/docker/daemon.json` and add the following: } ``` +See all storage options for each storage driver: + +- [Stable](/engine/reference/commandline/dockerd.md#storage-driver-options) +- [Edge](/edge/engine/reference/commandline/dockerd.md#storage-driver-options) + Save and close the file, and restart Docker. ## How the `zfs` storage driver works