From 6bfda2dbbcb7d60b672ee727dc219f66803611a8 Mon Sep 17 00:00:00 2001 From: Wen Cheng Ma Date: Mon, 28 Dec 2015 16:29:39 +0800 Subject: [PATCH] Update integration tests when container and image have same name Signed-off-by: Wen Cheng Ma --- docs/reference/commandline/inspect.md | 5 +++-- man/docker-inspect.1.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md index 434f98989f..995388c8f1 100644 --- a/docs/reference/commandline/inspect.md +++ b/docs/reference/commandline/inspect.md @@ -20,8 +20,9 @@ parent = "smn_cli" values are "image" or "container" -s, --size Display total file sizes if the type is container -By default, this will render all results in a JSON array. If a format is -specified, the given template will be executed for each result. +By default, this will render all results in a JSON array. If the container and +image have the same name, this will return container JSON for unspecified type. +If a format is specified, the given template will be executed for each result. Go's [text/template](http://golang.org/pkg/text/template/) package describes all the details of the format. diff --git a/man/docker-inspect.1.md b/man/docker-inspect.1.md index 81f48ceedf..9babd569ac 100644 --- a/man/docker-inspect.1.md +++ b/man/docker-inspect.1.md @@ -16,8 +16,9 @@ CONTAINER|IMAGE [CONTAINER|IMAGE...] This displays all the information available in Docker for a given container or image. By default, this will render all results in a JSON -array. If a format is specified, the given template will be executed for -each result. +array. If the container and image have the same name, this will return +container JSON for unspecified type. If a format is specified, the given +template will be executed for each result. # OPTIONS **--help**