Merge pull request #23 from mask-pp/fix_some_carps

fix some carps

Author: zeromake

makefile Makefilemakefile renamed to Makefile

@@ -63,8 +63,8 @@ type DebugCli struct {
 }
 
 // NewDebugCli new DebugCli
-func NewDebugCli(ops ...DebugCliOption) (*DebugCli, error) {
-	cli := &DebugCli{}
+func NewDebugCli(ctx context.Context, ops ...DebugCliOption) (*DebugCli, error) {
+	cli := &DebugCli{ctx: ctx}
 	if err := cli.Apply(ops...); err != nil {
 		return nil, err
 	}

internal/command/cli.go

@@ -48,8 +48,7 @@ func newExecCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.container = args[0]
 			options.command = args[1:]
-			_ = runExec(options)
-			return nil
+			return runExec(options)
 		},
 	}
 
@@ -98,23 +97,17 @@ func buildCli(ctx context.Context, options execOptions) (*DebugCli, error) {
 		opts = append(opts, WithClientConfig(dockerConfig))
 	} else {
 		name := conf.DockerConfigDefault
-		opt, ok := conf.DockerConfig[conf.DockerConfigDefault]
 		if options.name != "" {
 			name = options.name
-			opt, ok = conf.DockerConfig[options.name]
 		}
+		opt, ok := conf.DockerConfig[name]
 		if !ok {
 			return nil, errors.Errorf("not find %s docker config", name)
 		}
 		opts = append(opts, WithClientConfig(opt))
 	}
 
-	cli, err := NewDebugCli(opts...)
-	if err != nil {
-		return nil, err
-	}
-	cli.ctx = ctx
-	return cli, err
+	return NewDebugCli(ctx, opts...)
 }
 
 func runExec(options execOptions) error {
@@ -184,9 +177,9 @@ func runExec(options execOptions) error {
 	}
 
 	errCh := make(chan error, 1)
+	defer close(errCh)
 
 	go func() {
-		defer close(errCh)
 		errCh <- func() error {
 			return cli.ExecStart(options, resp.ID)
 		}()
@@ -197,8 +190,7 @@ func runExec(options execOptions) error {
 		}
 	}
 
-	err = <-errCh
-	if err != nil {
+	if err = <-errCh; err != nil {
 		logrus.Debugf("Error hijack: %s", err)
 		return err
 	}