Remove redundant parameter and fix typos

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
This commit is contained in:
yuexiao-wang 2016-11-10 10:39:23 +08:00
parent 01de03c7d0
commit b6fe99530c
3 changed files with 6 additions and 8 deletions

View File

@ -65,7 +65,7 @@ func NewExecCommand(dockerCli *command.DockerCli) *cobra.Command {
}
func runExec(dockerCli *command.DockerCli, opts *execOptions, container string, execCmd []string) error {
execConfig, err := parseExec(opts, container, execCmd)
execConfig, err := parseExec(opts, execCmd)
// just in case the ParseExec does not exit
if container == "" || err != nil {
return cli.StatusError{StatusCode: 1}
@ -181,14 +181,13 @@ func getExecExitCode(ctx context.Context, client apiclient.ContainerAPIClient, e
// parseExec parses the specified args for the specified command and generates
// an ExecConfig from it.
func parseExec(opts *execOptions, container string, execCmd []string) (*types.ExecConfig, error) {
func parseExec(opts *execOptions, execCmd []string) (*types.ExecConfig, error) {
execConfig := &types.ExecConfig{
User: opts.user,
Privileged: opts.privileged,
Tty: opts.tty,
Cmd: execCmd,
Detach: opts.detach,
// container is not used here
}
// If -d is not set, attach to everything by default

View File

@ -8,7 +8,6 @@ import (
type arguments struct {
options execOptions
container string
execCmd []string
}
@ -73,7 +72,7 @@ func TestParseExec(t *testing.T) {
}
for valid, expectedExecConfig := range valids {
execConfig, err := parseExec(&valid.options, valid.container, valid.execCmd)
execConfig, err := parseExec(&valid.options, valid.execCmd)
if err != nil {
t.Fatal(err)
}