Skip to content

Commit b195b80

Browse files
thaJeztahthaJeztah
committed
vendor: github.com/docker/docker/v28.0.0-rc.1
full diff: https://github.com/docker/docker/compare/v27.5.1..v28.0.0-rc.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 70a5e26 commit b195b80

File tree

182 files changed

+2912
-3091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+2912
-3091
lines changed

‎build/build.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ func remoteDigestWithMoby(ctx context.Context, d *driver.DriverHandle, name stri
835835
if err != nil {
836836
return "", err
837837
}
838-
img, _, err := api.ImageInspectWithRaw(ctx, name)
838+
img, err := api.ImageInspect(ctx, name)
839839
if err != nil {
840840
return "", err
841841
}

‎commands/build.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"github.com/docker/cli/cli/command"
4242
dockeropts "github.com/docker/cli/opts"
4343
"github.com/docker/docker/api/types/versions"
44-
"github.com/docker/docker/pkg/ioutils"
44+
"github.com/docker/docker/pkg/atomicwriter"
4545
"github.com/moby/buildkit/client"
4646
"github.com/moby/buildkit/exporter/containerimage/exptypes"
4747
"github.com/moby/buildkit/frontend/subrequests"
@@ -745,7 +745,7 @@ func writeMetadataFile(filename string, dt interface{}) error {
745745
if err != nil {
746746
return err
747747
}
748-
return ioutils.AtomicWriteFile(filename, b, 0644)
748+
return atomicwriter.WriteFile(filename, b, 0644)
749749
}
750750

751751
func decodeExporterResponse(exporterResponse map[string]string) map[string]interface{} {

‎driver/docker-container/driver.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
105105
}); err != nil {
106106
// image pulling failed, check if it exists in local image store.
107107
// if not, return pulling error. otherwise log it.
108-
_, _, errInspect := d.DockerAPI.ImageInspectWithRaw(ctx, imageName)
109-
if errInspect != nil {
108+
_, errInspect := d.DockerAPI.ImageInspect(ctx, imageName)
109+
found := errInspect == nil
110+
if !found {
110111
return err
111112
}
112113
l.Wrap("pulling failed, using local image "+imageName, func() error { return nil })

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/distribution/reference v0.6.0
2020
github.com/docker/cli v27.5.1+incompatible
2121
github.com/docker/cli-docs-tool v0.9.0
22-
github.com/docker/docker v27.5.1+incompatible
22+
github.com/docker/docker v28.0.0-rc.1+incompatible
2323
github.com/docker/go-units v0.5.0
2424
github.com/gofrs/flock v0.12.1
2525
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -173,7 +173,7 @@ require (
173173
golang.org/x/oauth2 v0.23.0 // indirect
174174
golang.org/x/time v0.6.0 // indirect
175175
golang.org/x/tools v0.27.0 // indirect
176-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
176+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
177177
gopkg.in/inf.v0 v0.9.1 // indirect
178178
gopkg.in/yaml.v2 v2.4.0 // indirect
179179
k8s.io/klog/v2 v2.130.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ github.com/docker/cli-docs-tool v0.9.0/go.mod h1:ClrwlNW+UioiRyH9GiAOe1o3J/TsY3T
129129
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
130130
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
131131
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
132-
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
133-
github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
132+
github.com/docker/docker v28.0.0-rc.1+incompatible h1:xUbdsVxJIFvyZ+958MzyyIT7VuHO4Ecao9hKhl7kGUc=
133+
github.com/docker/docker v28.0.0-rc.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
134134
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
135135
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
136136
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -572,8 +572,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
572572
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
573573
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
574574
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
575-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg=
576-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M=
575+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
576+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
577577
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
578578
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
579579
google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

‎util/confutil/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"sync"
99

1010
"github.com/docker/cli/cli/command"
11-
"github.com/docker/docker/pkg/ioutils"
11+
"github.com/docker/docker/pkg/atomicwriter"
1212
"github.com/moby/buildkit/cmd/buildkitd/config"
1313
"github.com/pelletier/go-toml"
1414
"github.com/pkg/errors"
@@ -106,7 +106,7 @@ func (c *Config) MkdirAll(dir string, perm os.FileMode) error {
106106
// AtomicWriteFile writes data to a file within the config dir atomically
107107
func (c *Config) AtomicWriteFile(filename string, data []byte, perm os.FileMode) error {
108108
f := filepath.Join(c.dir, filename)
109-
if err := ioutils.AtomicWriteFile(f, data, perm); err != nil {
109+
if err := atomicwriter.WriteFile(f, data, perm); err != nil {
110110
return err
111111
}
112112
if c.chowner == nil {

‎util/dockerutil/client.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/docker/buildx/util/progress"
99
"github.com/docker/cli/cli/command"
10+
"github.com/docker/docker/api/types/image"
1011
dockerclient "github.com/docker/docker/client"
1112
)
1213

@@ -52,7 +53,7 @@ func (c *Client) LoadImage(ctx context.Context, name string, status progress.Wri
5253
w.mu.Unlock()
5354
}
5455

55-
resp, err := dapi.ImageLoad(ctx, pr, false)
56+
resp, err := dapi.ImageLoad(ctx, pr, image.LoadOptions{})
5657
defer close(done)
5758
if err != nil {
5859
handleErr(err)

‎vendor/github.com/docker/docker/api/common.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)