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

Move version command into package

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-10-25 11:14:09 -04:00
parent 4743f1fc4c
commit 2dac1b6963
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/ctr/version.go → cmd/ctr/commands/version/version.go
View File

@ -1,21 +1,19 @@
package main package version
import ( import (
"fmt" "fmt"
"os" "os"
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/version" "github.com/google/cadvisor/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
var versionCommand = cli.Command{ // Command is a cli ommand to output the client and containerd server version
var Command = cli.Command{
Name: "version", Name: "version",
Usage: "print the version", Usage: "print the client and server versions",
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
if context.NArg() > 0 {
return fmt.Errorf("no argument expected")
}
fmt.Println("Client:") fmt.Println("Client:")
fmt.Printf(" Version: %s\n", version.Version) fmt.Printf(" Version: %s\n", version.Version)
fmt.Printf(" Revision: %s\n", version.Revision) fmt.Printf(" Revision: %s\n", version.Revision)
@ -29,7 +27,6 @@ var versionCommand = cli.Command{
if err != nil { if err != nil {
return err return err
} }
fmt.Println("Server:") fmt.Println("Server:")
fmt.Printf(" Version: %s\n", v.Version) fmt.Printf(" Version: %s\n", v.Version)
fmt.Printf(" Revision: %s\n", v.Revision) fmt.Printf(" Revision: %s\n", v.Revision)

3
cmd/ctr/main.go
View File

@ -6,6 +6,7 @@ import (
"log" "log"
"os" "os"
versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/server" "github.com/containerd/containerd/server"
"github.com/containerd/containerd/version" "github.com/containerd/containerd/version"
@ -81,7 +82,7 @@ containerd CLI
snapshotCommand, snapshotCommand,
tasksCommand, tasksCommand,
pluginsCommand, pluginsCommand,
versionCommand, versionCmd.Command,
}, extraCmds...) }, extraCmds...)
app.Before = func(context *cli.Context) error { app.Before = func(context *cli.Context) error {
if context.GlobalBool("debug") { if context.GlobalBool("debug") {