diff --git a/cli/command/container/list.go b/cli/command/container/list.go index 3571954b5..471e4e1c4 100644 --- a/cli/command/container/list.go +++ b/cli/command/container/list.go @@ -120,6 +120,8 @@ func runPs(dockerCli command.Cli, options *psOptions) error { if len(options.format) == 0 { // load custom psFormat from CLI config (if any) options.format = dockerCli.ConfigFile().PsFormat + } else if options.quiet { + _, _ = dockerCli.Err().Write([]byte("WARNING: Ignoring custom format, because both --format and --quiet are set.\n")) } listOptions, err := buildContainerListOptions(options) diff --git a/cli/command/container/list_test.go b/cli/command/container/list_test.go index a071b2e30..a00783775 100644 --- a/cli/command/container/list_test.go +++ b/cli/command/container/list_test.go @@ -324,6 +324,7 @@ func TestContainerListWithFormat(t *testing.T) { assert.Check(t, cmd.Flags().Set("format", "{{ .Names }} {{ .Image }} {{ .Labels }}")) assert.Check(t, cmd.Flags().Set("quiet", "true")) assert.NilError(t, cmd.Execute()) + assert.Equal(t, cli.ErrBuffer().String(), "WARNING: Ignoring custom format, because both --format and --quiet are set.\n") golden.Assert(t, cli.OutBuffer().String(), "container-list-quiet.golden") }) }