Merge pull request #2936 from silvin-lubecki/format-json

Add --format=json to inspect and list commands

cli/command/config/inspect.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +31,7 @@ func newConfigInspectCommand(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.Format, "format", "f", "", "Format the output using the given Go template")
+	cmd.Flags().StringVarP(&opts.Format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	cmd.Flags().BoolVar(&opts.Pretty, "pretty", false, "Print the information in a human friendly format")
 	return cmd
 }

cli/command/config/ls.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/fvbommel/sortorder"
@@ -35,7 +36,7 @@ func newConfigListCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&listOpts.Quiet, "quiet", "q", false, "Only display IDs")
-	flags.StringVarP(&listOpts.Format, "format", "", "", "Pretty-print configs using a Go template")
+	flags.StringVarP(&listOpts.Format, "format", "", "", flagsHelper.FormatHelp)
 	flags.VarP(&listOpts.Filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd

cli/command/container/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +31,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes")
 
 	return cmd

cli/command/container/list.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/cli/templates"
 	"github.com/docker/docker/api/types"
@@ -46,7 +47,7 @@ func NewPsCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVar(&options.noTrunc, "no-trunc", false, "Don't truncate output")
 	flags.BoolVarP(&options.nLatest, "latest", "l", false, "Show the latest created container (includes all states)")
 	flags.IntVarP(&options.last, "last", "n", -1, "Show n last created containers (includes all states)")
-	flags.StringVarP(&options.format, "format", "", "", "Pretty-print containers using a Go template")
+	flags.StringVarP(&options.format, "format", "", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd
@@ -80,7 +81,6 @@ func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, er
 		// Only requesting container size information when needed is an optimization,
 		// because calculating the size is a costly operation.
 		tmpl, err := templates.NewParse("", opts.format)
-
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to parse template")
 		}

cli/command/container/stats.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
@@ -44,7 +45,7 @@ func NewStatsCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVarP(&opts.all, "all", "a", false, "Show all containers (default shows just running)")
 	flags.BoolVar(&opts.noStream, "no-stream", false, "Disable streaming stats and only pull the first result")
 	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print images using a Go template")
+	flags.StringVar(&opts.format, "format", "", flagsHelper.FormatHelp)
 	return cmd
 }
 

cli/command/context/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
 	"github.com/docker/cli/cli/context/store"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +35,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	return cmd
 }
 

cli/command/context/list.go

@@ -9,6 +9,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/context/docker"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
 )
@@ -31,7 +32,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVar(&opts.format, "format", "", "Pretty-print contexts using a Go template")
+	flags.StringVar(&opts.format, "format", "", flagsHelper.FormatHelp)
 	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only show context names")
 	return cmd
 }

cli/command/formatter/formatter.go

@@ -16,8 +16,10 @@ const (
 	TableFormatKey  = "table"
 	RawFormatKey    = "raw"
 	PrettyFormatKey = "pretty"
+	JSONFormatKey   = "json"
 
 	DefaultQuietFormat = "{{.ID}}"
+	jsonFormat         = "{{json .}}"
 )
 
 // Format is the format string rendered using the Context
@@ -28,6 +30,11 @@ func (f Format) IsTable() bool {
 	return strings.HasPrefix(string(f), TableFormatKey)
 }
 
