Merge pull request #19054 from calavera/remove_version_from_types

Remove version package from API types.
Upstream-commit: 972653c310a400a26b8c618288b2c0a328af4c5e
Component: engine

components/engine/api/client/version.go

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

components/engine/api/server/router/system/system_routes.go

@@ -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 {
 	info := s.backend.SystemVersion()
-	info.APIVersion = api.DefaultVersion
+	info.APIVersion = api.DefaultVersion.String()
 
 	return httputils.WriteJSON(w, http.StatusOK, info)
 }

components/engine/api/types/types.go

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