kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #13731 from jfrazelle/fix-version-on-old-versions

Browse source 
fix version struct on old versions
This commit is contained in:
Arnaud Porterie 2015-06-03 17:24:53 -07:00
commit f37e6e180f
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/server/server.go
View file

@ -252,8 +252,12 @@ func (s *Server) getVersion(version version.Version, w http.ResponseWriter, r *h
GoVersion: runtime.Version(), GoVersion: runtime.Version(),
Os: runtime.GOOS, Os: runtime.GOOS,
Arch: runtime.GOARCH, Arch: runtime.GOARCH,
Experimental: utils.ExperimentalBuild(),
} }
if version.GreaterThanOrEqualTo("1.19") {
v.Experimental = utils.ExperimentalBuild()
}
if kernelVersion, err := kernel.GetKernelVersion(); err == nil { if kernelVersion, err := kernel.GetKernelVersion(); err == nil {
v.KernelVersion = kernelVersion.String() v.KernelVersion = kernelVersion.String()
} }

2
api/types/types.go
View file

@ -132,7 +132,7 @@ type Version struct {
Os string Os string
Arch string Arch string
KernelVersion string `json:",omitempty"` KernelVersion string `json:",omitempty"`
Experimental bool Experimental bool `json:",omitempty"`
} }
// GET "/info" // GET "/info"