handle container sattus

Author: mask-pp

internal/command/cli.go

@@ -8,23 +8,23 @@ import (
 	"strings"
 	"time"
 
-	dockerImage "github.com/docker/docker/api/types/image"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
+	dockerImage "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/moby/term"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+
 	"github.com/zeromake/docker-debug/internal/config"
 	"github.com/zeromake/docker-debug/pkg/opts"
-	"github.com/zeromake/docker-debug/pkg/tty"
-
-	"github.com/docker/docker/client"
 	"github.com/zeromake/docker-debug/pkg/stream"
+	"github.com/zeromake/docker-debug/pkg/tty"
 )
 
 const (
@@ -446,6 +446,32 @@ func (cli *DebugCli) ExecStart(options execOptions, execID string) error {
 	return getExecExitStatus(cli.ctx, cli.client, execID)
 }
 
+// WatchContainer watch container
+func (cli *DebugCli) WatchContainer(ctx context.Context, containerID string) error {
+	subCtx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	filterArgs := filters.NewArgs()
+	filterArgs.Add("container", containerID)
+	messages, errs := cli.client.Events(subCtx, events.ListOptions{
+		Filters: filterArgs,
+	})
+
+	for {
+		select {
+		case event := <-messages:
+			if event.Type == events.ContainerEventType {
+				switch event.Action {
+				case events.ActionDestroy, events.ActionDie, events.ActionKill, events.ActionStop:
+					return nil
+				}
+			}
+		case err := <-errs:
+			return err
+		}
+	}
+}
+
 func getExecExitStatus(ctx context.Context, apiClient client.ContainerAPIClient, execID string) error {
 	resp, err := apiClient.ContainerExecInspect(ctx, execID)
 	if err != nil {

internal/command/root.go

@@ -2,16 +2,12 @@ package command
 
 import (
 	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
 	"github.com/zeromake/docker-debug/internal/config"
-	"github.com/zeromake/docker-debug/pkg/tty"
 )
 
 var rootCmd = newExecCommand()
@@ -114,63 +110,33 @@ func runExec(options execOptions) error {
 	var ctx, cancel = context.WithCancel(context.Background())
 	defer cancel()
 	logrus.SetLevel(logrus.ErrorLevel)
-	var containerID string
+
 	cli, err := buildCli(ctx, options)
 	if err != nil {
 		return err
 	}
-	go func() {
-		c := make(chan os.Signal, 1)
-		signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
-		<-c
-		cancel()
-	}()
+	defer cli.Close()
+
 	conf := cli.Config()
-	defer func() {
-		cc := cli.ctx
-		if err != nil {
-			logrus.Errorf("Error: %s", err.Error())
-			if errors.Is(err, context.Canceled) {
-				cc = context.Background()
-			}
-		}
-		if containerID != "" {
-			err = cli.ContainerClean(cc, containerID)
-			if err != nil {
-				logrus.Debugf("%+v", err)
-			}
-		}
-		err = cli.Close()
-		if err != nil {
-			logrus.Debugf("%+v", err)
-		}
-	}()
-	_, err = cli.Ping()
-	if err != nil {
-		return err
-	}
 	// find image
 	images, err := cli.FindImage(conf.Image)
 	if err != nil {
 		return err
 	}
-
 	if len(images) == 0 {
 		// pull image
 		err = cli.PullImage(conf.Image)
 		if err != nil {
 			return err
 		}
 	}
-	var originContainerID string
-	originContainerID, err = cli.FindContainer(options.container)
-	if err != nil {
-		return err
-	}
-	containerID, err = cli.CreateContainer(originContainerID, options)
+
+	containerID, err := cli.CreateContainer(options.container, options)
 	if err != nil {
 		return err
 	}
+	defer cli.ContainerClean(ctx, containerID)
+
 	resp, err := cli.ExecCreate(options, containerID)
 	if err != nil {
 		return err
@@ -180,21 +146,13 @@ func runExec(options execOptions) error {
 	defer close(errCh)
 
 	go func() {
-		errCh <- func() error {
-			return cli.ExecStart(options, resp.ID)
-		}()
+		errCh <- cli.ExecStart(options, resp.ID)
+	}()
+	go func() {
+		errCh <- cli.WatchContainer(ctx, options.container)
 	}()
-	if cli.In().IsTerminal() {
-		if err = tty.MonitorTtySize(ctx, cli.Client(), cli.Out(), resp.ID, true); err != nil {
-			_, _ = fmt.Fprintln(cli.Err(), "Error monitoring TTY size:", err)
-		}
-	}
 
-	if err = <-errCh; err != nil {
-		logrus.Debugf("Error hijack: %s", err)
-		return err
-	}
-	return nil
+	return <-errCh
 }
 
 // Execute main func