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

api: add Info struct for v1.24

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-11-07 10:01:14 +01:00
parent afb1119c85
commit 667315576f
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/server/router/system/system_routes.go
View file

@ -16,6 +16,7 @@ import (
"github.com/docker/docker/api/types/registry"
timetypes "github.com/docker/docker/api/types/time"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/api/types/versions/v1p24"
"github.com/docker/docker/pkg/ioutils"
"golang.org/x/net/context"
)
@ -41,21 +42,16 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
// TODO: handle this conversion in engine-api
type oldInfo struct {
*types.InfoBase
ExecutionDriver string
SecurityOptions []string
}
old := &oldInfo{
oldInfo := &v1p24.Info{
InfoBase: info.InfoBase,
ExecutionDriver: "<not supported>",
}
for _, s := range info.SecurityOptions {
if s.Key == "Name" {
old.SecurityOptions = append(old.SecurityOptions, s.Value)
oldInfo.SecurityOptions = append(oldInfo.SecurityOptions, s.Value)
}
}
return httputils.WriteJSON(w, http.StatusOK, old)
return httputils.WriteJSON(w, http.StatusOK, oldInfo)
}
return httputils.WriteJSON(w, http.StatusOK, info)
}

10
api/types/versions/v1p24/types.go Normal file
View file

@ -0,0 +1,10 @@
// Package v1p24 provides specific API types for the API version 1, patch 24.
package v1p24
import "github.com/docker/docker/api/types"
type Info struct {
*types.InfoBase
ExecutionDriver string
SecurityOptions []string
}