Merge pull request #592 from zzchun/0.1.x

fix: change "GOVersion" to go1.9.1
AliyunContainerService · Jan 17, 2018 · f96ec89 · f96ec89
2 parents d096588 + 4ee8506
commit f96ec89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/daemon/mgr/system.go b/daemon/mgr/system.go
@@ -38,7 +38,7 @@ func (mgr *SystemManager) Version() (types.SystemVersion, error) {
 		Arch:       runtime.GOARCH,
 		BuildTime:  version.BuildTime,
 		GitCommit:  "",
-		GoVersion:  runtime.Version(),
+		GoVersion:  version.GOVersion,
 		// TODO:  add a pkg to support getting kernel version
 		// KernelVersion: kernel.Version(),
 		Os:      runtime.GOOS,

diff --git a/test/cli_version_test.go b/test/cli_version_test.go
@@ -31,7 +31,7 @@ func (suite *PouchVersionSuite) TestPouchVersion(c *check.C) {
 	res := command.PouchRun("version").Assert(c, icmd.Success)
 	kv := versionToKV(res.Combined())
 
-	c.Assert(kv["GoVersion"], check.Equals, runtime.Version())
+	c.Assert(kv["GoVersion"], check.Equals, version.GOVersion)
 	c.Assert(kv["APIVersion"], check.Equals, version.APIVersion)
 	c.Assert(kv["Arch"], check.Equals, runtime.GOARCH)
 	c.Assert(kv["Os"], check.Equals, runtime.GOOS)

diff --git a/version/version.go b/version/version.go
@@ -11,3 +11,6 @@ var BuildTime = time.Now().Format(time.RFC3339Nano)
 
 // APIVersion means the api version daemon serves
 var APIVersion = "1.24"
+
+// GOVersion is the go version to build Pouch
+var GOVersion = "go1.9.1"