feat: update deps

Author: zeromake

README.md

@@ -104,7 +104,7 @@ mv docker-debug /usr/local/bin
 docker-debug uses nicolaka/netshoot as the default image to run debug container.
 You can override the default image with cli flag, or even better, with config file ~/.docker-debug/config.toml
 ``` toml
-version = "0.7.4"
+version = "0.7.5"
 image = "nicolaka/netshoot:latest"
 mount_dir = "/mnt/container"
 timeout = 10000000000

go.mod

@@ -1,23 +1,44 @@
 module github.com/zeromake/docker-debug
 
-go 1.12
+go 1.21
+
+toolchain go1.21.1
 
 require (
-	github.com/BurntSushi/toml v1.1.0
-	github.com/Microsoft/go-winio v0.5.2 // indirect
+	github.com/BurntSushi/toml v1.4.0
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/docker/docker v27.1.1+incompatible
+	github.com/moby/term v0.5.0
+	github.com/pkg/errors v0.9.1
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cobra v1.8.1
+)
+
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v26.1.5+incompatible
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.5.0
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
 )

go.sum

@@ -8,6 +8,8 @@ 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/filters"
@@ -202,7 +204,7 @@ func (cli *DebugCli) PullImage(image string) error {
 
 	ctx, cancel := context.WithCancel(cli.ctx)
 	defer cancel()
-	responseBody, err := cli.client.ImagePull(ctx, imageName, types.ImagePullOptions{})
+	responseBody, err := cli.client.ImagePull(ctx, imageName, dockerImage.PullOptions{})
 	if err != nil {
 		return errors.WithStack(err)
 	}
@@ -216,12 +218,12 @@ func (cli *DebugCli) PullImage(image string) error {
 }
 
 // FindImage find image
-func (cli *DebugCli) FindImage(image string) ([]types.ImageSummary, error) {
+func (cli *DebugCli) FindImage(image string) ([]dockerImage.Summary, error) {
 	args := filters.NewArgs()
 	args.Add("reference", image)
 	ctx, cancel := cli.withContent(cli.config.Timeout)
 	defer cancel()
-	return cli.client.ImageList(ctx, types.ImageListOptions{
+	return cli.client.ImageList(ctx, dockerImage.ListOptions{
 		Filters: args,
 	})
 }
@@ -362,7 +364,7 @@ func (cli *DebugCli) CreateContainer(attachContainer string, options execOptions
 	err = cli.client.ContainerStart(
 		ctx,
 		body.ID,
-		types.ContainerStartOptions{},
+		container.StartOptions{},
 	)
 	cancel()
 	return body.ID, errors.WithStack(err)
@@ -372,11 +374,11 @@ func (cli *DebugCli) CreateContainer(attachContainer string, options execOptions
 func (cli *DebugCli) ContainerClean(ctx context.Context, id string) error {
 	ctx, cancel := context.WithTimeout(ctx, time.Second*3)
 	defer cancel()
-	timeout := time.Second
+	var timeout int = 5
 	return errors.WithStack(cli.client.ContainerStop(
 		ctx,
 		id,
-		&timeout,
+		container.StopOptions{Timeout: &timeout},
 	))
 }
 

internal/command/cli.go

@@ -159,7 +159,7 @@ func Copy(ctx context.Context, dst net.Conn, src io.Reader, writeTimeout time.Du
 		if nr > 0 {
 			// docker container is stop check
 			if writeTimeout > 0 {
-				err = dst.SetReadDeadline(time.Now().Add(writeTimeout))
+				err = dst.SetWriteDeadline(time.Now().Add(writeTimeout))
 				if err != nil {
 					break
 				}

pkg/tty/hijack.go

@@ -2,15 +2,16 @@ package tty
 
 import (
 	"context"
-	"github.com/sirupsen/logrus"
 	"os"
 	goSignal "os/signal"
 	"runtime"
+	"syscall"
 	"time"
 
-	"github.com/docker/docker/api/types"
+	"github.com/sirupsen/logrus"
+
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/signal"
 	"github.com/zeromake/docker-debug/pkg/stream"
 )
 
@@ -20,7 +21,7 @@ func ResizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id strin
 		return
 	}
 
-	options := types.ResizeOptions{
+	options := container.ResizeOptions{
 		Height: height,
 		Width:  width,
 	}
@@ -62,7 +63,7 @@ func MonitorTtySize(ctx context.Context, client client.ContainerAPIClient, out *
 		}()
 	} else {
 		sigChan := make(chan os.Signal, 1)
-		goSignal.Notify(sigChan, signal.SIGWINCH)
+		goSignal.Notify(sigChan, syscall.Signal(0x1c))
 		go func() {
 			for range sigChan {
 				resizeTty()

pkg/tty/tty.go

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/env sh
 #
 # Build a static binary for the host OS/ARCH
 #

scripts/binary.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/env sh
 source ./scripts/variables.env
 
 upx -q ${TARGET} -o ${TARGET}-upx