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

move stdcopy to pkg/stdcopy 

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack 2014-09-17 18:04:56 +03:00
parent 459b403c2f
commit 1f03e60c2a
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/client/hijack.go
View File

@ -14,6 +14,7 @@ import (
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/log" "github.com/docker/docker/pkg/log"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
) )
@ -96,7 +97,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
if setRawTerminal && stdout != nil { if setRawTerminal && stdout != nil {
_, err = io.Copy(stdout, br) _, err = io.Copy(stdout, br)
} else { } else {
_, err = utils.StdCopy(stdout, stderr, br) _, err = stdcopy.StdCopy(stdout, stderr, br)
} }
log.Debugf("[hijack] End of stdout") log.Debugf("[hijack] End of stdout")
return err return err

3
api/client/utils.go
View File

@ -22,6 +22,7 @@ import (
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/engine" "github.com/docker/docker/engine"
"github.com/docker/docker/pkg/log" "github.com/docker/docker/pkg/log"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
@ -174,7 +175,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in
if setRawTerminal { if setRawTerminal {
_, err = io.Copy(stdout, resp.Body) _, err = io.Copy(stdout, resp.Body)
} else { } else {
_, err = utils.StdCopy(stdout, stderr, resp.Body) _, err = stdcopy.StdCopy(stdout, stderr, resp.Body)
} }
log.Debugf("[stream] End of stdout") log.Debugf("[stream] End of stdout")
return err return err

13
api/server/server.go
View File

@ -28,6 +28,7 @@ import (
"github.com/docker/docker/pkg/listenbuffer" "github.com/docker/docker/pkg/listenbuffer"
"github.com/docker/docker/pkg/log" "github.com/docker/docker/pkg/log"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/systemd" "github.com/docker/docker/pkg/systemd"
"github.com/docker/docker/pkg/version" "github.com/docker/docker/pkg/version"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
@ -399,8 +400,8 @@ func getContainersLogs(eng *engine.Engine, version version.Version, w http.Respo
outStream = utils.NewWriteFlusher(w) outStream = utils.NewWriteFlusher(w)
if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version.GreaterThanOrEqualTo("1.6") { if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version.GreaterThanOrEqualTo("1.6") {
errStream = utils.NewStdWriter(outStream, utils.Stderr) errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
outStream = utils.NewStdWriter(outStream, utils.Stdout) outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
} else { } else {
errStream = outStream errStream = outStream
} }
@ -843,8 +844,8 @@ func postContainersAttach(eng *engine.Engine, version version.Version, w http.Re
fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n") fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version.GreaterThanOrEqualTo("1.6") { if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version.GreaterThanOrEqualTo("1.6") {
errStream = utils.NewStdWriter(outStream, utils.Stderr) errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
outStream = utils.NewStdWriter(outStream, utils.Stdout) outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
} else { } else {
errStream = outStream errStream = outStream
} }
@ -1091,8 +1092,8 @@ func postContainerExecStart(eng *engine.Engine, version version.Version, w http.
fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n") fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
if !job.GetenvBool("Tty") && version.GreaterThanOrEqualTo("1.6") { if !job.GetenvBool("Tty") && version.GreaterThanOrEqualTo("1.6") {
errStream = utils.NewStdWriter(outStream, utils.Stderr) errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
outStream = utils.NewStdWriter(outStream, utils.Stdout) outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
} else { } else {
errStream = outStream errStream = outStream
} }

1
pkg/stdcopy/MAINTAINERS Normal file
View File

@ -0,0 +1 @@
Cristian Staretu <cristian.staretu@gmail.com> (@unclejack)

2
utils/stdcopy.go → pkg/stdcopy/stdcopy.go
View File

@ -1,4 +1,4 @@
package utils package stdcopy
import ( import (
"encoding/binary" "encoding/binary"