From 4e8fcd40028ed09b139b6f86954e676a1839be9c Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Sat, 13 Jun 2015 09:39:19 +0200
Subject: [PATCH] /info: Add keys Architecture, OSType

  - introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
---
 api/client/info.go                            | 2 ++
 api/types/types.go                            | 2 ++
 daemon/info.go                                | 2 ++
 docs/reference/api/docker_remote_api_v1.21.md | 2 ++
 docs/reference/commandline/info.md            | 2 ++
 integration-cli/docker_api_info_test.go       | 2 ++
 integration-cli/docker_cli_info_test.go       | 2 ++
 man/docker-info.1.md                          | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/api/client/info.go b/api/client/info.go
index 7d373e0e68..eb364dd7a9 100644
--- a/api/client/info.go
+++ b/api/client/info.go
@@ -46,6 +46,8 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 	ioutils.FprintfIfNotEmpty(cli.out, "Logging Driver: %s\n", info.LoggingDriver)
 	ioutils.FprintfIfNotEmpty(cli.out, "Kernel Version: %s\n", info.KernelVersion)
 	ioutils.FprintfIfNotEmpty(cli.out, "Operating System: %s\n", info.OperatingSystem)
+	ioutils.FprintfIfNotEmpty(cli.out, "OSType: %s\n", info.OSType)
+	ioutils.FprintfIfNotEmpty(cli.out, "Architecture: %s\n", info.Architecture)
 	fmt.Fprintf(cli.out, "CPUs: %d\n", info.NCPU)
 	fmt.Fprintf(cli.out, "Total Memory: %s\n", units.BytesSize(float64(info.MemTotal)))
 	ioutils.FprintfIfNotEmpty(cli.out, "Name: %s\n", info.Name)
diff --git a/api/types/types.go b/api/types/types.go
index b69bbaea6e..9098b7954a 100644
--- a/api/types/types.go
+++ b/api/types/types.go
@@ -207,6 +207,8 @@ type Info struct {
 	NEventsListener    int
 	KernelVersion      string
 	OperatingSystem    string
+	OSType             string
+	Architecture       string
 	IndexServerAddress string
 	RegistryConfig     *registry.ServiceConfig
 	InitSha1           string
diff --git a/daemon/info.go b/daemon/info.go
index 9e15f0de19..8f9f3afa97 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -75,6 +75,8 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 		KernelVersion:      kernelVersion,
 		OperatingSystem:    operatingSystem,
 		IndexServerAddress: registry.IndexServer,
+		OSType:             runtime.GOOS,
+		Architecture:       runtime.GOARCH,
 		RegistryConfig:     daemon.RegistryService.Config,
 		InitSha1:           dockerversion.InitSHA1,
 		InitPath:           initPath,
diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md
index 1d6bfa788c..a53a6fcb80 100644
--- a/docs/reference/api/docker_remote_api_v1.21.md
+++ b/docs/reference/api/docker_remote_api_v1.21.md
@@ -1884,6 +1884,7 @@ Display system-wide information
     Content-Type: application/json
 
     {
+        "Architecture": "amd64",
         "Containers": 11,
         "CpuCfsPeriod": true,
         "CpuCfsQuota": true,
@@ -1915,6 +1916,7 @@ Display system-wide information
         "Name": "prod-server-42",
         "NoProxy": "9.81.1.160",
         "OomKillDisable": true,
+        "OSType": "linux",
         "OperatingSystem": "Boot2Docker",
         "RegistryConfig": {
             "IndexConfigs": {
diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md
index 1794df40b5..e23d9d6780 100644
--- a/docs/reference/commandline/info.md
+++ b/docs/reference/commandline/info.md
@@ -31,6 +31,8 @@ For example:
     Execution Driver: native-0.2
     Logging Driver: json-file
     Kernel Version: 3.19.0-22-generic
+    OSType: linux
+    Architecture: amd64
     Operating System: Ubuntu 15.04
     CPUs: 24
     Total Memory: 62.86 GiB
diff --git a/integration-cli/docker_api_info_test.go b/integration-cli/docker_api_info_test.go
index 54f5752796..b10012494e 100644
--- a/integration-cli/docker_api_info_test.go
+++ b/integration-cli/docker_api_info_test.go
@@ -23,6 +23,8 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
 		"LoggingDriver",
 		"OperatingSystem",
 		"NCPU",
+		"OSType",
+		"Architecture",
 		"MemTotal",
 		"KernelVersion",
 		"Driver",
diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go
index 21b8e51682..5e786c4de7 100644
--- a/integration-cli/docker_cli_info_test.go
+++ b/integration-cli/docker_cli_info_test.go
@@ -19,6 +19,8 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
 		"Containers:",
 		"Images:",
 		"Execution Driver:",
+		"OSType:",
+		"Architecture:",
 		"Logging Driver:",
 		"Operating System:",
 		"CPUs:",
diff --git a/man/docker-info.1.md b/man/docker-info.1.md
index f67a4fb00c..208d3423a3 100644
--- a/man/docker-info.1.md
+++ b/man/docker-info.1.md
@@ -41,6 +41,8 @@ Here is a sample output:
     Logging Driver: json-file
     Kernel Version: 3.13.0-24-generic
     Operating System: Ubuntu 14.04 LTS
+    OSType: linux
+    Architecture: amd64
     CPUs: 1
     Total Memory: 2 GiB