bump docker dependencies to v28.0.1

pirosiki197 · pirosiki197 · commit 440aba05b8f6 · 2025-03-04T16:15:09.000+09:00
diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ require (
 	connectrpc.com/connect v1.18.1
 	github.com/aws/aws-sdk-go v1.55.6
 	github.com/cert-manager/cert-manager v1.17.1
-	github.com/docker/cli v27.5.1+incompatible
-	github.com/docker/docker v27.5.1+incompatible // should be in sync with requirements of github.com/moby/buildkit or build could break
+	github.com/docker/cli v28.0.1+incompatible
+	github.com/docker/docker v28.0.1+incompatible // should be in sync with requirements of github.com/moby/buildkit or build could break
 	github.com/docker/go-connections v0.5.0
 	github.com/friendsofgo/errors v0.9.2
 	github.com/gliderlabs/ssh v0.3.8
diff --git a/go.sum b/go.sum
@@ -202,10 +202,10 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY=
-github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
-github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs=
+github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
diff --git a/pkg/infrastructure/backend/dockerimpl/backend.go b/pkg/infrastructure/backend/dockerimpl/backend.go
@@ -13,7 +13,9 @@ import (
 
 	clitypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/friendsofgo/errors"
 
@@ -85,7 +87,7 @@ func (b *Backend) Start(ctx context.Context) error {
 
 func (b *Backend) eventListener(ctx context.Context) error {
 	// https://docs.docker.com/engine/reference/commandline/events/
-	ch, errCh := b.c.Events(ctx, types.EventsOptions{Filters: filters.NewArgs(filters.Arg("type", "container"))})
+	ch, errCh := b.c.Events(ctx, events.ListOptions{Filters: filters.NewArgs(filters.Arg("type", "container"))})
 	for {
 		select {
 		case ev, ok := <-ch:
@@ -136,7 +138,7 @@ func (b *Backend) ListenContainerEvents() (sub <-chan *domain.ContainerEvent, un
 }
 
 func (b *Backend) initNetworks(ctx context.Context) error {
-	networks, err := b.c.NetworkList(ctx, types.NetworkListOptions{})
+	networks, err := b.c.NetworkList(ctx, network.ListOptions{})
 	if err != nil {
 		return errors.Wrap(err, "failed to list networks")
 	}
@@ -146,7 +148,7 @@ func (b *Backend) initNetworks(ctx context.Context) error {
 		}
 	}
 
-	_, err = b.c.NetworkCreate(ctx, b.config.Network, types.NetworkCreate{})
+	_, err = b.c.NetworkCreate(ctx, b.config.Network, network.CreateOptions{})
 	return err
 }
 
diff --git a/pkg/infrastructure/backend/dockerimpl/exec.go b/pkg/infrastructure/backend/dockerimpl/exec.go
@@ -54,7 +54,7 @@ func (b *Backend) AttachContainer(ctx context.Context, appID string, stdin io.Re
 }
 
 func (b *Backend) ExecContainer(ctx context.Context, appID string, cmd []string, stdin io.Reader, stdout, stderr io.Writer) error {
-	execConf := types.ExecConfig{
+	execConf := container.ExecOptions{
 		Tty:          true,
 		AttachStdin:  true,
 		AttachStderr: true,
@@ -67,7 +67,7 @@ func (b *Backend) ExecContainer(ctx context.Context, appID string, cmd []string,
 		return errors.Wrap(err, "creating exec")
 	}
 
-	res, err := b.c.ContainerExecAttach(ctx, execID.ID, types.ExecStartCheck{})
+	res, err := b.c.ContainerExecAttach(ctx, execID.ID, container.ExecStartOptions{})
 	if err != nil {
 		return errors.Wrap(err, "attaching exec process")
 	}

-Original file line number
+Diff line change
 	connectrpc.com/connect v1.18.1
 	github.com/aws/aws-sdk-go v1.55.6
 	github.com/cert-manager/cert-manager v1.17.1
 -	github.com/docker/cli v27.5.1+incompatible
 -	github.com/docker/docker v27.5.1+incompatible // should be in sync with requirements of github.com/moby/buildkit or build could break
 +	github.com/docker/cli v28.0.1+incompatible
 +	github.com/docker/docker v28.0.1+incompatible // should be in sync with requirements of github.com/moby/buildkit or build could break
 	github.com/docker/go-connections v0.5.0
 	github.com/friendsofgo/errors v0.9.2
 	github.com/gliderlabs/ssh v0.3.8
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ import (`
`13`	`13`
`14`	`14`	`clitypes "github.com/docker/cli/cli/config/types"`
`15`	`15`	`"github.com/docker/docker/api/types"`
	`16`	`+ "github.com/docker/docker/api/types/events"`
`16`	`17`	`"github.com/docker/docker/api/types/filters"`
	`18`	`+ "github.com/docker/docker/api/types/network"`
`17`	`19`	`"github.com/docker/docker/client"`
`18`	`20`	`"github.com/friendsofgo/errors"`
`19`	`21`
`@@ -85,7 +87,7 @@ func (b *Backend) Start(ctx context.Context) error {`
`85`	`87`
`86`	`88`	`func (b *Backend) eventListener(ctx context.Context) error {`
`87`	`89`	`// https://docs.docker.com/engine/reference/commandline/events/`
`88`		`- ch, errCh := b.c.Events(ctx, types.EventsOptions{Filters: filters.NewArgs(filters.Arg("type", "container"))})`
	`90`	`+ ch, errCh := b.c.Events(ctx, events.ListOptions{Filters: filters.NewArgs(filters.Arg("type", "container"))})`
`89`	`91`	`for {`
`90`	`92`	`select {`
`91`	`93`	`case ev, ok := <-ch:`
`@@ -136,7 +138,7 @@ func (b Backend) ListenContainerEvents() (sub <-chan domain.ContainerEvent, un`
`136`	`138`	`}`
`137`	`139`
`138`	`140`	`func (b *Backend) initNetworks(ctx context.Context) error {`
`139`		`- networks, err := b.c.NetworkList(ctx, types.NetworkListOptions{})`
	`141`	`+ networks, err := b.c.NetworkList(ctx, network.ListOptions{})`
`140`	`142`	`if err != nil {`
`141`	`143`	`return errors.Wrap(err, "failed to list networks")`
`142`	`144`	`}`
`@@ -146,7 +148,7 @@ func (b *Backend) initNetworks(ctx context.Context) error {`
`146`	`148`	`}`
`147`	`149`	`}`
`148`	`150`
`149`		`- _, err = b.c.NetworkCreate(ctx, b.config.Network, types.NetworkCreate{})`
	`151`	`+ _, err = b.c.NetworkCreate(ctx, b.config.Network, network.CreateOptions{})`
`150`	`152`	`return err`
`151`	`153`	`}`
`152`	`154`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (b *Backend) AttachContainer(ctx context.Context, appID string, stdin io.Re`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func (b *Backend) ExecContainer(ctx context.Context, appID string, cmd []string, stdin io.Reader, stdout, stderr io.Writer) error {`
`57`		`- execConf := types.ExecConfig{`
	`57`	`+ execConf := container.ExecOptions{`
`58`	`58`	`Tty: true,`
`59`	`59`	`AttachStdin: true,`
`60`	`60`	`AttachStderr: true,`
`@@ -67,7 +67,7 @@ func (b *Backend) ExecContainer(ctx context.Context, appID string, cmd []string,`
`67`	`67`	`return errors.Wrap(err, "creating exec")`
`68`	`68`	`}`
`69`	`69`
`70`		`- res, err := b.c.ContainerExecAttach(ctx, execID.ID, types.ExecStartCheck{})`
	`70`	`+ res, err := b.c.ContainerExecAttach(ctx, execID.ID, container.ExecStartOptions{})`
`71`	`71`	`if err != nil {`
`72`	`72`	`return errors.Wrap(err, "attaching exec process")`
`73`	`73`	`}`