From 229b599259b24b30fdecbb70bdbba417a81e9723 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Jun 2015 16:56:09 -0700 Subject: [PATCH] fix version struct on old versions Signed-off-by: Jessica Frazelle --- api/server/server.go | 18 +++++++++++------- api/types/types.go | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 78728024a7..d7ec2d47d7 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -246,14 +246,18 @@ func (s *Server) postAuth(version version.Version, w http.ResponseWriter, r *htt func (s *Server) getVersion(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { v := &types.Version{ - Version: dockerversion.VERSION, - ApiVersion: api.APIVERSION, - GitCommit: dockerversion.GITCOMMIT, - GoVersion: runtime.Version(), - Os: runtime.GOOS, - Arch: runtime.GOARCH, - Experimental: utils.ExperimentalBuild(), + Version: dockerversion.VERSION, + ApiVersion: api.APIVERSION, + GitCommit: dockerversion.GITCOMMIT, + GoVersion: runtime.Version(), + Os: runtime.GOOS, + Arch: runtime.GOARCH, } + + if version.GreaterThanOrEqualTo("1.19") { + v.Experimental = utils.ExperimentalBuild() + } + if kernelVersion, err := kernel.GetKernelVersion(); err == nil { v.KernelVersion = kernelVersion.String() } diff --git a/api/types/types.go b/api/types/types.go index d33e38d584..dd01fbced1 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -132,7 +132,7 @@ type Version struct { Os string Arch string KernelVersion string `json:",omitempty"` - Experimental bool + Experimental bool `json:",omitempty"` } // GET "/info"