github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 12:07:41 +00:00
Code Issues Projects Releases Wiki Activity

cli: Add a 'version' version

Browse Source 
Pass version and git commit hash from the Makefile
into main.go. Add a 'version' subcommand to print
the information.

While at it also tweak the help output to only print the
command name and not the entire path.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-04-05 23:53:35 +01:00
parent f76f2b6654
commit 3e53aab4ce
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -2,7 +2,10 @@
default: bin/moby moby-initrd.img default: bin/moby moby-initrd.img
all: default all: default
GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a VERSION="0.0" # dummy for now
GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=mobylinux/go-compile:a2ff853b00d687f845d0f67189fa645a567c006e@sha256:09fff8a5c022fc9ead35b2779209c043196b09193c6e61d98603d402c0971f03
GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]') GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]')
GOARCH=amd64 GOARCH=amd64
@ -16,7 +19,7 @@ endif
MOBY_DEPS=$(wildcard src/cmd/moby/*.go) Makefile vendor.conf MOBY_DEPS=$(wildcard src/cmd/moby/*.go) Makefile vendor.conf
MOBY_DEPS+=$(wildcard src/initrd/*.go) $(wildcard src/pad4/*.go) MOBY_DEPS+=$(wildcard src/initrd/*.go) $(wildcard src/pad4/*.go)
bin/moby: $(MOBY_DEPS) | bin bin/moby: $(MOBY_DEPS) | bin
tar cf - vendor src/initrd src/pad4 -C src/cmd/moby . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf - tar cf - vendor src/initrd src/pad4 -C src/cmd/moby . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ | tar xf -
touch $@ touch $@
INFRAKIT_DEPS=$(wildcard src/cmd/infrakit-instance-hyperkit/*.go) Makefile vendor.conf INFRAKIT_DEPS=$(wildcard src/cmd/infrakit-instance-hyperkit/*.go) Makefile vendor.conf

20
src/cmd/moby/main.go
View File

@ -4,12 +4,19 @@ import (
"flag" "flag"
"fmt" "fmt"
"os" "os"
"path/filepath"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
var ( var (
defaultLogFormatter = &log.TextFormatter{} defaultLogFormatter = &log.TextFormatter{}
// Version is the human-readable version
Version = "unknown"
// GitCommit hash, set at compile time
GitCommit = "unknown"
) )
// infoFormatter overrides the default format for Info() log events to // infoFormatter overrides the default format for Info() log events to
@ -24,15 +31,22 @@ func (f *infoFormatter) Format(entry *log.Entry) ([]byte, error) {
return defaultLogFormatter.Format(entry) return defaultLogFormatter.Format(entry)
} }
func version() {
fmt.Printf("%s version %s\n", filepath.Base(os.Args[0]), Version)
fmt.Printf("commit: %s\n", GitCommit)
os.Exit(0)
}
func main() { func main() {
flag.Usage = func() { flag.Usage = func() {
fmt.Printf("USAGE: %s [options] COMMAND\n\n", os.Args[0]) fmt.Printf("USAGE: %s [options] COMMAND\n\n", filepath.Base(os.Args[0]))
fmt.Printf("Commands:\n") fmt.Printf("Commands:\n")
fmt.Printf(" build Build a Moby image from a YAML file\n") fmt.Printf(" build Build a Moby image from a YAML file\n")
fmt.Printf(" run Run a Moby image on a local hypervisor\n") fmt.Printf(" run Run a Moby image on a local hypervisor\n")
fmt.Printf(" version Print version information\n")
fmt.Printf(" help Print this message\n") fmt.Printf(" help Print this message\n")
fmt.Printf("\n") fmt.Printf("\n")
fmt.Printf("Run '%s COMMAND --help' for more information on the command\n", os.Args[0]) fmt.Printf("Run '%s COMMAND --help' for more information on the command\n", filepath.Base(os.Args[0]))
fmt.Printf("\n") fmt.Printf("\n")
fmt.Printf("Options:\n") fmt.Printf("Options:\n")
flag.PrintDefaults() flag.PrintDefaults()
@ -69,6 +83,8 @@ func main() {
build(args[1:]) build(args[1:])
case "run": case "run":
run(args[1:]) run(args[1:])
case "version":
version()
case "help": case "help":
flag.Usage() flag.Usage()
default: default: