Move docker types to v1 API

container/docker/docker.go

@@ -20,23 +20,24 @@ import (
 	"strconv"
 	"strings"
 
+	dockertypes "github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 
-	dockertypes "github.com/docker/engine-api/types"
+	"github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/utils/machine"
 )
 
-func Status() (DockerStatus, error) {
+func Status() (v1.DockerStatus, error) {
 	client, err := Client()
 	if err != nil {
-		return DockerStatus{}, fmt.Errorf("unable to communicate with docker daemon: %v", err)
+		return v1.DockerStatus{}, fmt.Errorf("unable to communicate with docker daemon: %v", err)
 	}
 	dockerInfo, err := client.Info(context.Background())
 	if err != nil {
-		return DockerStatus{}, err
+		return v1.DockerStatus{}, err
 	}
 
-	out := DockerStatus{}
+	out := v1.DockerStatus{}
 	out.Version = VersionString()
 	out.KernelVersion = machine.KernelVersion()
 	out.OS = dockerInfo.OperatingSystem
@@ -53,7 +54,7 @@ func Status() (DockerStatus, error) {
 	return out, nil
 }
 
-func Images() ([]DockerImage, error) {
+func Images() ([]v1.DockerImage, error) {
 	client, err := Client()
 	if err != nil {
 		return nil, fmt.Errorf("unable to communicate with docker daemon: %v", err)
@@ -63,14 +64,14 @@ func Images() ([]DockerImage, error) {
 		return nil, err
 	}
 
-	out := []DockerImage{}
+	out := []v1.DockerImage{}
 	const unknownTag = "<none>:<none>"
 	for _, image := range images {
 		if len(image.RepoTags) == 1 && image.RepoTags[0] == unknownTag {
 			// images with repo or tags are uninteresting.
 			continue
 		}
-		di := DockerImage{
+		di := v1.DockerImage{
 			ID:          image.ID,
 			RepoTags:    image.RepoTags,
 			Created:     image.Created,

info/v1/docker.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Types used for docker containers.
-package docker
+package v1
 
 type DockerStatus struct {
 	Version       string            `json:"version"`

manager/manager.go

@@ -112,10 +112,10 @@ type Manager interface {
 	CloseEventChannel(watch_id int)
 
 	// Get status information about docker.
-	DockerInfo() (docker.DockerStatus, error)
+	DockerInfo() (info.DockerStatus, error)
 
 	// Get details about interesting docker images.
-	DockerImages() ([]docker.DockerImage, error)
+	DockerImages() ([]info.DockerImage, error)
 
 	// Returns debugging information. Map of lines per category.
 	DebugInfo() map[string][]string
@@ -1124,11 +1124,11 @@ func parseEventsStoragePolicy() events.StoragePolicy {
 	return policy
 }
 
-func (m *manager) DockerImages() ([]docker.DockerImage, error) {
+func (m *manager) DockerImages() ([]info.DockerImage, error) {
 	return docker.Images()
 }
 
-func (m *manager) DockerInfo() (docker.DockerStatus, error) {
+func (m *manager) DockerInfo() (info.DockerStatus, error) {
 	return docker.Status()
 }
 

pages/docker.go

@@ -31,7 +31,7 @@ import (
 
 const DockerPage = "/docker/"
 
-func toStatusKV(status docker.DockerStatus) ([]keyVal, []keyVal) {
+func toStatusKV(status info.DockerStatus) ([]keyVal, []keyVal) {
 	ds := []keyVal{
 		{Key: "Driver", Value: status.Driver},
 	}

pages/pages.go

@@ -21,7 +21,6 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/google/cadvisor/container/docker"
 	httpmux "github.com/google/cadvisor/http/mux"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/manager"
@@ -63,7 +62,7 @@ type pageData struct {
 	Root                   string
 	DockerStatus           []keyVal
 	DockerDriverStatus     []keyVal
-	DockerImages           []docker.DockerImage
+	DockerImages           []info.DockerImage
 }
 
 func init() {