Merge pull request cri-o#834 from mrunalp/inspect_add_sandbox

runcom · web-flow · commit 8538c4067a98 · 2017-09-01T22:41:07.000+02:00
server: Add sandbox to container info
diff --git a/server/inspect.go b/server/inspect.go
@@ -18,6 +18,7 @@ type ContainerInfo struct {
 	Annotations map[string]string `json:"annotations"`
 	LogPath     string            `json:"log_path"`
 	Root        string            `json:"root"`
+	Sandbox     string            `json:"sandbox"`
 }
 
 // CrioInfo stores information about the crio daemon
@@ -68,6 +69,7 @@ func (s *Server) GetInfoMux() *bone.Mux {
 			Annotations: ctr.Annotations(),
 			Root:        ctr.MountPoint(),
 			LogPath:     filepath.Dir(ctr.LogPath()),
+			Sandbox:     ctr.Sandbox(),
 		}
 		js, err := json.Marshal(ci)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ type ContainerInfo struct {`
`18`	`18`	Annotations map[string]string `json:"annotations"`
`19`	`19`	LogPath string `json:"log_path"`
`20`	`20`	Root string `json:"root"`
	`21`	+ Sandbox string `json:"sandbox"`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`// CrioInfo stores information about the crio daemon`
`@@ -68,6 +69,7 @@ func (s Server) GetInfoMux() bone.Mux {`
`68`	`69`	`Annotations: ctr.Annotations(),`
`69`	`70`	`Root: ctr.MountPoint(),`
`70`	`71`	`LogPath: filepath.Dir(ctr.LogPath()),`
	`72`	`+ Sandbox: ctr.Sandbox(),`
`71`	`73`	`}`
`72`	`74`	`js, err := json.Marshal(ci)`
`73`	`75`	`if err != nil {`