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

Merge pull request #30291 from yongtang/30279-ps-format 

Fix failure in `docker ps --format` when `.Label` has args
This commit is contained in:
Victor Vieux 2017-01-24 17:55:52 -08:00 committed by GitHub
parent 42de89bf31 a2afbcbb57
commit d62ccd9907
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/container/list.go
View File

@ -73,6 +73,12 @@ func (o listOptionsProcessor) Size() bool {
return true return true
} }
// Label is needed here as it allows the correct pre-processing
// because Label() is a method with arguments
func (o listOptionsProcessor) Label(name string) string {
return ""
}
func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, error) { func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, error) {
options := &types.ContainerListOptions{ options := &types.ContainerListOptions{
All: opts.all, All: opts.all,