|
@@ -33,6 +33,7 @@ import (
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/parsers"
|
|
"github.com/docker/docker/pkg/parsers"
|
|
"github.com/docker/docker/pkg/parsers/filters"
|
|
"github.com/docker/docker/pkg/parsers/filters"
|
|
|
|
+ "github.com/docker/docker/pkg/promise"
|
|
"github.com/docker/docker/pkg/signal"
|
|
"github.com/docker/docker/pkg/signal"
|
|
"github.com/docker/docker/pkg/term"
|
|
"github.com/docker/docker/pkg/term"
|
|
"github.com/docker/docker/pkg/timeutils"
|
|
"github.com/docker/docker/pkg/timeutils"
|
|
@@ -648,7 +649,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
|
|
v.Set("stdout", "1")
|
|
v.Set("stdout", "1")
|
|
v.Set("stderr", "1")
|
|
v.Set("stderr", "1")
|
|
|
|
|
|
- cErr = utils.Go(func() error {
|
|
|
|
|
|
+ cErr = promise.Go(func() error {
|
|
return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, nil, nil)
|
|
return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, nil, nil)
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -2220,7 +2221,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- errCh = utils.Go(func() error {
|
|
|
|
|
|
+ errCh = promise.Go(func() error {
|
|
return cli.hijack("POST", "/containers/"+runResult.Get("Id")+"/attach?"+v.Encode(), config.Tty, in, out, stderr, hijacked, nil)
|
|
return cli.hijack("POST", "/containers/"+runResult.Get("Id")+"/attach?"+v.Encode(), config.Tty, in, out, stderr, hijacked, nil)
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
@@ -2477,7 +2478,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
|
|
stderr = cli.err
|
|
stderr = cli.err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- errCh = utils.Go(func() error {
|
|
|
|
|
|
+ errCh = promise.Go(func() error {
|
|
return cli.hijack("POST", "/exec/"+execID+"/start", execConfig.Tty, in, out, stderr, hijacked, execConfig)
|
|
return cli.hijack("POST", "/exec/"+execID+"/start", execConfig.Tty, in, out, stderr, hijacked, execConfig)
|
|
})
|
|
})
|
|
|
|
|