Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6a605d3
chore(deps): bump github.com/docker/docker
dependabot[bot] Jun 1, 2025
13f6262
chore(deps): bump github.com/docker/docker in /modules/compose
dependabot[bot] Jun 1, 2025
6f0077e
chore(deps): bump github.com/docker/docker in /modules/dind
dependabot[bot] Jun 1, 2025
e15c455
chore(deps): bump github.com/docker/docker in /modules/etcd
dependabot[bot] Jun 1, 2025
1b09848
chore(deps): bump github.com/docker/docker in /modules/k3s
dependabot[bot] Jun 1, 2025
f5639d7
chore(deps): bump github.com/docker/docker in /modules/k6
dependabot[bot] Jun 1, 2025
05c5538
chore(deps): bump github.com/docker/docker in /modules/localstack
dependabot[bot] Jun 1, 2025
68886d9
chore(deps): bump github.com/docker/docker in /modules/ollama
dependabot[bot] Jun 1, 2025
6bc017b
chore(deps): bump github.com/docker/docker in /modules/opensearch
dependabot[bot] Jun 1, 2025
6514b7a
chore(deps): bump github.com/docker/docker in /modules/pulsar
dependabot[bot] Jun 1, 2025
078e380
chore(deps): bump github.com/docker/docker in /modules/redpanda
dependabot[bot] Jun 1, 2025
a2619a4
chore(deps): bump github.com/docker/docker in /modules/registry
dependabot[bot] Jun 1, 2025
0f640db
chore(deps): bump github.com/docker/docker in /modules/vault
dependabot[bot] Jun 1, 2025
9cb0fd5
chore(deps): bump github.com/docker/docker in /modules/vearch
dependabot[bot] Jun 1, 2025
d2f97d9
Merge branch 'dependabot/go_modules/modules/vault/github.com/docker/d…
mdelapenya Jun 2, 2025
92bd705
Merge branch 'dependabot/go_modules/modules/registry/github.com/docke…
mdelapenya Jun 2, 2025
7f0aecc
Merge branch 'dependabot/go_modules/modules/redpanda/github.com/docke…
mdelapenya Jun 2, 2025
eca0cc5
Merge branch 'dependabot/go_modules/modules/pulsar/github.com/docker/…
mdelapenya Jun 2, 2025
fa48d84
Merge branch 'dependabot/go_modules/modules/opensearch/github.com/doc…
mdelapenya Jun 2, 2025
6cb49a6
Merge branch 'dependabot/go_modules/modules/ollama/github.com/docker/…
mdelapenya Jun 2, 2025
d7d9702
Merge branch 'dependabot/go_modules/modules/localstack/github.com/doc…
mdelapenya Jun 2, 2025
9a692b8
Merge branch 'dependabot/go_modules/modules/k6/github.com/docker/dock…
mdelapenya Jun 2, 2025
63aa914
Merge branch 'dependabot/go_modules/modules/k3s/github.com/docker/doc…
mdelapenya Jun 2, 2025
01b5401
Merge branch 'dependabot/go_modules/modules/etcd/github.com/docker/do…
mdelapenya Jun 2, 2025
def60e3
Merge branch 'dependabot/go_modules/modules/dind/github.com/docker/do…
mdelapenya Jun 2, 2025
43470ec
Merge branch 'dependabot/go_modules/modules/compose/github.com/docker…
mdelapenya Jun 2, 2025
5b9849d
Merge branch 'dependabot/go_modules/github.com/docker/docker-28.2.2in…
mdelapenya Jun 2, 2025
f1ce58d
chore: run mod tidy
mdelapenya Jun 2, 2025
1305c99
chore: use containerd's errdefs package
mdelapenya Jun 2, 2025
a26d66c
break: use non deprecated types
mdelapenya Jun 2, 2025
fcc9d09
fix: use containerd/errdefs in testing helpers
mdelapenya Jun 2, 2025
7990afa
fix: typo
mdelapenya Jun 2, 2025
619e1e2
fix: update test
mdelapenya Jun 2, 2025
032dc30
chore: using the new package elsewhere
mdelapenya Jun 2, 2025
e9a58ad
fix: lint
mdelapenya Jun 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions container.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"github.com/cpuguy83/dockercfg"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/registry"
Expand Down Expand Up @@ -73,7 +73,7 @@ type Container interface {

// ImageBuildInfo defines what is needed to build an image
type ImageBuildInfo interface {
BuildOptions() (types.ImageBuildOptions, error) // converts the ImageBuildInfo to a types.ImageBuildOptions
BuildOptions() (build.ImageBuildOptions, error) // converts the ImageBuildInfo to a build.ImageBuildOptions
GetContext() (io.Reader, error) // the path to the build context
GetDockerfile() string // the relative path to the Dockerfile, including the file itself
GetRepo() string // get repo label for image
Expand Down Expand Up @@ -103,7 +103,7 @@ type FromDockerfile struct {
// BuildOptionsModifier Modifier for the build options before image build. Use it for
// advanced configurations while building the image. Please consider that the modifier
// is called after the default build options are set.
BuildOptionsModifier func(*types.ImageBuildOptions)
BuildOptionsModifier func(*build.ImageBuildOptions)
}

type ContainerFile struct {
Expand Down Expand Up @@ -433,8 +433,8 @@ func (c *ContainerRequest) BuildLogWriter() io.Writer {
// BuildOptions returns the image build options when building a Docker image from a Dockerfile.
// It will apply some defaults and finally call the BuildOptionsModifier from the FromDockerfile struct,
// if set.
func (c *ContainerRequest) BuildOptions() (types.ImageBuildOptions, error) {
buildOptions := types.ImageBuildOptions{
func (c *ContainerRequest) BuildOptions() (build.ImageBuildOptions, error) {
buildOptions := build.ImageBuildOptions{
Remove: true,
ForceRemove: true,
}
Expand All @@ -450,7 +450,7 @@ func (c *ContainerRequest) BuildOptions() (types.ImageBuildOptions, error) {
// Make sure the auth configs from the Dockerfile are set right after the user-defined build options.
authsFromDockerfile, err := getAuthConfigsFromDockerfile(c)
if err != nil {
return types.ImageBuildOptions{}, fmt.Errorf("auth configs from Dockerfile: %w", err)
return build.ImageBuildOptions{}, fmt.Errorf("auth configs from Dockerfile: %w", err)
}

if buildOptions.AuthConfigs == nil {
Expand All @@ -468,7 +468,7 @@ func (c *ContainerRequest) BuildOptions() (types.ImageBuildOptions, error) {
for _, is := range c.ImageSubstitutors {
modifiedTag, err := is.Substitute(tag)
if err != nil {
return types.ImageBuildOptions{}, fmt.Errorf("failed to substitute image %s with %s: %w", tag, is.Description(), err)
return build.ImageBuildOptions{}, fmt.Errorf("failed to substitute image %s with %s: %w", tag, is.Description(), err)
}

if modifiedTag != tag {
Expand All @@ -487,18 +487,18 @@ func (c *ContainerRequest) BuildOptions() (types.ImageBuildOptions, error) {
if !c.ShouldKeepBuiltImage() {
dst := GenericLabels()
if err = core.MergeCustomLabels(dst, c.Labels); err != nil {
return types.ImageBuildOptions{}, err
return build.ImageBuildOptions{}, err
}
if err = core.MergeCustomLabels(dst, buildOptions.Labels); err != nil {
return types.ImageBuildOptions{}, err
return build.ImageBuildOptions{}, err
}
buildOptions.Labels = dst
}

// Do this as late as possible to ensure we don't leak the context on error/panic.
buildContext, err := c.GetContext()
if err != nil {
return types.ImageBuildOptions{}, err
return build.ImageBuildOptions{}, err
}

buildOptions.Context = buildContext
Expand Down
4 changes: 2 additions & 2 deletions container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/container"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -353,7 +353,7 @@ func TestCustomLabelsBuildOptionsModifier(t *testing.T) {
FromDockerfile: testcontainers.FromDockerfile{
Context: "./testdata",
Dockerfile: "Dockerfile",
BuildOptionsModifier: func(opts *types.ImageBuildOptions) {
BuildOptionsModifier: func(opts *build.ImageBuildOptions) {
opts.Labels = map[string]string{
myBuildOptionLabel: myBuildOptionValue,
}
Expand Down
26 changes: 13 additions & 13 deletions docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import (
"time"

"github.com/cenkalti/backoff/v4"
"github.com/containerd/errdefs"
"github.com/containerd/platforms"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/go-connections/nat"
Expand Down Expand Up @@ -205,7 +205,7 @@ func (c *DockerContainer) MappedPort(ctx context.Context, port nat.Port) (nat.Po
return nat.NewPort(k.Proto(), p[0].HostPort)
}

return "", errdefs.NotFound(fmt.Errorf("port %q not found", port))
return "", errdefs.ErrNotFound.WithMessage(fmt.Sprintf("port %q not found", port))
}

// Deprecated: use c.Inspect(ctx).NetworkSettings.Ports instead.
Expand Down Expand Up @@ -977,22 +977,22 @@ var _ ContainerProvider = (*DockerProvider)(nil)

// BuildImage will build and image from context and Dockerfile, then return the tag
func (p *DockerProvider) BuildImage(ctx context.Context, img ImageBuildInfo) (string, error) {
var buildOptions types.ImageBuildOptions
var buildOptions build.ImageBuildOptions
resp, err := backoff.RetryNotifyWithData(
func() (types.ImageBuildResponse, error) {
func() (build.ImageBuildResponse, error) {
var err error
buildOptions, err = img.BuildOptions()
if err != nil {
return types.ImageBuildResponse{}, backoff.Permanent(fmt.Errorf("build options: %w", err))
return build.ImageBuildResponse{}, backoff.Permanent(fmt.Errorf("build options: %w", err))
}
defer tryClose(buildOptions.Context) // release resources in any case

resp, err := p.client.ImageBuild(ctx, buildOptions.Context, buildOptions)
if err != nil {
if isPermanentClientError(err) {
return types.ImageBuildResponse{}, backoff.Permanent(fmt.Errorf("build image: %w", err))
return build.ImageBuildResponse{}, backoff.Permanent(fmt.Errorf("build image: %w", err))
}
return types.ImageBuildResponse{}, err
return build.ImageBuildResponse{}, err
}
defer p.Close()

Expand Down Expand Up @@ -1121,7 +1121,7 @@ func (p *DockerProvider) CreateContainer(ctx context.Context, req ContainerReque
} else {
img, err := p.client.ImageInspect(ctx, imageName)
if err != nil {
if !client.IsErrNotFound(err) {
if !errdefs.IsNotFound(err) {
return nil, err
}
shouldPullImage = true
Expand Down Expand Up @@ -1290,7 +1290,7 @@ func (p *DockerProvider) waitContainerCreation(ctx context.Context, name string)
}

if c == nil {
return nil, errdefs.NotFound(fmt.Errorf("container %s not found", name))
return nil, errdefs.ErrNotFound.WithMessage(fmt.Sprintf("container %s not found", name))
}
return c, nil
},
Expand Down Expand Up @@ -1791,11 +1791,11 @@ func (p *DockerProvider) PullImage(ctx context.Context, img string) error {

var permanentClientErrors = []func(error) bool{
errdefs.IsNotFound,
errdefs.IsInvalidParameter,
errdefs.IsInvalidArgument,
errdefs.IsUnauthorized,
errdefs.IsForbidden,
errdefs.IsPermissionDenied,
errdefs.IsNotImplemented,
errdefs.IsSystem,
errdefs.IsInternal,
}

func isPermanentClientError(err error) bool {
Expand Down
3 changes: 2 additions & 1 deletion docker_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"path/filepath"
"testing"

"github.com/containerd/errdefs"
"github.com/cpuguy83/dockercfg"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/registry"
Expand Down Expand Up @@ -187,7 +188,7 @@ func removeImageFromLocalCache(t *testing.T, img string) {
Force: true,
PruneChildren: true,
})
if err != nil && !client.IsErrNotFound(err) {
if err != nil && !errdefs.IsNotFound(err) {
t.Logf("could not remove image %s: %v\n", img, err)
}
}
Expand Down
6 changes: 3 additions & 3 deletions docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"testing"
"time"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/strslice"
Expand Down Expand Up @@ -2015,9 +2015,9 @@ type errMockCli struct {
imagePullCount int
}

func (f *errMockCli) ImageBuild(_ context.Context, _ io.Reader, _ types.ImageBuildOptions) (types.ImageBuildResponse, error) {
func (f *errMockCli) ImageBuild(_ context.Context, _ io.Reader, _ build.ImageBuildOptions) (build.ImageBuildResponse, error) {
f.imageBuildCount++
return types.ImageBuildResponse{Body: io.NopCloser(&bytes.Buffer{})}, f.err
return build.ImageBuildResponse{Body: io.NopCloser(&bytes.Buffer{})}, f.err
}

func (f *errMockCli) ContainerList(_ context.Context, _ container.ListOptions) ([]container.Summary, error) {
Expand Down
6 changes: 3 additions & 3 deletions examples/nginx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v28.1.1+incompatible // indirect
github.com/docker/docker v28.2.2+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
Expand Down Expand Up @@ -62,7 +64,5 @@ require (
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/sys v0.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
24 changes: 14 additions & 10 deletions examples/nginx/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
Expand All @@ -21,8 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand Down Expand Up @@ -168,14 +172,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4=
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
8 changes: 4 additions & 4 deletions from_dockerfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/image"
"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -144,7 +144,7 @@ func TestBuildImageFromDockerfile_Target(t *testing.T) {
Context: "testdata",
Dockerfile: "target.Dockerfile",
KeepImage: false,
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
buildOptions.Target = fmt.Sprintf("target%d", i)
},
},
Expand Down Expand Up @@ -172,7 +172,7 @@ func ExampleGenericContainer_buildFromDockerfile() {
Context: "testdata",
Dockerfile: "target.Dockerfile",
KeepImage: false,
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
buildOptions.Target = "target2"
},
}),
Expand Down Expand Up @@ -216,7 +216,7 @@ func TestBuildImageFromDockerfile_TargetDoesNotExist(t *testing.T) {
Context: "testdata",
Dockerfile: "target.Dockerfile",
KeepImage: false,
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
buildOptions.Target = "target-foo"
},
},
Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ toolchain go1.23.6
require (
dario.cat/mergo v1.0.1
github.com/cenkalti/backoff/v4 v4.2.1
github.com/containerd/errdefs v1.0.0
github.com/containerd/platforms v0.2.1
github.com/cpuguy83/dockercfg v0.3.2
github.com/docker/docker v28.1.1+incompatible
github.com/docker/docker v28.2.2+incompatible
github.com/docker/go-connections v0.5.0
github.com/google/uuid v1.6.0
github.com/magiconair/properties v1.8.10
Expand All @@ -26,6 +27,7 @@ require (
require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
Expand Down Expand Up @@ -60,8 +62,8 @@ require (
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading