Skip to content

Commit 9261334

Browse files
jotoudejotoude
committed
Bumping github.com/docker/docker version to v27.3.1
1 parent 64b23c2 commit 9261334

File tree

4 files changed

+89
-54
lines changed

4 files changed

+89
-54
lines changed

‎driver/docker/docker.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/docker/distribution/reference"
1616
"github.com/docker/docker/api/types"
1717
"github.com/docker/docker/api/types/container"
18+
imagetypes "github.com/docker/docker/api/types/image"
1819
registrytypes "github.com/docker/docker/api/types/registry"
1920
"github.com/docker/docker/api/types/strslice"
2021
"github.com/docker/docker/client"
@@ -149,7 +150,7 @@ func pullImage(ctx context.Context, cli command.Cli, image string) error {
149150
if err != nil {
150151
return err
151152
}
152-
options := types.ImagePullOptions{
153+
options := imagetypes.PullOptions{
153154
RegistryAuth: encodedAuth,
154155
}
155156
responseBody, err := cli.Client().ImagePull(ctx, image, options)
@@ -217,7 +218,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
217218
}
218219

219220
if d.config["CLEANUP_CONTAINERS"] == "true" {
220-
defer cli.Client().ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{})
221+
defer cli.Client().ContainerRemove(ctx, resp.ID, container.RemoveOptions{})
221222
}
222223

223224
containerUID := getContainerUserID(ii.Config.User)
@@ -235,7 +236,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
235236
return driver.OperationResult{}, fmt.Errorf("error copying to / in container: %s", err)
236237
}
237238

238-
attach, err := cli.Client().ContainerAttach(ctx, resp.ID, types.ContainerAttachOptions{
239+
attach, err := cli.Client().ContainerAttach(ctx, resp.ID, container.AttachOptions{
239240
Stream: true,
240241
Stdout: true,
241242
Stderr: true,
@@ -268,7 +269,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
268269
}
269270
}()
270271

271-
if err = cli.Client().ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
272+
if err = cli.Client().ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
272273
return driver.OperationResult{}, fmt.Errorf("cannot start container: %v", err)
273274
}
274275
statusc, errc := cli.Client().ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)

‎go.mod

+25-13
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/Masterminds/semver v1.5.0
99
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88
1010
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
11-
github.com/docker/cli v25.0.0+incompatible
11+
github.com/docker/cli v27.3.1+incompatible
1212
github.com/docker/distribution v2.8.2+incompatible
13-
github.com/docker/docker v25.0.6+incompatible
13+
github.com/docker/docker v27.3.1+incompatible
1414
github.com/docker/go-connections v0.4.0
1515
github.com/hashicorp/go-multierror v1.1.1
1616
github.com/mitchellh/copystructure v1.0.0
@@ -28,6 +28,7 @@ require (
2828
)
2929

3030
require (
31+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3132
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3233
github.com/Microsoft/go-winio v0.6.2 // indirect
3334
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
@@ -39,7 +40,6 @@ require (
3940
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4041
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4142
github.com/cloudflare/cfssl v1.4.1 // indirect
42-
github.com/containerd/containerd v1.7.23 // indirect
4343
github.com/containerd/log v0.1.0 // indirect
4444
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -52,6 +52,7 @@ require (
5252
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
5353
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5454
github.com/felixge/httpsnoop v1.0.4 // indirect
55+
github.com/fsnotify/fsnotify v1.6.0 // indirect
5556
github.com/fvbommel/sortorder v1.0.2 // indirect
5657
github.com/go-logr/logr v1.4.2 // indirect
5758
github.com/go-logr/stdr v1.2.2 // indirect
@@ -66,7 +67,9 @@ require (
6667
github.com/google/go-cmp v0.6.0 // indirect
6768
github.com/google/go-containerregistry v0.20.1 // indirect
6869
github.com/google/gofuzz v1.2.0 // indirect
70+
github.com/google/uuid v1.6.0 // indirect
6971
github.com/gorilla/mux v1.8.1 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7073
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
7174
github.com/hashicorp/errwrap v1.1.0 // indirect
7275
github.com/imdario/mergo v0.3.12 // indirect
@@ -80,6 +83,7 @@ require (
8083
github.com/miekg/pkcs11 v1.1.1 // indirect
8184
github.com/mitchellh/go-homedir v1.1.0 // indirect
8285
github.com/mitchellh/reflectwalk v1.0.0 // indirect
86+
github.com/moby/docker-image-spec v1.3.1 // indirect
8387
github.com/moby/patternmatcher v0.5.0 // indirect
8488
github.com/moby/sys/sequential v0.5.0 // indirect
8589
github.com/moby/sys/user v0.3.0 // indirect
@@ -91,6 +95,7 @@ require (
9195
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9296
github.com/onsi/ginkgo v1.16.4 // indirect
9397
github.com/opencontainers/image-spec v1.1.0 // indirect
98+
github.com/pelletier/go-toml v1.9.5 // indirect
9499
github.com/pmezard/go-difflib v1.0.0 // indirect
95100
github.com/prometheus/client_golang v1.20.2 // indirect
96101
github.com/prometheus/client_model v0.6.1 // indirect
@@ -105,21 +110,28 @@ require (
105110
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
106111
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
107112
go.opentelemetry.io/otel v1.31.0 // indirect
113+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
114+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
115+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
108117
go.opentelemetry.io/otel/metric v1.31.0 // indirect
109-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
118+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
119+
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
110120
go.opentelemetry.io/otel/trace v1.31.0 // indirect
111-
golang.org/x/crypto v0.26.0 // indirect
112-
golang.org/x/net v0.28.0 // indirect
113-
golang.org/x/oauth2 v0.21.0 // indirect
121+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
122+
golang.org/x/crypto v0.28.0 // indirect
123+
golang.org/x/net v0.30.0 // indirect
124+
golang.org/x/oauth2 v0.22.0 // indirect
114125
golang.org/x/sync v0.8.0 // indirect
115-
golang.org/x/sys v0.25.0 // indirect
116-
golang.org/x/term v0.23.0 // indirect
117-
golang.org/x/text v0.17.0 // indirect
126+
golang.org/x/sys v0.26.0 // indirect
127+
golang.org/x/term v0.25.0 // indirect
128+
golang.org/x/text v0.19.0 // indirect
118129
golang.org/x/time v0.5.0 // indirect
119130
google.golang.org/appengine v1.6.8 // indirect
120-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
121-
google.golang.org/grpc v1.66.0 // indirect
122-
google.golang.org/protobuf v1.34.2 // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
133+
google.golang.org/grpc v1.67.1 // indirect
134+
google.golang.org/protobuf v1.35.1 // indirect
123135
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
124136
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
125137
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect

0 commit comments

Comments
 (0)