mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4921171587
This patch adds the untilRemoved option to the ContainerWait API which allows the client to wait until the container is not only exited but also removed. This patch also adds some more CLI integration tests for waiting for a created container and waiting with the new --until-removed flag. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Handle detach sequence in CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Update Container Wait Conditions Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Apply container wait changes to API 1.30 The set of changes to the containerWait API missed the cut for the Docker 17.05 release (API version 1.29). This patch bumps the version checks to use 1.30 instead. This patch also makes a minor update to a testfile which was added to the builder/dockerfile package. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Remove wait changes from CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address minor nits on wait changes - Changed the name of the tty Proxy wrapper to `escapeProxy` - Removed the unnecessary Error() method on container.State - Fixes a typo in comment (repeated word) Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Use router.WithCancel in the containerWait handler This handler previously added this functionality manually but now uses the existing wrapper which does it for us. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Add WaitCondition constants to api/types/container Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address more ContainerWait review comments - Update ContainerWait backend interface to not return pointer values for container.StateStatus type. - Updated container state's Wait() method comments to clarify that a context MUST be used for cancelling the request, setting timeouts, and to avoid goroutine leaks. - Removed unnecessary buffering when making channels in the client's ContainerWait methods. - Renamed result and error channels in client's ContainerWait methods to clarify that only a single result or error value would be sent on the channel. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Move container.WaitCondition type to separate file ... to avoid conflict with swagger-generated code for API response Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address more ContainerWait review comments Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
182 lines
4.3 KiB
Go
182 lines
4.3 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/api/errors"
|
|
"github.com/docker/docker/api/types/backend"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/container/stream"
|
|
"github.com/docker/docker/daemon/logger"
|
|
"github.com/docker/docker/pkg/stdcopy"
|
|
"github.com/docker/docker/pkg/term"
|
|
)
|
|
|
|
// ContainerAttach attaches to logs according to the config passed in. See ContainerAttachConfig.
|
|
func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerAttachConfig) error {
|
|
keys := []byte{}
|
|
var err error
|
|
if c.DetachKeys != "" {
|
|
keys, err = term.ToBytes(c.DetachKeys)
|
|
if err != nil {
|
|
return fmt.Errorf("Invalid detach keys (%s) provided", c.DetachKeys)
|
|
}
|
|
}
|
|
|
|
container, err := daemon.GetContainer(prefixOrName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if container.IsPaused() {
|
|
err := fmt.Errorf("Container %s is paused. Unpause the container before attach", prefixOrName)
|
|
return errors.NewRequestConflictError(err)
|
|
}
|
|
|
|
cfg := stream.AttachConfig{
|
|
UseStdin: c.UseStdin,
|
|
UseStdout: c.UseStdout,
|
|
UseStderr: c.UseStderr,
|
|
TTY: container.Config.Tty,
|
|
CloseStdin: container.Config.StdinOnce,
|
|
DetachKeys: keys,
|
|
}
|
|
container.StreamConfig.AttachStreams(&cfg)
|
|
|
|
inStream, outStream, errStream, err := c.GetStreams()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer inStream.Close()
|
|
|
|
if !container.Config.Tty && c.MuxStreams {
|
|
errStream = stdcopy.NewStdWriter(errStream, stdcopy.Stderr)
|
|
outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
|
|
}
|
|
|
|
if cfg.UseStdin {
|
|
cfg.Stdin = inStream
|
|
}
|
|
if cfg.UseStdout {
|
|
cfg.Stdout = outStream
|
|
}
|
|
if cfg.UseStderr {
|
|
cfg.Stderr = errStream
|
|
}
|
|
|
|
if err := daemon.containerAttach(container, &cfg, c.Logs, c.Stream); err != nil {
|
|
fmt.Fprintf(outStream, "Error attaching: %s\n", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ContainerAttachRaw attaches the provided streams to the container's stdio
|
|
func (daemon *Daemon) ContainerAttachRaw(prefixOrName string, stdin io.ReadCloser, stdout, stderr io.Writer, doStream bool, attached chan struct{}) error {
|
|
container, err := daemon.GetContainer(prefixOrName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
cfg := stream.AttachConfig{
|
|
UseStdin: stdin != nil,
|
|
UseStdout: stdout != nil,
|
|
UseStderr: stderr != nil,
|
|
TTY: container.Config.Tty,
|
|
CloseStdin: container.Config.StdinOnce,
|
|
}
|
|
container.StreamConfig.AttachStreams(&cfg)
|
|
close(attached)
|
|
if cfg.UseStdin {
|
|
cfg.Stdin = stdin
|
|
}
|
|
if cfg.UseStdout {
|
|
cfg.Stdout = stdout
|
|
}
|
|
if cfg.UseStderr {
|
|
cfg.Stderr = stderr
|
|
}
|
|
|
|
return daemon.containerAttach(container, &cfg, false, doStream)
|
|
}
|
|
|
|
func (daemon *Daemon) containerAttach(c *container.Container, cfg *stream.AttachConfig, logs, doStream bool) error {
|
|
if logs {
|
|
logDriver, logCreated, err := daemon.getLogger(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if logCreated {
|
|
defer func() {
|
|
if err = logDriver.Close(); err != nil {
|
|
logrus.Errorf("Error closing logger: %v", err)
|
|
}
|
|
}()
|
|
}
|
|
cLog, ok := logDriver.(logger.LogReader)
|
|
if !ok {
|
|
return logger.ErrReadLogsNotSupported
|
|
}
|
|
logs := cLog.ReadLogs(logger.ReadConfig{Tail: -1})
|
|
defer logs.Close()
|
|
|
|
LogLoop:
|
|
for {
|
|
select {
|
|
case msg, ok := <-logs.Msg:
|
|
if !ok {
|
|
break LogLoop
|
|
}
|
|
if msg.Source == "stdout" && cfg.Stdout != nil {
|
|
cfg.Stdout.Write(msg.Line)
|
|
}
|
|
if msg.Source == "stderr" && cfg.Stderr != nil {
|
|
cfg.Stderr.Write(msg.Line)
|
|
}
|
|
case err := <-logs.Err:
|
|
logrus.Errorf("Error streaming logs: %v", err)
|
|
break LogLoop
|
|
}
|
|
}
|
|
}
|
|
|
|
daemon.LogContainerEvent(c, "attach")
|
|
|
|
if !doStream {
|
|
return nil
|
|
}
|
|
|
|
if cfg.Stdin != nil {
|
|
r, w := io.Pipe()
|
|
go func(stdin io.ReadCloser) {
|
|
defer w.Close()
|
|
defer logrus.Debug("Closing buffered stdin pipe")
|
|
io.Copy(w, stdin)
|
|
}(cfg.Stdin)
|
|
cfg.Stdin = r
|
|
}
|
|
|
|
if !c.Config.OpenStdin {
|
|
cfg.Stdin = nil
|
|
}
|
|
|
|
if c.Config.StdinOnce && !c.Config.Tty {
|
|
// Wait for the container to stop before returning.
|
|
waitChan := c.Wait(context.Background(), container.WaitConditionNotRunning)
|
|
defer func() {
|
|
_ = <-waitChan // Ignore returned exit code.
|
|
}()
|
|
}
|
|
|
|
ctx := c.InitAttachContext()
|
|
err := <-c.StreamConfig.CopyStreams(ctx, cfg)
|
|
if err != nil {
|
|
if _, ok := err.(term.EscapeError); ok {
|
|
daemon.LogContainerEvent(c, "detach")
|
|
} else {
|
|
logrus.Errorf("attach failed with error: %v", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|