docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bump to master

This commit is contained in:
Victor Vieux 2013-06-05 15:30:45 +00:00
parent 6255112926 068076f775
commit ce0041832c
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands.go
View File

@ -1223,6 +1223,9 @@ func (cli *DockerCli) CmdRun(args ...string) error {
return err return err
} }
if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.ID)
}
if connections > 0 { if connections > 0 {
chErrors := make(chan error, connections) chErrors := make(chan error, connections)
cli.monitorTtySize(out.ID) cli.monitorTtySize(out.ID)
@ -1257,9 +1260,6 @@ func (cli *DockerCli) CmdRun(args ...string) error {
connections -= 1 connections -= 1
} }
} }
if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.ID)
}
return nil return nil
} }
@ -1352,7 +1352,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 {

2
docs/sources/api/docker_remote_api.rst
View File

@ -56,7 +56,7 @@ Uses json stream instead of HTML hijack, it looks like this:
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..."}
... ...

6
docs/sources/api/docker_remote_api_v1.1.rst
View File

@ -557,7 +557,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..."}
... ...
@ -591,7 +591,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..."}
... ...
@ -710,7 +710,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..."}
... ...

6
docs/sources/api/docker_remote_api_v1.2.rst
View File

@ -557,7 +557,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..."}
... ...
@ -591,7 +591,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..."}
... ...
@ -711,7 +711,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
} }