decode Spec value in command 'ctr c info <containerid>'
Signed-off-by: Lifubang <lifubang@aliyun.com> fix some errors use typeurl.UnmarshalAny instead json.Unmarshal to interface{} Signed-off-by: Lifubang <lifubang@aliyun.com> Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
		@@ -28,7 +28,9 @@ import (
 | 
			
		||||
	"github.com/containerd/containerd/cio"
 | 
			
		||||
	"github.com/containerd/containerd/cmd/ctr/commands"
 | 
			
		||||
	"github.com/containerd/containerd/cmd/ctr/commands/run"
 | 
			
		||||
	"github.com/containerd/containerd/containers"
 | 
			
		||||
	"github.com/containerd/containerd/log"
 | 
			
		||||
	"github.com/containerd/typeurl"
 | 
			
		||||
	"github.com/urfave/cli"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@@ -261,8 +263,22 @@ var infoCommand = cli.Command{
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
		commands.PrintAsJSON(info)
 | 
			
		||||
 | 
			
		||||
		if info.Spec != nil && info.Spec.Value != nil {
 | 
			
		||||
			v, err := typeurl.UnmarshalAny(info.Spec)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			commands.PrintAsJSON(struct {
 | 
			
		||||
				containers.Container
 | 
			
		||||
				Spec interface{} `json:"Spec,omitempty"`
 | 
			
		||||
			}{
 | 
			
		||||
				Container: info,
 | 
			
		||||
				Spec:      v,
 | 
			
		||||
			})
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
		commands.PrintAsJSON(info)
 | 
			
		||||
		return nil
 | 
			
		||||
	},
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user