docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove version package from API types. 

It's an internal type that only extends string.

Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
David Calavera 2016-01-04 12:43:38 -05:00
parent db738dd77f
commit 9961816ade
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/client/version.go
View File

@ -9,7 +9,6 @@ import (
Cli "github.com/docker/docker/cli" Cli "github.com/docker/docker/cli"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/version"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
) )
@ -57,7 +56,7 @@ func (cli *DockerCli) CmdVersion(args ...string) (err error) {
vd := types.VersionResponse{ vd := types.VersionResponse{
Client: &types.Version{ Client: &types.Version{
Version: dockerversion.Version, Version: dockerversion.Version,
APIVersion: version.Version(cli.client.ClientVersion()), APIVersion: cli.client.ClientVersion(),
GoVersion: runtime.Version(), GoVersion: runtime.Version(),
GitCommit: dockerversion.GitCommit, GitCommit: dockerversion.GitCommit,
BuildTime: dockerversion.BuildTime, BuildTime: dockerversion.BuildTime,

2
api/server/router/system/system_routes.go
View File

@ -37,7 +37,7 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
func (s *systemRouter) getVersion(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func (s *systemRouter) getVersion(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
info := s.backend.SystemVersion() info := s.backend.SystemVersion()
info.APIVersion = api.DefaultVersion info.APIVersion = api.DefaultVersion.String()
return httputils.WriteJSON(w, http.StatusOK, info) return httputils.WriteJSON(w, http.StatusOK, info)
} }

3
api/types/types.go
View File

@ -7,7 +7,6 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/pkg/version"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
) )
@ -178,7 +177,7 @@ type ContainerProcessList struct {
// GET "/version" // GET "/version"
type Version struct { type Version struct {
Version string Version string
APIVersion version.Version `json:"ApiVersion"` APIVersion string `json:"ApiVersion"`
GitCommit string GitCommit string
GoVersion string GoVersion string
Os string Os string