Merge branch 'vbatts-v2_hacking' of github.com:vbatts/docker into vba…

…tts-v2_hacking
dmcgowan · Aug 29, 2014 · 3726654 · 3726654
2 parents e710880 + b773296
commit 3726654
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/graph/manifest.go b/graph/manifest.go
@@ -29,9 +29,9 @@ func (s *TagStore) CmdManifest(job *engine.Job) engine.Status {
 		return job.Error(err)
 	}
 
-	manifest := map[string]interface{}{
-		"name": remoteName,
-		"tag":  tag,
+	manifest := &registry.ManifestData{
+		Name: remoteName,
+		Tag:  tag,
 	}
 	localRepo, exists := s.Repositories[name]
 	if !exists {
@@ -46,7 +46,7 @@ func (s *TagStore) CmdManifest(job *engine.Job) engine.Status {
 	layersSeen := make(map[string]bool)
 
 	layer, err := s.graph.Get(layerId)
-	manifest["architecture"] = layer.Architecture
+	manifest.Architecture = layer.Architecture
 	var metadata runconfig.Config
 	metadata = *layer.Config
 	history := make(map[string]string)
@@ -86,9 +86,8 @@ func (s *TagStore) CmdManifest(job *engine.Job) engine.Status {
 		history[tarId] = string(jsonData)
 	}
 
-	manifest["tarsum"] = tarsums
-	manifest["metadata"] = &metadata
-	manifest["history"] = history
+	manifest.BlobSums = tarsums
+	manifest.History = history
 
 	manifestBytes, err := json.MarshalIndent(manifest, "", "   ")
 	if err != nil {

diff --git a/registry/types.go b/registry/types.go
@@ -32,6 +32,14 @@ type RegistryInfo struct {
 	Standalone bool   `json:"standalone"`
 }
 
+type ManifestData struct {
+	Name         string            `json:"name"`
+	Tag          string            `json:"tag"`
+	Architecture string            `json:"architecture"`
+	BlobSums     []string          `json:"blobSums"`
+	History      map[string]string `json:"history"`
+}
+
 type APIVersion int
 
 func (av APIVersion) String() string {