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

Update integration tests when container and image have same name 

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
This commit is contained in:
Wen Cheng Ma 2015-12-28 16:29:39 +08:00 committed by Tibor Vass
parent b87dd1342f
commit 6bfda2dbbc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/commandline/inspect.md
View File

@ -20,8 +20,9 @@ parent = "smn_cli"
values are "image" or "container" values are "image" or "container"
-s, --size Display total file sizes if the type is 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 By default, this will render all results in a JSON array. If the container and
specified, the given template will be executed for each result. 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 Go's [text/template](http://golang.org/pkg/text/template/) package
describes all the details of the format. describes all the details of the format.

5
man/docker-inspect.1.md
View File

@ -16,8 +16,9 @@ CONTAINER|IMAGE [CONTAINER|IMAGE...]
This displays all the information available in Docker for a given This displays all the information available in Docker for a given
container or image. By default, this will render all results in a JSON 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 array. If the container and image have the same name, this will return
each result. container JSON for unspecified type. If a format is specified, the given
template will be executed for each result.
# OPTIONS # OPTIONS
**--help** **--help**