Merge pull request #1638 from ijc/separate-client-system-info

Separate client infomation in `docker system info`

cli/command/system/info.go

@@ -21,6 +21,23 @@ type infoOptions struct {
 	format string
 }
 
+type clientInfo struct {
+	Debug    bool
+	Warnings []string
+}
+
+type info struct {
+	// This field should/could be ServerInfo but is anonymous to
+	// preserve backwards compatibility in the JSON rendering
+	// which has ServerInfo immediately within the top-level
+	// object.
+	*types.Info  `json:",omitempty"`
+	ServerErrors []string `json:",omitempty"`
+
+	ClientInfo   *clientInfo `json:",omitempty"`
+	ClientErrors []string    `json:",omitempty"`
+}
+
 // NewInfoCommand creates a new cobra.Command for `docker info`
 func NewInfoCommand(dockerCli command.Cli) *cobra.Command {
 	var opts infoOptions
@@ -42,19 +59,67 @@ func NewInfoCommand(dockerCli command.Cli) *cobra.Command {
 }
 
 func runInfo(dockerCli command.Cli, opts *infoOptions) error {
+	var info info
+
 	ctx := context.Background()
-	info, err := dockerCli.Client().Info(ctx)
+	if dinfo, err := dockerCli.Client().Info(ctx); err == nil {
-	if err != nil {
+		info.Info = &dinfo
-		return err
+	} else {
+		info.ServerErrors = append(info.ServerErrors, err.Error())
 	}
+
+	info.ClientInfo = &clientInfo{
+		Debug: debug.IsEnabled(),
+	}
+
 	if opts.format == "" {
 		return prettyPrintInfo(dockerCli, info)
 	}
 	return formatInfo(dockerCli, info, opts.format)
 }
 
+func prettyPrintInfo(dockerCli command.Cli, info info) error {
+	fmt.Fprintln(dockerCli.Out(), "Client:")
+	if info.ClientInfo != nil {
+		if err := prettyPrintClientInfo(dockerCli, *info.ClientInfo); err != nil {
+			info.ClientErrors = append(info.ClientErrors, err.Error())
+		}
+	}
+	for _, err := range info.ClientErrors {
+		fmt.Fprintln(dockerCli.Out(), "ERROR:", err)
+	}
+
+	fmt.Fprintln(dockerCli.Out())
+	fmt.Fprintln(dockerCli.Out(), "Server:")
+	if info.Info != nil {
+		for _, err := range prettyPrintServerInfo(dockerCli, *info.Info) {
+			info.ServerErrors = append(info.ServerErrors, err.Error())
+		}
+	}
+	for _, err := range info.ServerErrors {
+		fmt.Fprintln(dockerCli.Out(), "ERROR:", err)
+	}
+
+	if len(info.ServerErrors) > 0 || len(info.ClientErrors) > 0 {
+		return fmt.Errorf("errors pretty printing info")
+	}
+	return nil
+}
+
+func prettyPrintClientInfo(dockerCli command.Cli, info clientInfo) error {
+	fmt.Fprintln(dockerCli.Out(), " Debug Mode:", info.Debug)
+
+	if len(info.Warnings) > 0 {
+		fmt.Fprintln(dockerCli.Err(), strings.Join(info.Warnings, "\n"))
+	}
+
+	return nil
+}
+
 // nolint: gocyclo
-func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
+func prettyPrintServerInfo(dockerCli command.Cli, info types.Info) []error {
+	var errs []error
+
 	fmt.Fprintln(dockerCli.Out(), " Containers:", info.Containers)
 	fmt.Fprintln(dockerCli.Out(), "  Running:", info.ContainersRunning)
 	fmt.Fprintln(dockerCli.Out(), "  Paused:", info.ContainersPaused)
@@ -115,10 +180,9 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
 			fmt.Fprint(dockerCli.Out(), "\n")
 		}
 		if len(info.SecurityOptions) != 0 {
-			kvs, err := types.DecodeSecurityOptions(info.SecurityOptions)
+			if kvs, err := types.DecodeSecurityOptions(info.SecurityOptions); err != nil {
-			if err != nil {
+				errs = append(errs, err)
-				return err
+			} else {
-			}
 				fmt.Fprintln(dockerCli.Out(), " Security Options:")
 				for _, so := range kvs {
 					fmt.Fprintln(dockerCli.Out(), "  "+so.Name)
@@ -134,6 +198,7 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
 				}
 			}
 		}
+	}
 
 	// Isolation only has meaning on a Windows daemon.
 	if info.OSType == "windows" {
@@ -149,8 +214,7 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
 	fprintlnNonEmpty(dockerCli.Out(), " Name:", info.Name)
 	fprintlnNonEmpty(dockerCli.Out(), " ID:", info.ID)
 	fmt.Fprintln(dockerCli.Out(), " Docker Root Dir:", info.DockerRootDir)
-	fmt.Fprintln(dockerCli.Out(), "Debug Mode (client):", debug.IsEnabled())
+	fmt.Fprintln(dockerCli.Out(), " Debug Mode:", info.Debug)
-	fmt.Fprintln(dockerCli.Out(), "Debug Mode (server):", info.Debug)
 
 	if info.Debug {
 		fmt.Fprintln(dockerCli.Out(), "  File Descriptors:", info.NFd)
@@ -209,8 +273,8 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
 	}
 	fmt.Fprint(dockerCli.Out(), "\n")
 
-	printWarnings(dockerCli, info)
+	printServerWarnings(dockerCli, info)
-	return nil
+	return errs
 }
 
 // nolint: gocyclo
@@ -283,22 +347,22 @@ func printSwarmInfo(dockerCli command.Cli, info types.Info) {
 	}
 }
 
-func printWarnings(dockerCli command.Cli, info types.Info) {
+func printServerWarnings(dockerCli command.Cli, info types.Info) {
 	if len(info.Warnings) > 0 {
 		fmt.Fprintln(dockerCli.Err(), strings.Join(info.Warnings, "\n"))
 		return
 	}
 	// daemon didn't return warnings. Fallback to old behavior
 	printStorageDriverWarnings(dockerCli, info)
-	printWarningsLegacy(dockerCli, info)
+	printServerWarningsLegacy(dockerCli, info)
 }
 
-// printWarningsLegacy generates warnings based on information returned by the daemon.
+// printServerWarningsLegacy generates warnings based on information returned by the daemon.
 // DEPRECATED: warnings are now generated by the daemon, and returned in
 // info.Warnings. This function is used to provide backward compatibility with
 // daemons that do not provide these warnings. No new warnings should be added
 // here.
-func printWarningsLegacy(dockerCli command.Cli, info types.Info) {
+func printServerWarningsLegacy(dockerCli command.Cli, info types.Info) {
 	if info.OSType == "windows" {
 		return
 	}
@@ -382,7 +446,7 @@ func getBackingFs(info types.Info) string {
 	return ""
 }
 
-func formatInfo(dockerCli command.Cli, info types.Info, format string) error {
+func formatInfo(dockerCli command.Cli, info info, format string) error {
 	tmpl, err := templates.Parse(format)
 	if err != nil {
 		return cli.StatusError{StatusCode: 64,

cli/command/system/info_test.go

@@ -21,8 +21,10 @@ func base64Decode(val string) []byte {
 	return decoded
 }
 
+const sampleID = "EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX"
+
 var sampleInfoNoSwarm = types.Info{
-	ID:                "EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX",
+	ID:                sampleID,
 	Containers:        0,
 	ContainersRunning: 0,
 	ContainersPaused:  0,
@@ -222,44 +224,133 @@ func TestPrettyPrintInfo(t *testing.T) {
 		"WARNING: bridge-nf-call-ip6tables is disabled",
 	}
 
+	sampleInfoBadSecurity := sampleInfoNoSwarm
+	sampleInfoBadSecurity.SecurityOptions = []string{"foo="}
+
 	for _, tc := range []struct {
 		doc            string
-		dockerInfo     types.Info
+		dockerInfo     info
-		expectedGolden string
+		prettyGolden   string
 		warningsGolden string
+		jsonGolden     string
+		expectedError  string
 	}{
 		{
 			doc: "info without swarm",
-			dockerInfo:     sampleInfoNoSwarm,
+			dockerInfo: info{
-			expectedGolden: "docker-info-no-swarm",
+				Info:       &sampleInfoNoSwarm,
+				ClientInfo: &clientInfo{Debug: true},
+			},
+			prettyGolden: "docker-info-no-swarm",
+			jsonGolden:   "docker-info-no-swarm",
 		},
 		{
 			doc: "info with swarm",
-			dockerInfo:     infoWithSwarm,
+			dockerInfo: info{
-			expectedGolden: "docker-info-with-swarm",
+				Info:       &infoWithSwarm,
+				ClientInfo: &clientInfo{Debug: false},
+			},
+			prettyGolden: "docker-info-with-swarm",
+			jsonGolden:   "docker-info-with-swarm",
 		},
 		{
 			doc: "info with legacy warnings",
-			dockerInfo:     infoWithWarningsLinux,
+			dockerInfo: info{
-			expectedGolden: "docker-info-no-swarm",
+				Info:       &infoWithWarningsLinux,
+				ClientInfo: &clientInfo{Debug: true},
+			},
+			prettyGolden:   "docker-info-no-swarm",
 			warningsGolden: "docker-info-warnings",
+			jsonGolden:     "docker-info-legacy-warnings",
 		},
 		{
 			doc: "info with daemon warnings",
-			dockerInfo:     sampleInfoDaemonWarnings,
+			dockerInfo: info{
-			expectedGolden: "docker-info-no-swarm",
+				Info:       &sampleInfoDaemonWarnings,
+				ClientInfo: &clientInfo{Debug: true},
+			},
+			prettyGolden:   "docker-info-no-swarm",
 			warningsGolden: "docker-info-warnings",
+			jsonGolden:     "docker-info-daemon-warnings",
+		},
+		{
+			doc: "errors for both",
+			dockerInfo: info{
+				ServerErrors: []string{"a server error occurred"},
+				ClientErrors: []string{"a client error occurred"},
+			},
+			prettyGolden:  "docker-info-errors",
+			jsonGolden:    "docker-info-errors",
+			expectedError: "errors pretty printing info",
+		},
+		{
+			doc: "bad security info",
+			dockerInfo: info{
+				Info:         &sampleInfoBadSecurity,
+				ServerErrors: []string{"an error happened"},
+				ClientInfo:   &clientInfo{Debug: false},
+			},
+			prettyGolden:  "docker-info-badsec",
+			jsonGolden:    "docker-info-badsec",
+			expectedError: "errors pretty printing info",
 		},
 	} {
 		t.Run(tc.doc, func(t *testing.T) {
 			cli := test.NewFakeCli(&fakeClient{})
-			assert.NilError(t, prettyPrintInfo(cli, tc.dockerInfo))
+			err := prettyPrintInfo(cli, tc.dockerInfo)
-			golden.Assert(t, cli.OutBuffer().String(), tc.expectedGolden+".golden")
+			if tc.expectedError == "" {
+				assert.NilError(t, err)
+			} else {
+				assert.Error(t, err, tc.expectedError)
+			}
+			golden.Assert(t, cli.OutBuffer().String(), tc.prettyGolden+".golden")
 			if tc.warningsGolden != "" {
 				golden.Assert(t, cli.ErrBuffer().String(), tc.warningsGolden+".golden")
 			} else {
 				assert.Check(t, is.Equal("", cli.ErrBuffer().String()))
 			}
+
+			cli = test.NewFakeCli(&fakeClient{})
+			assert.NilError(t, formatInfo(cli, tc.dockerInfo, "{{json .}}"))
+			golden.Assert(t, cli.OutBuffer().String(), tc.jsonGolden+".json.golden")
+			assert.Check(t, is.Equal("", cli.ErrBuffer().String()))
+		})
+	}
+}
+
+func TestFormatInfo(t *testing.T) {
+	for _, tc := range []struct {
+		doc           string
+		template      string
+		expectedError string
+		expectedOut   string
+	}{
+		{
+			doc:         "basic",
+			template:    "{{.ID}}",
+			expectedOut: sampleID + "\n",
+		},
+		{
+			doc:           "syntax",
+			template:      "{{}",
+			expectedError: `Status: Template parsing error: template: :1: unexpected "}" in command, Code: 64`,
+		},
+	} {
+		t.Run(tc.doc, func(t *testing.T) {
+			cli := test.NewFakeCli(&fakeClient{})
+			info := info{
+				Info:       &sampleInfoNoSwarm,
+				ClientInfo: &clientInfo{Debug: true},
+			}
+			err := formatInfo(cli, info, tc.template)
+			if tc.expectedOut != "" {
+				assert.NilError(t, err)
+				assert.Equal(t, cli.OutBuffer().String(), tc.expectedOut)
+			} else if tc.expectedError != "" {
+				assert.Error(t, err, tc.expectedError)
+			} else {
+				t.Fatal("test expected to neither pass nor fail")
+			}
 		})
 	}
 }

cli/command/system/testdata/docker-info-badsec.golden

@@ -0,0 +1,52 @@
+Client:
+ Debug Mode: false
+
+Server:
+ Containers: 0
+  Running: 0
+  Paused: 0
+  Stopped: 0
+ Images: 0
+ Server Version: 17.06.1-ce
+ Storage Driver: aufs
+  Root Dir: /var/lib/docker/aufs
+  Backing Filesystem: extfs
+  Dirs: 0
+  Dirperm1 Supported: true
+ Logging Driver: json-file
+ Cgroup Driver: cgroupfs
+ Plugins:
+  Volume: local
+  Network: bridge host macvlan null overlay
+  Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
+ Swarm: inactive
+ Runtimes: runc
+ Default Runtime: runc
+ Init Binary: docker-init
+ containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
+ runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
+ init version: 949e6fa
+ Kernel Version: 4.4.0-87-generic
+ Operating System: Ubuntu 16.04.3 LTS
+ OSType: linux
+ Architecture: x86_64
+ CPUs: 2
+ Total Memory: 1.953GiB
+ Name: system-sample
+ ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
+ Docker Root Dir: /var/lib/docker
+ Debug Mode: true
+  File Descriptors: 33
+  Goroutines: 135
+  System Time: 2017-08-24T17:44:34.077811894Z
+  EventsListeners: 0
+ Registry: https://index.docker.io/v1/
+ Labels:
+  provider=digitalocean
+ Experimental: false
+ Insecure Registries:
+  127.0.0.0/8
+ Live Restore Enabled: false
+
+ERROR: an error happened
+ERROR: invalid empty security option

cli/command/system/testdata/docker-info-badsec.json.golden

@@ -0,0 +1 @@
+{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["foo="],"Warnings":null,"ServerErrors":["an error happened"],"ClientInfo":{"Debug":false,"Warnings":null}}

cli/command/system/testdata/docker-info-daemon-warnings.json.golden

@@ -0,0 +1 @@
+{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=apparmor","name=seccomp,profile=default"],"Warnings":["WARNING: No memory limit support","WARNING: No swap limit support","WARNING: No kernel memory limit support","WARNING: No oom kill disable support","WARNING: No cpu cfs quota support","WARNING: No cpu cfs period support","WARNING: No cpu shares support","WARNING: No cpuset support","WARNING: IPv4 forwarding is disabled","WARNING: bridge-nf-call-iptables is disabled","WARNING: bridge-nf-call-ip6tables is disabled"],"ClientInfo":{"Debug":true,"Warnings":null}}

cli/command/system/testdata/docker-info-errors.golden

@@ -0,0 +1,5 @@
+Client:
+ERROR: a client error occurred
+
+Server:
+ERROR: a server error occurred

cli/command/system/testdata/docker-info-errors.json.golden

@@ -0,0 +1 @@
+{"ServerErrors":["a server error occurred"],"ClientErrors":["a client error occurred"]}

cli/command/system/testdata/docker-info-legacy-warnings.json.golden

@@ -0,0 +1 @@
+{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":false,"SwapLimit":false,"KernelMemory":false,"KernelMemoryTCP":false,"CpuCfsPeriod":false,"CpuCfsQuota":false,"CPUShares":false,"CPUSet":false,"IPv4Forwarding":false,"BridgeNfIptables":false,"BridgeNfIp6tables":false,"Debug":true,"NFd":33,"OomKillDisable":false,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=apparmor","name=seccomp,profile=default"],"Warnings":null,"ClientInfo":{"Debug":true,"Warnings":null}}

cli/command/system/testdata/docker-info-no-swarm.golden

@@ -1,3 +1,7 @@
+Client:
+ Debug Mode: true
+
+Server:
  Containers: 0
   Running: 0
   Paused: 0
@@ -35,8 +39,7 @@ Total Memory: 1.953GiB
  Name: system-sample
  ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
  Docker Root Dir: /var/lib/docker
-Debug Mode (client): false
+ Debug Mode: true
-Debug Mode (server): true
   File Descriptors: 33
   Goroutines: 135
   System Time: 2017-08-24T17:44:34.077811894Z

cli/command/system/testdata/docker-info-no-swarm.json.golden

@@ -0,0 +1 @@
+{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=apparmor","name=seccomp,profile=default"],"Warnings":null,"ClientInfo":{"Debug":true,"Warnings":null}}

cli/command/system/testdata/docker-info-with-swarm.golden

@@ -1,3 +1,7 @@
+Client:
+ Debug Mode: false
+
+Server:
  Containers: 0
   Running: 0
   Paused: 0
@@ -57,8 +61,7 @@ Total Memory: 1.953GiB
  Name: system-sample
  ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
  Docker Root Dir: /var/lib/docker
-Debug Mode (client): false
+ Debug Mode: true
-Debug Mode (server): true
   File Descriptors: 33
   Goroutines: 135
   System Time: 2017-08-24T17:44:34.077811894Z

cli/command/system/testdata/docker-info-with-swarm.json.golden

@@ -0,0 +1 @@
+{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"qo2dfdig9mmxqkawulggepdih","NodeAddr":"165.227.107.89","LocalNodeState":"active","ControlAvailable":true,"Error":"","RemoteManagers":[{"NodeID":"qo2dfdig9mmxqkawulggepdih","Addr":"165.227.107.89:2377"}],"Nodes":1,"Managers":1,"Cluster":{"ID":"9vs5ygs0gguyyec4iqf2314c0","Version":{"Index":11},"CreatedAt":"2017-08-24T17:34:19.278062352Z","UpdatedAt":"2017-08-24T17:34:42.398815481Z","Spec":{"Name":"default","Labels":null,"Orchestration":{"TaskHistoryRetentionLimit":5},"Raft":{"SnapshotInterval":10000,"KeepOldSnapshots":0,"LogEntriesForSlowFollowers":500,"ElectionTick":3,"HeartbeatTick":1},"Dispatcher":{"HeartbeatPeriod":5000000000},"CAConfig":{"NodeCertExpiry":7776000000000000},"TaskDefaults":{},"EncryptionConfig":{"AutoLockManagers":true}},"TLSInfo":{"TrustRoot":"\n-----BEGIN CERTIFICATE-----\nMIIBajCCARCgAwIBAgIUaFCW5xsq8eyiJ+Pmcv3MCflMLnMwCgYIKoZIzj0EAwIw\nEzERMA8GA1UEAxMIc3dhcm0tY2EwHhcNMTcwODI0MTcyOTAwWhcNMzcwODE5MTcy\nOTAwWjATMREwDwYDVQQDEwhzd2FybS1jYTBZMBMGByqGSM49AgEGCCqGSM49AwEH\nA0IABDy7NebyUJyUjWJDBUdnZoV6GBxEGKO4TZPNDwnxDxJcUdLVaB7WGa4/DLrW\nUfsVgh1JGik2VTiLuTMA1tLlNPOjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB\nAf8EBTADAQH/MB0GA1UdDgQWBBQl16XFtaaXiUAwEuJptJlDjfKskDAKBggqhkjO\nPQQDAgNIADBFAiEAo9fTQNM5DP9bHVcTJYfl2Cay1bFu1E+lnpmN+EYJfeACIGKH\n1pCUkZ+D0IB6CiEZGWSHyLuXPM1rlP+I5KuS7sB8\n-----END CERTIFICATE-----\n","CertIssuerSubject":"MBMxETAPBgNVBAMTCHN3YXJtLWNh","CertIssuerPublicKey":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPLs15vJQnJSNYkMFR2dmhXoYHEQYo7hNk80PCfEPElxR0tVoHtYZrj8MutZR+xWCHUkaKTZVOIu5MwDW0uU08w=="},"RootRotationInProgress":false,"DefaultAddrPool":null,"SubnetSize":0,"DataPathPort":0}},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=apparmor","name=seccomp,profile=default"],"Warnings":null,"ClientInfo":{"Debug":false,"Warnings":null}}

docs/reference/commandline/info.md

@@ -55,7 +55,10 @@ information about the `devicemapper` storage driver is shown:
 
 ```bash
 $ docker info
+Client:
+ Debug Mode: false
 
+Server:
  Containers: 14
   Running: 3
   Paused: 1
@@ -96,8 +99,7 @@ Total Memory: 991.7 MiB
  Name: ip-172-30-0-91.ec2.internal
  ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
  Docker Root Dir: /var/lib/docker
-Debug mode (client): false
+ Debug Mode: false
-Debug mode (server): false
  Username: gordontheturtle
  Registry: https://index.docker.io/v1/
  Insecure registries:
@@ -112,7 +114,10 @@ storage driver and a node that is part of a 2-node swarm:
 
 ```bash
 $ docker -D info
+Client:
+ Debug Mode: true
 
+Server:
  Containers: 14
   Running: 3
   Paused: 1
@@ -168,8 +173,7 @@ Total Memory: 1.937 GiB
  Name: ubuntu
  ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
  Docker Root Dir: /var/lib/docker
-Debug Mode (client): true
+ Debug Mode: true
-Debug Mode (server): true
   File Descriptors: 30
   Goroutines: 123
   System Time: 2016-11-12T17:24:37.955404361-08:00
@@ -209,7 +213,10 @@ Here is a sample output for a daemon running on Windows Server 2016:
 
 ```none
 E:\docker>docker info
+Client:
+ Debug Mode: false
 
+Server:
  Containers: 1
   Running: 0
   Paused: 0
@@ -233,8 +240,7 @@ Total Memory: 3.999 GiB
  Name: WIN-V0V70C0LU5P
  ID: NYMS:B5VK:UMSL:FVDZ:EWB5:FKVK:LPFL:FJMQ:H6FT:BZJ6:L2TD:XH62
  Docker Root Dir: C:\control
-Debug Mode (client): false
+ Debug Mode: false
-Debug Mode (server): false
  Registry: https://index.docker.io/v1/
  Insecure Registries:
   127.0.0.0/8

man/src/system/info.md

@@ -24,6 +24,10 @@ Here is a sample output for a daemon running on Ubuntu, using the overlay2
 storage driver:
 
     $ docker -D info
+    Client:
+     Debug Mode: true
+
+    Server:
      Containers: 14
       Running: 3
       Paused: 1
@@ -78,8 +82,7 @@ storage driver:
      Name: ubuntu
      ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
      Docker Root Dir: /var/lib/docker
-    Debug Mode (client): true
+     Debug Mode: true
-    Debug Mode (server): true
       File Descriptors: 30
       Goroutines: 123
       System Time: 2016-11-12T17:24:37.955404361-08:00
@@ -109,6 +112,10 @@ using the devicemapper storage driver. As can be seen in the output, additional
 information about the devicemapper storage driver is shown:
 
     $ docker info
+    Client:
+     Debug Mode: false
+
+    Server:
      Containers: 14
       Running: 3
       Paused: 1
@@ -149,8 +156,7 @@ information about the devicemapper storage driver is shown:
      Name: ip-172-30-0-91.ec2.internal
      ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
      Docker Root Dir: /var/lib/docker
-    Debug mode (client): false
+     Debug Mode: false
-    Debug mode (server): false
      Username: gordontheturtle
      Registry: https://index.docker.io/v1/
      Insecure registries: