Merge pull request #8054 from estesp/6830-fix-json-strings

Proper JSON handling of strings that could be represented as other types

builtins/builtins.go

@@ -61,7 +61,7 @@ func dockerVersion(job *engine.Job) engine.Status {
 	v := &engine.Env{}
 	v.SetJson("Version", dockerversion.VERSION)
 	v.SetJson("ApiVersion", api.APIVERSION)
-	v.Set("GitCommit", dockerversion.GITCOMMIT)
+	v.SetJson("GitCommit", dockerversion.GITCOMMIT)
 	v.Set("GoVersion", runtime.Version())
 	v.Set("Os", runtime.GOOS)
 	v.Set("Arch", runtime.GOARCH)

daemon/inspect.go

@@ -31,7 +31,7 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
 		out := &engine.Env{}
 		out.Set("Id", container.ID)
 		out.SetAuto("Created", container.Created)
-		out.Set("Path", container.Path)
+		out.SetJson("Path", container.Path)
 		out.SetList("Args", container.Args)
 		out.SetJson("Config", container.Config)
 		out.SetJson("State", container.State)

integration-cli/docker_api_inspect_test.go

@@ -46,6 +46,10 @@ func TestInspectContainerResponse(t *testing.T) {
 				t.Fatalf("%s does not exist in reponse for %s version", key, testVersion)
 			}
 		}
+		//Issue #6830: type not properly converted to JSON/back
+		if _, ok := inspect_json["Path"].(bool); ok {
+			t.Fatalf("Path of `true` should not be converted to boolean `true` via JSON marshalling")
+		}
 	}
 
 	deleteAllContainers()