Propagate version and buildtime to cli

instead of setting it from there...
balena-os · Oct 14, 2019 · 4c3c293 · 4c3c293
1 parent 243b748
commit 4c3c293
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/cmd/a2o-migrate/Makefile b/cmd/a2o-migrate/Makefile
@@ -1,7 +1,8 @@
 PWD := $(shell pwd)
 VERSION ?= $(shell git describe --tag --always)
 
-GO_BUILDINFO=-X main.GitVersion=$(VERSION) -X main.BuildTime=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)
+PROJECT=github.com/docker/docker/cmd/a2o-migrate
+GO_BUILDINFO=-X $(PROJECT).gitVersion=$(VERSION) -X $(PROJECT).buildTime=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)
 GO_LDFLAGS=-extldflags "-fno-PIC -static"
 GO_BUILDFLAGS=-ldflags '$(GO_LDFLAGS) $(GO_BUILDINFO)' -tags 'osusergo netgo static_build'
 

diff --git a/cmd/a2o-migrate/a2o-migrate.go b/cmd/a2o-migrate/a2o-migrate.go
@@ -11,8 +11,8 @@ import (
 )
 
 var ( // auto generated on build
-	GitVersion = "undefined"
-	BuildTime  = "undefined"
+	gitVersion = "undefined"
+	buildTime  = "undefined"
 )
 
 var ( // flag values
@@ -53,7 +53,7 @@ func Main() {
 
 	switch {
 	case printVersion:
-		fmt.Fprintf(os.Stdout, "a2o-migrate version %s (build %s)\n", GitVersion, BuildTime)
+		fmt.Fprintf(os.Stdout, "a2o-migrate version %s (build %s)\n", gitVersion, buildTime)
 		os.Exit(0)
 
 	case runMigration:

diff --git a/cmd/a2o-migrate/cli/main.go b/cmd/a2o-migrate/cli/main.go
@@ -4,13 +4,6 @@ import (
 	"github.com/docker/docker/cmd/a2o-migrate"
 )
 
-var ( // auto generated on build
-	GitVersion = "undefined"
-	BuildTime  = "undefined"
-)
-
 func main() {
-	a2omigrate.GitVersion = GitVersion
-	a2omigrate.BuildTime = BuildTime
 	a2omigrate.Main()
 }