Merge pull request #2967 from crosbymichael/return-host-config

Add hostconfig to container inspect

api.go

@@ -875,7 +875,10 @@ func getContainersByName(srv *Server, version float64, w http.ResponseWriter, r
 		return fmt.Errorf("Conflict between containers and images")
 	}
 
-	return writeJSON(w, http.StatusOK, container)
+	container.readHostConfig()
+	c := APIContainer{container, container.hostConfig}
+
+	return writeJSON(w, http.StatusOK, c)
 }
 
 func getImagesByName(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

api_params.go

@@ -118,6 +118,10 @@ type (
 		Resource string
 		HostPath string
 	}
+	APIContainer struct {
+		*Container
+		HostConfig *HostConfig
+	}
 )
 
 func (api APIImages) ToLegacy() []APIImagesOld {

docs/sources/api/docker_remote_api.rst

@@ -51,6 +51,10 @@ What's new
    **New!** This endpoint now returns build status as json stream. In case
    of a build error, it returns the exit status of the failed command.
 
+.. http:get:: /containers/(id)/json
+
+    **New!** This endpoint now returns the host config for the container.
+
 
 v1.7
 ****

docs/sources/api/docker_remote_api_v1.8.rst

@@ -222,7 +222,23 @@ Inspect a container
 			},
 			"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
 			"ResolvConfPath": "/etc/resolv.conf",
-			"Volumes": {}
+			"Volumes": {},
+                        "HostConfig": {
+                            "Binds": null,
+                            "ContainerIDFile": "",
+                            "LxcConf": [],
+                            "Privileged": false,
+                            "PortBindings": {
+                               "80/tcp": [
+                                   {
+                                       "HostIp": "0.0.0.0",
+                                       "HostPort": "49153"
+                                   }
+                               ]
+                            },
+                            "Links": null,
+                            "PublishAllPorts": false
+                        }
 	   }
 
 	:statuscode 200: no error