+// IsJSON returns true if the format is the json format
+func (f Format) IsJSON() bool {
+	return string(f) == JSONFormatKey
+}
+
 // Contains returns true if the format contains the substring
 func (f Format) Contains(sub string) bool {
 	return strings.Contains(string(f), sub)
@@ -50,10 +57,12 @@ type Context struct {
 
 func (c *Context) preFormat() {
 	c.finalFormat = string(c.Format)
-
 	// TODO: handle this in the Format type
-	if c.Format.IsTable() {
+	switch {
+	case c.Format.IsTable():
 		c.finalFormat = c.finalFormat[len(TableFormatKey):]
+	case c.Format.IsJSON():
+		c.finalFormat = jsonFormat
 	}
 
 	c.finalFormat = strings.Trim(c.finalFormat, " ")

cli/command/formatter/formatter_test.go

@@ -0,0 +1,68 @@
+package formatter
+
+import (
+	"bytes"
+	"testing"
+
+	"gotest.tools/v3/assert"
+)
+
+func TestFormat(t *testing.T) {
+	f := Format("json")
+	assert.Assert(t, f.IsJSON())
+	assert.Assert(t, !f.IsTable())
+
+	f = Format("table")
+	assert.Assert(t, !f.IsJSON())
+	assert.Assert(t, f.IsTable())
+
+	f = Format("other")
+	assert.Assert(t, !f.IsJSON())
+	assert.Assert(t, !f.IsTable())
+}
+
+type fakeSubContext struct {
+	Name string
+}
+
+func (f fakeSubContext) FullHeader() interface{} {
+	return map[string]string{"Name": "NAME"}
+}
+
+func TestContext(t *testing.T) {
+	testCases := []struct {
+		name     string
+		format   string
+		expected string
+	}{
+		{
+			name:   "json format",
+			format: JSONFormatKey,
+			expected: `{"Name":"test"}
+`,
+		},
+		{
+			name:   "table format",
+			format: `table {{.Name}}`,
+			expected: `NAME
+test
+`,
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			buf := bytes.NewBuffer(nil)
+			ctx := Context{
+				Format: Format(tc.format),
+				Output: buf,
+			}
+			subContext := fakeSubContext{Name: "test"}
+			subFormat := func(f func(sub SubContext) error) error {
+				return f(subContext)
+			}
+			err := ctx.Write(&subContext, subFormat)
+			assert.NilError(t, err)
+			assert.Equal(t, buf.String(), tc.expected)
+		})
+	}
+}

cli/command/image/history.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -37,7 +38,7 @@ func NewHistoryCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVarP(&opts.human, "human", "H", true, "Print sizes and dates in human readable format")
 	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only show image IDs")
 	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print images using a Go template")
+	flags.StringVar(&opts.format, "format", "", flagsHelper.FormatHelp)
 
 	return cmd
 }

cli/command/image/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -29,7 +30,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	return cmd
 }
 

cli/command/image/list.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
@@ -44,7 +45,7 @@ func NewImagesCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVarP(&options.all, "all", "a", false, "Show all images (default hides intermediate images)")
 	flags.BoolVar(&options.noTrunc, "no-trunc", false, "Don't truncate output")
 	flags.BoolVar(&options.showDigests, "digests", false, "Show digests")
-	flags.StringVar(&options.format, "format", "", "Pretty-print images using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd

cli/command/inspect/inspector.go

@@ -15,7 +15,9 @@ import (
 
 // Inspector defines an interface to implement to process elements
 type Inspector interface {
+	// Inspect writes the raw element in JSON format.
 	Inspect(typedElement interface{}, rawElement []byte) error
+	// Flush writes the result of inspecting all elements into the output stream.
 	Flush() error
 }
 
@@ -42,6 +44,10 @@ func NewTemplateInspectorFromString(out io.Writer, tmplStr string) (Inspector, e
 		return NewIndentedInspector(out), nil
 	}
 
+	if tmplStr == "json" {
+		return NewJSONInspector(out), nil
+	}
+
 	tmpl, err := templates.Parse(tmplStr)
 	if err != nil {
 		return nil, errors.Errorf("Template parsing error: %s", err)
@@ -136,64 +142,80 @@ func (i *TemplateInspector) Flush() error {
 	return err
 }
 
-// IndentedInspector uses a buffer to stop the indented representation of an element.
+// NewIndentedInspector generates a new inspector with an indented representation
-type IndentedInspector struct {
+// of elements.
-	outputStream io.Writer
-	elements     []interface{}
-	rawElements  [][]byte
-}
-
-// NewIndentedInspector generates a new IndentedInspector.
 func NewIndentedInspector(outputStream io.Writer) Inspector {
-	return &IndentedInspector{
+	return &elementsInspector{
 		outputStream: outputStream,
+		raw: func(dst *bytes.Buffer, src []byte) error {
+			return json.Indent(dst, src, "", "    ")
+		},
+		el: func(v interface{}) ([]byte, error) {
+			return json.MarshalIndent(v, "", "    ")
+		},
 	}
 }
 
-// Inspect writes the raw element with an indented json format.
+// NewJSONInspector generates a new inspector with a compact representation
-func (i *IndentedInspector) Inspect(typedElement interface{}, rawElement []byte) error {
+// of elements.
+func NewJSONInspector(outputStream io.Writer) Inspector {
+	return &elementsInspector{
+		outputStream: outputStream,
+		raw:          json.Compact,
+		el:           json.Marshal,
+	}
+}
+
+type elementsInspector struct {
+	outputStream io.Writer
+	elements     []interface{}
+	rawElements  [][]byte
+	raw          func(dst *bytes.Buffer, src []byte) error
+	el           func(v interface{}) ([]byte, error)
+}
+
+func (e *elementsInspector) Inspect(typedElement interface{}, rawElement []byte) error {
 	if rawElement != nil {
-		i.rawElements = append(i.rawElements, rawElement)
+		e.rawElements = append(e.rawElements, rawElement)
 	} else {
-		i.elements = append(i.elements, typedElement)
+		e.elements = append(e.elements, typedElement)
 	}
 	return nil
 }
 
-// Flush writes the result of inspecting all elements into the output stream.
+func (e *elementsInspector) Flush() error {
-func (i *IndentedInspector) Flush() error {
+	if len(e.elements) == 0 && len(e.rawElements) == 0 {
-	if len(i.elements) == 0 && len(i.rawElements) == 0 {
+		_, err := io.WriteString(e.outputStream, "[]\n")
-		_, err := io.WriteString(i.outputStream, "[]\n")
 		return err
 	}
 
 	var buffer io.Reader
-	if len(i.rawElements) > 0 {
+	if len(e.rawElements) > 0 {
 		bytesBuffer := new(bytes.Buffer)
 		bytesBuffer.WriteString("[")
-		for idx, r := range i.rawElements {
+		for idx, r := range e.rawElements {
 			bytesBuffer.Write(r)
-			if idx < len(i.rawElements)-1 {
+			if idx < len(e.rawElements)-1 {
 				bytesBuffer.WriteString(",")
 			}
 		}
 		bytesBuffer.WriteString("]")
-		indented := new(bytes.Buffer)
+		output := new(bytes.Buffer)
-		if err := json.Indent(indented, bytesBuffer.Bytes(), "", "    "); err != nil {
+		if err := e.raw(output, bytesBuffer.Bytes()); err != nil {
 			return err
 		}
-		buffer = indented
+		buffer = output
 	} else {
-		b, err := json.MarshalIndent(i.elements, "", "    ")
+		b, err := e.el(e.elements)
 		if err != nil {
 			return err
 		}
 		buffer = bytes.NewReader(b)
 	}
 
-	if _, err := io.Copy(i.outputStream, buffer); err != nil {
+	if _, err := io.Copy(e.outputStream, buffer); err != nil {
 		return err
 	}
-	_, err := io.WriteString(i.outputStream, "\n")
+	_, err := io.WriteString(e.outputStream, "\n")
 	return err
 }

cli/command/inspect/inspector_test.go

@@ -257,3 +257,53 @@ func TestTemplateInspectorRawFallbackNumber(t *testing.T) {
 		b.Reset()
 	}
 }
+
+func TestNewTemplateInspectorFromString(t *testing.T) {
+	testCases := []struct {
+		name     string
+		template string
+		expected string
+	}{
+		{
+			name:     "empty template outputs json by default",
+			template: "",
+			expected: `[
+    {
+        "Name": "test"
+    }
+]
+`,
+		},
+		{
+			name:     "json specific value outputs json",
+			template: "json",
+			expected: `[{"Name":"test"}]
+`,
+		},
+		{
+			name:     "template is applied",
+			template: "{{.Name}}",
+			expected: "test\n",
+		},
+	}
+	value := struct {
+		Name string
+	}{
+		"test",
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			b := new(bytes.Buffer)
+			i, err := NewTemplateInspectorFromString(b, tc.template)
+			assert.NilError(t, err)
+
+			err = i.Inspect(value, nil)
+			assert.NilError(t, err)
+
+			err = i.Flush()
+			assert.NilError(t, err)
+
+			assert.Equal(t, b.String(), tc.expected)
+		})
+	}
+}

cli/command/network/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )
@@ -29,7 +30,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	cmd.Flags().StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	cmd.Flags().BoolVarP(&opts.verbose, "verbose", "v", false, "Verbose output for diagnostics")
 
 	return cmd

cli/command/network/list.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/fvbommel/sortorder"
@@ -36,7 +37,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	flags := cmd.Flags()
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display network IDs")
 	flags.BoolVar(&options.noTrunc, "no-trunc", false, "Do not truncate the output")
-	flags.StringVar(&options.format, "format", "", "Pretty-print networks using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Provide filter values (e.g. 'driver=bridge')")
 
 	return cmd

cli/command/node/inspect.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -31,7 +32,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format")
 	return cmd
 }

cli/command/node/list.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/fvbommel/sortorder"
@@ -33,7 +34,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display IDs")
-	flags.StringVar(&options.format, "format", "", "Pretty-print nodes using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd

cli/command/plugin/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +29,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	return cmd
 }
 

cli/command/plugin/list.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
@@ -36,7 +37,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display plugin IDs")
 	flags.BoolVar(&options.noTrunc, "no-trunc", false, "Don't truncate output")
-	flags.StringVar(&options.format, "format", "", "Pretty-print plugins using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Provide filter values (e.g. 'enabled=true')")
 
 	return cmd

cli/command/secret/inspect.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -29,7 +30,7 @@ func newSecretInspectCommand(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	cmd.Flags().StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	cmd.Flags().BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format")
 	return cmd
 }

cli/command/secret/ls.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/fvbommel/sortorder"
@@ -34,7 +35,7 @@ func newSecretListCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display IDs")
-	flags.StringVarP(&options.format, "format", "", "", "Pretty-print secrets using a Go template")
+	flags.StringVarP(&options.format, "format", "", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd

cli/command/service/inspect.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	apiclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
@@ -37,7 +38,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format")
 	return cmd
 }

cli/command/service/list.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
@@ -35,7 +36,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display IDs")
-	flags.StringVar(&options.format, "format", "", "Pretty-print services using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
 
 	return cmd

cli/command/stack/list.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli/command/stack/formatter"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/cli/cli/command/stack/swarm"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
 )
@@ -26,7 +27,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVar(&opts.Format, "format", "", "Pretty-print stacks using a Go template")
+	flags.StringVar(&opts.Format, "format", "", flagsHelper.FormatHelp)
 	return cmd
 }
 

cli/command/stack/ps.go

@@ -5,6 +5,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/cli/cli/command/stack/swarm"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -30,7 +31,7 @@ func newPsCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVar(&opts.NoResolve, "no-resolve", false, "Do not map IDs to Names")
 	flags.VarP(&opts.Filter, "filter", "f", "Filter output based on conditions provided")
 	flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display task IDs")
-	flags.StringVar(&opts.Format, "format", "", "Pretty-print tasks using a Go template")
+	flags.StringVar(&opts.Format, "format", "", flagsHelper.FormatHelp)
 	return cmd
 }
 

cli/command/stack/services.go

@@ -10,6 +10,7 @@ import (
 	"github.com/docker/cli/cli/command/stack/formatter"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/cli/cli/command/stack/swarm"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	cliopts "github.com/docker/cli/opts"
 	swarmtypes "github.com/docker/docker/api/types/swarm"
 	"github.com/fvbommel/sortorder"
@@ -34,7 +35,7 @@ func newServicesCommand(dockerCli command.Cli) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display IDs")
-	flags.StringVar(&opts.Format, "format", "", "Pretty-print services using a Go template")
+	flags.StringVar(&opts.Format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&opts.Filter, "filter", "f", "Filter output based on conditions provided")
 	return cmd
 }

cli/command/system/df.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +33,7 @@ func newDiskUsageCommand(dockerCli command.Cli) *cobra.Command {
 	flags := cmd.Flags()
 
 	flags.BoolVarP(&opts.verbose, "verbose", "v", false, "Show detailed information on space usage")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print images using a Go template")
+	flags.StringVar(&opts.format, "format", "", flagsHelper.FormatHelp)
 
 	return cmd
 }

cli/command/system/inspect.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	apiclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
@@ -36,7 +37,7 @@ func NewInspectCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	flags.StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 	flags.StringVar(&opts.inspectType, "type", "", "Return JSON for specified type")
 	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes if the type is container")
 

cli/command/volume/inspect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/inspect"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +28,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
+	cmd.Flags().StringVarP(&opts.format, "format", "f", "", flagsHelper.InspectFormatHelp)
 
 	return cmd
 }

cli/command/volume/list.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	flagsHelper "github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/opts"
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
@@ -33,7 +34,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display volume names")
-	flags.StringVar(&options.format, "format", "", "Pretty-print volumes using a Go template")
+	flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
 	flags.VarP(&options.filter, "filter", "f", "Provide filter values (e.g. 'dangling=true')")
 
 	return cmd

cli/flags/common.go

@@ -21,6 +21,18 @@ const (
 	DefaultCertFile = "cert.pem"
 	// FlagTLSVerify is the flag name for the TLS verification option
 	FlagTLSVerify = "tlsverify"
+	// FormatHelp describes the --format flag behavior for list commands
+	FormatHelp = `Format output using a custom template:
+'table':            Print output in table format with column headers (default)
+'table TEMPLATE':   Print output in table format using the given Go template
+'json':             Print in JSON format
+'TEMPLATE':         Print output using the given Go template.
+Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates`
+	// InspectFormatHelp describes the --format flag behavior for inspect commands
+	InspectFormatHelp = `Format output using a custom template:
+'json':             Print in JSON format
+'TEMPLATE':         Print output using the given Go template.
+Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates`
 )
 
 var (

contrib/completion/fish/docker.fish

@@ -307,7 +307,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_pri
 
 # history
 complete -c docker -f -n '__fish_docker_no_subcommand' -a history -d 'Show the history of an image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l format -d 'Pretty-print images using a Go template'
+complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l format -d 'Format the output using the given Go template'
 complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l help -d 'Print usage'
 complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s H -l human -d 'Print sizes and dates in human readable format'
 complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l no-trunc -d "Don't truncate output"
@@ -319,7 +319,7 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -a images -d 'List images
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (default hides intermediate images)'
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l digests -d 'Show digests'
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d 'Filter output based on conditions provided'
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l format -d 'Pretty-print images using a Go template'
+complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l format -d 'Format the output using the given Go template'
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l help -d 'Print usage'
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l no-trunc -d "Don't truncate output"
 complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s q -l quiet -d 'Only show image IDs'

contrib/completion/zsh/_docker

@@ -803,7 +803,7 @@ __docker_container_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all containers]" \
                 "($help)--before=[Show only container created before...]:containers:__docker_complete_containers" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
-                "($help)--format=[Pretty-print containers using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
                 "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
                 "($help)--no-trunc[Do not truncate output]" \
@@ -908,7 +908,7 @@ __docker_container_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help)--no-stream[Disable streaming stats and only pull the first result]" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -)*:containers:__docker_complete_running_containers" && ret=0
@@ -1061,7 +1061,7 @@ __docker_image_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all images]" \
                 "($help)--digests[Show digests]" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_images_filters" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show image IDs]" \
                 "($help -): :__docker_complete_repositories" && ret=0
@@ -1293,7 +1293,7 @@ __docker_network_subcommand() {
                 $opts_help \
                 "($help)--no-trunc[Do not truncate the output]" \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_network_complete_ls_filters" \
-                "($help)--format=[Pretty-print networks using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display network IDs]" && ret=0
             ;;
         (prune)
@@ -2051,7 +2051,7 @@ __docker_service_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_service_complete_ls_filters" \
-                "($help)--format=[Pretty-print services using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
             ;;
         (rm|remove)
@@ -2254,7 +2254,7 @@ __docker_stack_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \
-                "($help)--format=[Pretty-print services using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
                 "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
@@ -2521,7 +2521,7 @@ __docker_volume_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_volume_complete_ls_filters" \
-                "($help)--format=[Pretty-print volumes using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display volume names]" && ret=0
             ;;
         (prune)

docs/reference/commandline/config_inspect.md

@@ -12,7 +12,11 @@ Usage:  docker config inspect [OPTIONS] CONFIG [CONFIG...]
 Display detailed information on one or more configs
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
+      --pretty          Print the information in a human friendly format
       --help            Print usage
 ```
 

docs/reference/commandline/context_inspect.md

@@ -12,7 +12,10 @@ Usage:  docker context inspect [OPTIONS] [CONTEXT] [CONTEXT...]
 Display detailed information on one or more contexts
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
 ```
 
 ## Description

docs/reference/commandline/context_ls.md

@@ -15,8 +15,12 @@ Aliases:
   ls, list
 
 Options:
-      --format string   Pretty-print contexts using a Go template
+      --format string   Format output using a custom template:
-                        (default "table")
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
   -q, --quiet           Only show context names
 ```
 

docs/reference/commandline/images.md

@@ -20,7 +20,12 @@ Options:
                         - before=(<image-name>[:tag]|<image-id>|<image@digest>)
                         - since=(<image-name>[:tag]|<image-id>|<image@digest>)
                         - reference=(pattern of an image reference)
-      --format string   Pretty-print images using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
       --no-trunc        Don't truncate output
   -q, --quiet           Only show image IDs
@@ -341,3 +346,11 @@ b6fa739cedf5        committ                   latest
 746b819f315e        postgres                  9.3.5
 746b819f315e        postgres                  latest
 ```
+
+To list all images in JSON format, use the `json` directive:
+
+```console
+$ docker images --format json
+{"Containers":"N/A","CreatedAt":"2021-03-04 03:24:42 +0100 CET","CreatedSince":"5 days ago","Digest":"\u003cnone\u003e","ID":"4dd97cefde62","Repository":"ubuntu","SharedSize":"N/A","Size":"72.9MB","Tag":"latest","UniqueSize":"N/A","VirtualSize":"72.9MB"}
+{"Containers":"N/A","CreatedAt":"2021-02-17 22:19:54 +0100 CET","CreatedSince":"2 weeks ago","Digest":"\u003cnone\u003e","ID":"28f6e2705743","Repository":"alpine","SharedSize":"N/A","Size":"5.61MB","Tag":"latest","UniqueSize":"N/A","VirtualSize":"5.613MB"}
+```

docs/reference/commandline/network_inspect.md

@@ -12,7 +12,11 @@ Usage:  docker network inspect [OPTIONS] NETWORK [NETWORK...]
 Display detailed information on one or more networks
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
+  -v, --verbose         Verbose output for diagnostics
       --help            Print usage
 ```
 

docs/reference/commandline/network_ls.md

@@ -16,7 +16,12 @@ Aliases:
 
 Options:
   -f, --filter filter   Provide filter values (e.g. 'driver=bridge')
-      --format string   Pretty-print networks using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
       --no-trunc        Do not truncate the output
   -q, --quiet           Only display network IDs
@@ -230,6 +235,15 @@ d1584f8dc718: host
 391df270dc66: null
 ```
 
+To list all networks in JSON format, use the `json` directive:
+
+```console
+$ docker network ls --format json
+{"CreatedAt":"2021-03-09 21:41:29.798999529 +0000 UTC","Driver":"bridge","ID":"f33ba176dd8e","IPv6":"false","Internal":"false","Labels":"","Name":"bridge","Scope":"local"}
+{"CreatedAt":"2021-03-09 21:41:29.772806592 +0000 UTC","Driver":"host","ID":"caf47bb3ac70","IPv6":"false","Internal":"false","Labels":"","Name":"host","Scope":"local"}
+{"CreatedAt":"2021-03-09 21:41:29.752212603 +0000 UTC","Driver":"null","ID":"9d096c122066","IPv6":"false","Internal":"false","Labels":"","Name":"none","Scope":"local"}
+```
+
 ## Related commands
 
 * [network disconnect ](network_disconnect.md)

docs/reference/commandline/node_inspect.md

@@ -12,9 +12,12 @@ Usage:  docker node inspect [OPTIONS] self|NODE [NODE...]
 Display detailed information on one or more nodes
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
-      --help            Print usage
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --pretty          Print the information in a human friendly format
+      --help            Print usage
 ```
 
 ## Description

docs/reference/commandline/node_ls.md

@@ -16,7 +16,12 @@ Aliases:
 
 Options:
   -f, --filter filter   Filter output based on conditions provided
-      --format string   Pretty-print nodes using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
   -q, --quiet           Only display IDs
 ```
@@ -203,6 +208,11 @@ e216jshn25ckzbvmwlnh5jr3g: swarm-manager1 Ready
 35o6tiywb700jesrt3dmllaza: swarm-worker1 Needs Rotation
 ```
 
+To list all nodes in JSON format, use the `json` directive:
+```console
+$ docker node ls --format json
+{"Availability":"Active","EngineVersion":"20.10.5","Hostname":"docker-desktop","ID":"k8f4w7qtzpj5sqzclcqafw35g","ManagerStatus":"Leader","Self":true,"Status":"Ready","TLSStatus":"Ready"}
+```
 
 ## Related commands
 

docs/reference/commandline/plugin_inspect.md

@@ -12,7 +12,10 @@ Usage:  docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...]
 Display detailed information on one or more plugins
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
 ```
 

docs/reference/commandline/plugin_ls.md

@@ -16,7 +16,12 @@ Aliases:
 
 Options:
   -f, --filter filter   Provide filter values (e.g. 'enabled=true')
-      --format string   Pretty-print plugins using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template. 
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
       --no-trunc        Don't truncate output
   -q, --quiet           Only display plugin IDs
@@ -96,6 +101,12 @@ $ docker plugin ls --format "{{.ID}}: {{.Name}}"
 4be01827a72e: vieux/sshfs:latest
 ```
 
+To list all plugins in JSON format, use the `json` directive:
+```console
+$ docker plugin ls --format json
+{"Description":"sshFS plugin for Docker","Enabled":false,"ID":"856d89febb1c","Name":"vieux/sshfs:latest","PluginReference":"docker.io/vieux/sshfs:latest"}
+```
+
 ## Related commands
 
 * [plugin create](plugin_create.md)

docs/reference/commandline/ps.md

@@ -30,7 +30,12 @@ Options:
                         - since=(<container-name>|<container-id>)
                         - status=(created|restarting|removing|running|paused|exited)
                         - volume=(<volume name>|<mount point destination>)
-      --format string   Pretty-print containers using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
   -n, --last int        Show n last created containers (includes all states) (default -1)
   -l, --latest          Show the latest created container (includes all states)
@@ -445,3 +450,9 @@ a87ecb4f327c        com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd
 c1d3b0166030        com.docker.swarm.node=debian,com.docker.swarm.cpu=6
 41d50ecd2f57        com.docker.swarm.node=fedora,com.docker.swarm.cpu=3,com.docker.swarm.storage=ssd
 ```
+
+To list all running containers in JSON format, use the `json` directive:
+```console
+$ docker ps --format json
+{"Command":"\"/docker-entrypoint.…\"","CreatedAt":"2021-03-10 00:15:05 +0100 CET","ID":"a762a2b37a1d","Image":"nginx","Labels":"maintainer=NGINX Docker Maintainers \u003cdocker-maint@nginx.com\u003e","LocalVolumes":"0","Mounts":"","Names":"boring_keldysh","Networks":"bridge","Ports":"80/tcp","RunningFor":"4 seconds ago","Size":"0B","State":"running","Status":"Up 3 seconds"}
+```

docs/reference/commandline/secret_inspect.md

@@ -12,7 +12,11 @@ Usage:  docker secret inspect [OPTIONS] SECRET [SECRET...]
 Display detailed information on one or more secrets
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
+      --pretty          Print the information in a human friendly format
       --help            Print usage
 ```
 

docs/reference/commandline/secret_ls.md

@@ -16,7 +16,13 @@ Aliases:
 
 Options:
   -f, --filter filter   Filter output based on conditions provided
-      --format string   Pretty-print secrets using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
+
       --help            Print usage
   -q, --quiet           Only display IDs
 ```
@@ -148,6 +154,12 @@ b6fa739cedf5        secret-2                  3 hours ago
 78a85c484f71        secret-3                  10 days ago
 ```
 
+To list all secrets in JSON format, use the `json` directive:
+```console
+$ docker secret ls --format json
+{"CreatedAt":"28 seconds ago","Driver":"","ID":"4y7hvwrt1u8e9uxh5ygqj7mzc","Labels":"","Name":"mysecret","UpdatedAt":"28 seconds ago"}
+```
+
 ## Related commands
 
 * [secret create](secret_create.md)

docs/reference/commandline/service_inspect.md

@@ -12,9 +12,12 @@ Usage:  docker service inspect [OPTIONS] SERVICE [SERVICE...]
 Display detailed information on one or more services
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
-      --help            Print usage
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --pretty          Print the information in a human friendly format
+      --help            Print usage
 ```
 
 ## Description

docs/reference/commandline/service_ls.md

@@ -16,7 +16,12 @@ Aliases:
 
 Options:
   -f, --filter filter   Filter output based on conditions provided
-      --format string   Pretty-print services using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
   -q, --quiet           Only display IDs
 ```
@@ -153,6 +158,12 @@ $ docker service ls --format "{{.ID}}: {{.Mode}} {{.Replicas}}"
 fm6uf97exkul: global 5/5
 ```
 
+To list all services in JSON format, use the `json` directive:
+```console
+$ docker service ls --format json
+{"ID":"ssniordqolsi","Image":"hello-world:latest","Mode":"replicated","Name":"hello","Ports":"","Replicas":"0/1"}
+```
+
 ## Related commands
 
 * [service create](service_create.md)

docs/reference/commandline/stack_ls.md

@@ -16,7 +16,12 @@ Aliases:
 
 Options:
       --help                  Print usage
-      --format string         Pretty-print stacks using a Go template
+      --format string         Format output using a custom template:
+                              'table':            Print output in table format with column headers (default)
+                              'table TEMPLATE':   Print output in table format using the given Go template
+                              'json':             Print in JSON format
+                              'TEMPLATE':         Print output using the given Go template.
+                              Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
 ```
 
 ## Description
@@ -68,6 +73,12 @@ web-server: 1
 web-cache: 4
 ```
 
+To list all stacks in JSON format, use the `json` directive:
+```console
+$ docker stack ls --format json
+{"Name":"myapp","Namespace":"","Orchestrator":"Swarm","Services":"3"}
+```
+
 ## Related commands
 
 * [stack deploy](stack_deploy.md)

docs/reference/commandline/stack_ps.md

@@ -13,7 +13,12 @@ List the tasks in the stack
 
 Options:
   -f, --filter filter         Filter output based on conditions provided
-      --format string         Pretty-print tasks using a Go template
+      --format string         Format output using a custom template:
+                              'table':            Print output in table format with column headers (default)
+                              'table TEMPLATE':   Print output in table format using the given Go template
+                              'json':             Print in JSON format
+                              'TEMPLATE':         Print output using the given Go template.
+                              Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help                  Print usage
       --no-resolve            Do not map IDs to Names
       --no-trunc              Do not truncate output
@@ -157,6 +162,14 @@ voting_vote.2: dockersamples/examplevotingapp_vote:before
 voting_redis.2: redis:alpine
 ```
 
+To list all tasks in JSON format, use the `json` directive:
+```console
+$ docker stack ps --format json myapp
+{"CurrentState":"Preparing 23 seconds ago","DesiredState":"Running","Error":"","ID":"2ufjubh79tn0","Image":"localstack/localstack:latest","Name":"myapp_localstack.1","Node":"docker-desktop","Ports":""}
+{"CurrentState":"Running 20 seconds ago","DesiredState":"Running","Error":"","ID":"roee387ngf5r","Image":"redis:6.0.9-alpine3.12","Name":"myapp_redis.1","Node":"docker-desktop","Ports":""}
+{"CurrentState":"Preparing 13 seconds ago","DesiredState":"Running","Error":"","ID":"yte68ouq7glh","Image":"postgres:13.2-alpine","Name":"myapp_repos-db.1","Node":"docker-desktop","Ports":""}
+```
+
 ### Do not map IDs to Names
 
 The `--no-resolve` option shows IDs for task name, without mapping IDs to Names.

docs/reference/commandline/stack_services.md

@@ -13,7 +13,12 @@ List the services in the stack
 
 Options:
   -f, --filter filter         Filter output based on conditions provided
-      --format string         Pretty-print services using a Go template
+      --format string         Format output using a custom template:
+                              'table':            Print output in table format with column headers (default)
+                              'table TEMPLATE':   Print output in table format using the given Go template
+                              'json':             Print in JSON format
+                              'TEMPLATE':         Print output using the given Go template.
+                              Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help                  Print usage
   -q, --quiet                 Only display IDs
 ```
@@ -98,6 +103,14 @@ $ docker stack services --format "{{.ID}}: {{.Mode}} {{.Replicas}}"
 fm6uf97exkul: global 5/5
 ```
 
+To list all services in JSON format, use the `json` directive:
+```console
+$ docker stack services ls --format json
+{"ID":"0axqbl293vwm","Image":"localstack/localstack:latest","Mode":"replicated","Name":"myapp_localstack","Ports":"*:4566-\u003e4566/tcp, *:8080-\u003e8080/tcp","Replicas":"0/1"}
+{"ID":"384xvtzigz3p","Image":"redis:6.0.9-alpine3.12","Mode":"replicated","Name":"myapp_redis","Ports":"*:6379-\u003e6379/tcp","Replicas":"1/1"}
+{"ID":"hyujct8cnjkk","Image":"postgres:13.2-alpine","Mode":"replicated","Name":"myapp_repos-db","Ports":"*:5432-\u003e5432/tcp","Replicas":"0/1"}
+```
+
 
 ## Related commands
 

docs/reference/commandline/system_df.md

@@ -12,7 +12,12 @@ Usage:  docker system df [OPTIONS]
 Show docker filesystem usage
 
 Options:
-      --format string   Pretty-print images using a Go template
+      --format string   Format output using a custom template:
+                        'table':            Print output in table format with column headers (default)
+                        'table TEMPLATE':   Print output in table format using the given Go template
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
   -v, --verbose         Show detailed information on space usage
 ```
@@ -122,6 +127,15 @@ Local Volumes       150.3 MB            150.3 MB (100%)
 <Paste>
 ```
 
+To list all information in JSON format, use the `json` directive:
+```console
+$ docker system df --format json
+{"Active":"2","Reclaimable":"2.498GB (94%)","Size":"2.631GB","TotalCount":"6","Type":"Images"}
+{"Active":"1","Reclaimable":"1.114kB (49%)","Size":"2.23kB","TotalCount":"7","Type":"Containers"}
+{"Active":"0","Reclaimable":"256.5MB (100%)","Size":"256.5MB","TotalCount":"1","Type":"Local Volumes"}
+{"Active":"0","Reclaimable":"158B","Size":"158B","TotalCount":"17","Type":"Build Cache"}
+```
+
 **Note** the format option is meaningless when verbose is true.
 
 ## Related commands

docs/reference/commandline/volume_inspect.md

@@ -12,7 +12,10 @@ Usage:  docker volume inspect [OPTIONS] VOLUME [VOLUME...]
 Display detailed information on one or more volumes
 
 Options:
-  -f, --format string   Format the output using the given Go template
+  -f, --format string   Format output using a custom template:
+                        'json':             Print in JSON format
+                        'TEMPLATE':         Print output using the given Go template.
+                        Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help            Print usage
 ```
 

docs/reference/commandline/volume_ls.md

@@ -20,7 +20,12 @@ Options:
                        - driver=<string> a volume's driver name
                        - label=<key> or label=<key>=<value>
                        - name=<string> a volume's name
-      --format string  Pretty-print volumes using a Go template
+      --format string  Format output using a custom template:
+                       'table':            Print output in table format with column headers (default)
+                       'table TEMPLATE':   Print output in table format using the given Go template
+                       'json':             Print in JSON format
+                       'TEMPLATE':         Print output using the given Go template.
+                       Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates
       --help           Print usage
   -q, --quiet          Only display volume names
 ```
@@ -182,6 +187,12 @@ vol2: local
 vol3: local
 ```
 
+To list all volumes in JSON format, use the `json` directive:
+```console
+$ docker volume ls --format json
+{"Driver":"local","Labels":"","Links":"N/A","Mountpoint":"/var/lib/docker/volumes/docker-cli-dev-cache/_data","Name":"docker-cli-dev-cache","Scope":"local","Size":"N/A"}
+```
+
 ## Related commands
 
 * [volume create](volume_create.md)

man/src/container/ls.md

@@ -115,3 +115,8 @@ Valid placeholders for the Go template are listed below:
     $ docker ps --filter expose=8000-8080/tcp
     CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
     9833437217a5        busybox             "top"               21 seconds ago      Up 19 seconds       8080/tcp            dreamy_mccarthy
+
+## Display containers in JSON format:
+
+    $ docker ps --format json
+    {"Command":"\"/docker-entrypoint.…\"","CreatedAt":"2021-03-10 00:15:05 +0100 CET","ID":"a762a2b37a1d","Image":"nginx","Labels":"maintainer=NGINX Docker Maintainers \u003cdocker-maint@nginx.com\u003e","LocalVolumes":"0","Mounts":"","Names":"boring_keldysh","Networks":"bridge","Ports":"80/tcp","RunningFor":"4 seconds ago","Size":"0B","State":"running","Status":"Up 3 seconds"}

man/src/container/stats.md

@@ -2,7 +2,7 @@ Display a live stream of one or more containers' resource usage statistics
 
 # Format
 
-   Pretty-print containers statistics using a Go template.
+   Format the output using the given Go template.
    Valid placeholders:
       .Container - Container name or ID.
       .Name - Container name.
@@ -41,3 +41,8 @@ Running `docker container stats` with customized format on all (Running and Stop
     5a8b07ec4cc52823f3cbfdb964018623c1ba307bce2c057ccdbde5f4f6990833   big_heisenberg           0.00%               0B / 0B
 
 `drunk_visvesvaraya` and `big_heisenberg` are stopped containers in the above example.
+
+Running `docker container stats` in JSON format.
+
+    $ docker container stats --format json
+    {"BlockIO":"43.9MB / 0B","CPUPerc":"0.00%","Container":"14c505d03da8","ID":"14c505d03da8","MemPerc":"0.21%","MemUsage":"4.242MiB / 1.944GiB","Name":"registry","NetIO":"4.17kB / 0B","PIDs":"13"}

man/src/image/ls.md

@@ -25,7 +25,7 @@ Filters the output based on these conditions:
 
 ## Format
 
-   Pretty-print images using a Go template.
+   Format the output using the given Go template.
    Valid placeholders:
       .ID - Image ID
       .Repository - Image repository
@@ -78,12 +78,13 @@ still find it in the third-party dockviz tool: https://github.com/justone/dockvi
 When using the --format option, the image command will either output the data 
 exactly as the template declares or, when using the `table` directive, will 
 include column headers as well. You can use special characters like `\t` for
-inserting tab spacing between columns. 
+inserting tab spacing between columns. The `json` directive outputs objects
+in JSON format.
 
 The following example uses a template without headers and outputs the ID and 
 Repository entries separated by a colon for all images:
 
-    docker images --format "{{.ID}}: {{.Repository}}"
+    docker image ls --format "{{.ID}}: {{.Repository}}"
     77af4d6b9913: <none>
     b6fa739cedf5: committ
     78a85c484bad: ipbabble
@@ -96,7 +97,7 @@ Repository entries separated by a colon for all images:
 
 To list all images with their repository and tag in a table format you can use:
 
-    docker images --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}"
+    docker image ls --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}"
     IMAGE ID            REPOSITORY                TAG
     77af4d6b9913        <none>                    <none>
     b6fa739cedf5        committ                   latest
@@ -110,6 +111,13 @@ To list all images with their repository and tag in a table format you can use:
 
 Valid template placeholders are listed above.
 
+To list all images in JSON format you can use:
+
+    docker image ls --format json
+    {"Containers":"N/A","CreatedAt":"2021-01-18 11:29:06 +0100 CET","CreatedSince":"24 hours ago","Digest":"\u003cnone\u003e","ID":"fbcf509fa16f","Repository":"docker","SharedSize":"N/A","Size":"235MB","Tag":"stable-dind","UniqueSize":"N/A","VirtualSize":"235.5MB"}
+    {"Containers":"N/A","CreatedAt":"2021-01-18 11:24:48 +0100 CET","CreatedSince":"24 hours ago","Digest":"\u003cnone\u003e","ID":"08656a69ab2b","Repository":"docker-cli-e2e","SharedSize":"N/A","Size":"1.21GB","Tag":"latest","UniqueSize":"N/A","VirtualSize":"1.207GB"}
+    {"Containers":"N/A","CreatedAt":"2021-01-18 10:43:44 +0100 CET","CreatedSince":"24 hours ago","Digest":"\u003cnone\u003e","ID":"abca5c07c1ba","Repository":"docker-cli-dev","SharedSize":"N/A","Size":"608MB","Tag":"latest","UniqueSize":"N/A","VirtualSize":"607.8MB"}
+
 ## Listing only the shortened image IDs
 
 Listing just the shortened image IDs. This can be useful for some automated

man/src/plugin/ls.md

@@ -10,7 +10,7 @@ Filter output based on these conditions:
 
 ## Format
 
-   Pretty-print plugins using a Go template.
+   Format the output using the given Go template.
    Valid placeholders:
       .ID - Plugin ID.
       .Name - Plugin Name.
@@ -30,6 +30,11 @@ Filter output based on these conditions:
     $ docker plugin ls --format "{{.ID}}: {{.Name}}"
     869080b57404: tiborvass/sample-volume-plugin:latest
 
+## Display plugins in JSON format
+
+    $ docker plugin ls --format json
+    {"Description":"A sample volume plugin for Docker","Enabled":true,"ID":"2788a2da7e12","Name":"tiborvass/sample-volume-plugin:latest","PluginReference":"docker.io/tiborvass/sample-volume-plugin:latest"}
+
 ## Display enabled plugins
 
     $ docker plugin ls --filter enabled=true