65d5b8b937
This patch changes the output of `ctr version` to align version and revision.
It also changes `.Printf()` to `.Println()`, to make the code slightly easier
to read.
Before this change:
$ ctr version
Client:
Version: v1.0.0-beta.2-132-g564600e.m
Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m
Server:
Version: v1.0.0-beta.2-132-g564600e.m
Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m
With this patch applied:
$ ctr version
Client:
Version: v1.0.0-beta.2-132-g564600e.m
Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m
Server:
Version: v1.0.0-beta.2-132-g564600e.m
Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
42 lines
1017 B
Go
42 lines
1017 B
Go
package version
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/containerd/containerd/cmd/ctr/commands"
|
|
"github.com/containerd/containerd/version"
|
|
"github.com/urfave/cli"
|
|
)
|
|
|
|
// Command is a cli command to output the client and containerd server version
|
|
var Command = cli.Command{
|
|
Name: "version",
|
|
Usage: "print the client and server versions",
|
|
Action: func(context *cli.Context) error {
|
|
fmt.Println("Client:")
|
|
fmt.Println(" Version: ", version.Version)
|
|
fmt.Println(" Revision:", version.Revision)
|
|
fmt.Println("")
|
|
client, ctx, cancel, err := commands.NewClient(context)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer cancel()
|
|
v, err := client.Version(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fmt.Println("Server:")
|
|
fmt.Println(" Version: ", v.Version)
|
|
fmt.Println(" Revision:", v.Revision)
|
|
if v.Version != version.Version {
|
|
fmt.Fprintln(os.Stderr, "WARNING: version mismatch")
|
|
}
|
|
if v.Revision != version.Revision {
|
|
fmt.Fprintln(os.Stderr, "WARNING: revision mismatch")
|
|
}
|
|
return nil
|
|
},
|
|
}
|