40b71adee3
This reverts commit 72a500e9e5.
Signed-off-by: Jessica Frazelle <princess@docker.com>
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
56 lines
1.4 KiB
Go
56 lines
1.4 KiB
Go
package runconfig
|
|
|
|
import (
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
)
|
|
|
|
type ExecConfig struct {
|
|
User string
|
|
Privileged bool
|
|
Tty bool
|
|
Container string
|
|
AttachStdin bool
|
|
AttachStderr bool
|
|
AttachStdout bool
|
|
Detach bool
|
|
Cmd []string
|
|
}
|
|
|
|
func ParseExec(cmd *flag.FlagSet, args []string) (*ExecConfig, error) {
|
|
var (
|
|
flStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Keep STDIN open even if not attached")
|
|
flTty = cmd.Bool([]string{"t", "-tty"}, false, "Allocate a pseudo-TTY")
|
|
flDetach = cmd.Bool([]string{"d", "-detach"}, false, "Detached mode: run command in the background")
|
|
flUser = cmd.String([]string{"u", "-user"}, "", "Username or UID (format: <name|uid>[:<group|gid>])")
|
|
execCmd []string
|
|
container string
|
|
)
|
|
cmd.Require(flag.Min, 2)
|
|
if err := cmd.ParseFlags(args, true); err != nil {
|
|
return nil, err
|
|
}
|
|
container = cmd.Arg(0)
|
|
parsedArgs := cmd.Args()
|
|
execCmd = parsedArgs[1:]
|
|
|
|
execConfig := &ExecConfig{
|
|
User: *flUser,
|
|
// TODO(vishh): Expose 'Privileged' once it is supported.
|
|
// + //Privileged: job.GetenvBool("Privileged"),
|
|
Tty: *flTty,
|
|
Cmd: execCmd,
|
|
Container: container,
|
|
Detach: *flDetach,
|
|
}
|
|
|
|
// If -d is not set, attach to everything by default
|
|
if !*flDetach {
|
|
execConfig.AttachStdout = true
|
|
execConfig.AttachStderr = true
|
|
if *flStdin {
|
|
execConfig.AttachStdin = true
|
|
}
|
|
}
|
|
|
|
return execConfig, nil
|
|
}
|