Use protoversion for containerd version

Signed-off-by: Peter Edge <peter.edge@gmail.com>

ctr/container.go

@@ -23,6 +23,10 @@ import (
 
 // TODO: parse flags and pass opts
 func getClient(ctx *cli.Context) types.APIClient {
+	return types.NewAPIClient(getClientConn(ctx))
+}
+
+func getClientConn(ctx *cli.Context) *grpc.ClientConn {
 	dialOpts := []grpc.DialOption{grpc.WithInsecure()}
 	dialOpts = append(dialOpts,
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
@@ -33,7 +37,7 @@ func getClient(ctx *cli.Context) types.APIClient {
 	if err != nil {
 		fatal(err.Error(), 1)
 	}
-	return types.NewAPIClient(conn)
+	return conn
 }
 
 var ContainersCommand = cli.Command{

ctr/main.go

@@ -14,7 +14,7 @@ const Usage = `High performance container daemon cli`
 func main() {
 	app := cli.NewApp()
 	app.Name = "ctr"
-	app.Version = containerd.Version
+	app.Version = containerd.Version.VersionString()
 	app.Usage = Usage
 	app.Authors = []cli.Author{
 		{
@@ -37,6 +37,7 @@ func main() {
 		CheckpointCommand,
 		ContainersCommand,
 		EventsCommand,
+		VersionCommand,
 	}
 	app.Before = func(context *cli.Context) error {
 		if context.GlobalBool("debug") {

ctr/version.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"go.pedge.io/proto/version"
+
+	"github.com/codegangsta/cli"
+	"github.com/docker/containerd"
+)
+
+var VersionCommand = cli.Command{
+	Name:  "version",
+	Usage: "get the containerd version",
+	Action: func(context *cli.Context) {
+		serverVersion, err := protoversion.GetServerVersion(getClientConn(context))
+		if err != nil {
+			fatal(err.Error(), 1)
+		}
+		fmt.Printf("Client: %s\nServer: %s\n", containerd.Version.VersionString(), serverVersion.VersionString())
+	},
+}