image: stream img JSON & Decode in LoadImage

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack)
pallay · Nov 4, 2014 · 4dbbe4f · 4dbbe4f
1 parent 4bc28f4
commit 4dbbe4f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/image/image.go b/image/image.go
@@ -38,14 +38,18 @@ type Image struct {
 }
 
 func LoadImage(root string) (*Image, error) {
-	// Load the json data
-	jsonData, err := ioutil.ReadFile(jsonPath(root))
+	// Open the JSON file to decode by streaming
+	jsonSource, err := os.Open(jsonPath(root))
 	if err != nil {
 		return nil, err
 	}
+	defer jsonSource.Close()
+
 	img := &Image{}
+	dec := json.NewDecoder(jsonSource)
 
-	if err := json.Unmarshal(jsonData, img); err != nil {
+	// Decode the JSON data
+	if err := dec.Decode(img); err != nil {
 		return nil, err
 	}
 	if err := utils.ValidateID(img.ID); err != nil {