From 0c5e76958bbfd5c4d315d75262381cbae5c5f048 Mon Sep 17 00:00:00 2001 From: shin- Date: Thu, 2 May 2013 08:06:11 -0700 Subject: [PATCH] Use progress reader when uploading/downloading layers --- registry.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/registry.go b/registry.go index e8fcd1fd11..b5fd734bcd 100644 --- a/registry.go +++ b/registry.go @@ -390,13 +390,13 @@ func pushImageRec(graph *Graph, stdout io.Writer, img *Image, registry string, t fmt.Fprintf(stdout, "Pushing %s fs layer\r\n", img.Id) - layerData, err := Tar(path.Join(graph.Root, img.Id, "layer"), Xz) + layerData, err := graph.TempLayerArchive(img.Id, Xz, stdout) if err != nil { return fmt.Errorf("Failed to generate layer archive: %s", err) } req3, err := http.NewRequest("PUT", registry+"/images/"+img.Id+"/layer", - layerData) + ProgressReader(layerData, -1, stdout, "")) if err != nil { return err } @@ -404,7 +404,6 @@ func pushImageRec(graph *Graph, stdout io.Writer, img *Image, registry string, t req3.ContentLength = -1 req3.TransferEncoding = []string{"chunked"} req3.Header.Set("Authorization", "Token " + strings.Join(token, ",")) - fmt.Printf("%v", req3.Header) res3, err := doWithCookies(client, req3) if err != nil { return fmt.Errorf("Failed to upload layer: %s", err) @@ -491,7 +490,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re uploadedImages, err := graph.getImagesInRepository(remote, authConfig) if err != nil { - return fmt.Errorf("Error occured while fetching the list") + return fmt.Errorf("Error occured while fetching the list: %v", err) }