Use protoversion for containerd version

Signed-off-by: Peter Edge <peter.edge@gmail.com>
This commit is contained in:
Peter Edge 2015-12-18 13:06:04 +00:00
parent 1d63236c27
commit d2e319523d
5 changed files with 48 additions and 4 deletions

View file

@ -9,6 +9,8 @@ import (
"syscall"
"time"
"go.pedge.io/proto/version"
"google.golang.org/grpc"
"github.com/Sirupsen/logrus"
@ -77,7 +79,7 @@ var daemonFlags = []cli.Flag{
func main() {
app := cli.NewApp()
app.Name = "containerd"
app.Version = containerd.Version
app.Version = containerd.Version.VersionString()
app.Usage = Usage
app.Authors = authors
app.Flags = daemonFlags
@ -201,6 +203,15 @@ func daemon(id, address, stateDir string, concurrency int, oom bool) error {
}
s := grpc.NewServer()
types.RegisterAPIServer(s, server.NewServer(sv))
protoversion.RegisterAPIServer(
s,
protoversion.NewAPIServer(
containerd.Version,
protoversion.APIServerOptions{
DisableLogging: true,
},
),
)
logrus.Debugf("GRPC API listen on %s", address)
return s.Serve(l)
}

View file

@ -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{

View file

@ -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") {

22
ctr/version.go Normal file
View file

@ -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())
},
}

View file

@ -1,3 +1,9 @@
package containerd
const Version = "0.0.4"
import "go.pedge.io/proto/version"
var Version = &protoversion.Version{
Major: 0,
Minor: 0,
Micro: 4,
}