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

fix progress message in client

Browse source
This commit is contained in:
Victor Vieux 2013-06-04 16:09:08 +00:00
parent 10ef4f7f39
commit 3922691fb9
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
commands.go
View file

@ -1379,7 +1379,7 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer) e
return err return err
} }
if m.Progress != "" { if m.Progress != "" {
fmt.Fprintf(out, "Downloading %s\r", m.Progress) fmt.Fprintf(out, "%s %s\r", m.Status, m.Progress)
} else if m.Error != "" { } else if m.Error != "" {
return fmt.Errorf(m.Error) return fmt.Errorf(m.Error)
} else { } else {

6
docs/sources/api/docker_remote_api.rst
View file

@ -564,7 +564,7 @@ Create an image
Content-Type: application/json Content-Type: application/json
{"status":"Pulling..."} {"status":"Pulling..."}
{"progress":"1/? (n/a)"} {"status":"Pulling", "progress":"1/? (n/a)"}
{"error":"Invalid..."} {"error":"Invalid..."}
... ...
@ -607,7 +607,7 @@ Insert a file in a image
Content-Type: application/json Content-Type: application/json
{"status":"Inserting..."} {"status":"Inserting..."}
{"progress":"1/? (n/a)"} {"status":"Inserting", "progress":"1/? (n/a)"}
{"error":"Invalid..."} {"error":"Invalid..."}
... ...
@ -734,7 +734,7 @@ Push an image on the registry
Content-Type: application/json Content-Type: application/json
{"status":"Pushing..."} {"status":"Pushing..."}
{"progress":"1/? (n/a)"} {"status":"Pushing", "progress":"1/? (n/a)"}
{"error":"Invalid..."} {"error":"Invalid..."}
... ...

2
server.go
View file

@ -573,7 +573,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgId,
} }
// Send the layer // Send the layer
if err := r.PushImageLayerRegistry(imgData.Id, utils.ProgressReader(layerData, int(layerData.Size), out, sf.FormatProgress("", "%v/%v (%v)"), sf), ep, token); err != nil { if err := r.PushImageLayerRegistry(imgData.Id, utils.ProgressReader(layerData, int(layerData.Size), out, sf.FormatProgress("Pushing", "%v/%v (%v)"), sf), ep, token); err != nil {
return err return err
} }
return nil return nil

2
utils/utils.go
View file

@ -608,7 +608,7 @@ func (sf *StreamFormatter) FormatError(err error) []byte {
func (sf *StreamFormatter) FormatProgress(action, str string) []byte { func (sf *StreamFormatter) FormatProgress(action, str string) []byte {
sf.used = true sf.used = true
if sf.json { if sf.json {
b, err := json.Marshal(&JsonMessage{Progress:str}) b, err := json.Marshal(&JsonMessage{Status: action, Progress:str})
if err != nil { if err != nil {
return nil return nil
} }