summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2016-07-18 00:35:56 -0700
committerGitHub <noreply@github.com>2016-07-18 00:35:56 -0700
commitca1aeeed5c36b2ee06b90638fb45b01f1bedccb7 (patch)
tree99806947dc09850a628fab4564dd2952e58d9d6b
parent913e58beeac56e4d904f1c53474c456c55106e49 (diff)
parenta82b1f41f7329287ca48c7c68090e16c0d50b53e (diff)
Merge pull request #28766 from lixiaobing10051267/masterOverlayId
Automatic merge from submit-queue Doc referrence "container-id" incorrect File "docs\proposals\disk-accounting.md", line 154, "Everything under `/var/lib/docker/overlay/<container-id>` are files required for running the container", here "container-id" is incorrect because files under "/var/lib/docker/overlay" are layer files, and "container-id" should be "id" thus consistent with line 148 "Image layers and writable layers are stored under `/var/lib/docker/overlay/<id>`".
-rwxr-xr-x[-rw-r--r--]disk-accounting.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/disk-accounting.md b/disk-accounting.md
index d0fbadec..2c71c4c8 100644..100755
--- a/disk-accounting.md
+++ b/disk-accounting.md
@@ -151,7 +151,7 @@ Identical files are hardlinked between images.
The image layers contain all their data under a `root` subdirectory.
-Everything under `/var/lib/docker/overlay/<container-id>` are files required for running the container, including its writable layer.
+Everything under `/var/lib/docker/overlay/<id>` are files required for running the container, including its writable layer.
### Improve disk accounting