github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

containerd: remove GRPC service export

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-07-12 16:40:38 -07:00
parent bee304cf3c
commit b385798695
9 changed files with 172 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/info.go
View File

@@ -31,7 +31,7 @@ var infoCommand = cli.Command{
if err != nil {
return err
}
cjson, err := json.MarshalIndent(container.Proto(), "", " ")
cjson, err := json.MarshalIndent(container.Info(), "", " ")
if err != nil {
return err
}

6
cmd/ctr/list.go
View File

@@ -110,7 +110,7 @@ func containerListFn(context *cli.Context) error {
fmt.Fprintln(w, "CONTAINER\tIMAGE\tRUNTIME\tLABELS\t")
for _, c := range containers {
var labelStrings []string
for k, v := range c.Proto().Labels {
for k, v := range c.Info().Labels {
labelStrings = append(labelStrings, strings.Join([]string{k, v}, "="))
}
labels := strings.Join(labelStrings, ",")
@@ -128,11 +128,11 @@ func containerListFn(context *cli.Context) error {
imageName = image.Name()
}
proto := c.Proto()
record := c.Info()
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t\n",
c.ID(),
imageName,
proto.Runtime.Name,
record.Runtime.Name,
labels,
); err != nil {
return err