daemon: use context error rather than inventing new one
Signed-off-by: Stephen J Day <stephen.day@docker.com> Upstream-commit: d84da75f01e0a0d20fbddb8b051a325e3b21eded Component: engine
This commit is contained in:
@ -270,7 +270,7 @@ func (d *Daemon) ContainerExecStart(ctx context.Context, name string, stdin io.R
|
||||
case <-attachErr:
|
||||
// TERM signal worked
|
||||
}
|
||||
return fmt.Errorf("context cancelled")
|
||||
return ctx.Err()
|
||||
case err := <-attachErr:
|
||||
if err != nil {
|
||||
if _, ok := err.(term.EscapeError); !ok {
|
||||
|
||||
Reference in New Issue
Block a user