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

Use progress reader when uploading/downloading layers

Browse source
This commit is contained in:
shin- 2013-05-02 08:06:11 -07:00
parent 0f68042053
commit 0c5e76958b
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
registry.go
View file

@ -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)
}