Skip to content

Commit 7781b7c

Browse files
committed
deps: update docker/cli to fix go version selection issue
see: docker/cli@70216b6 Signed-off-by: Laura Brehm <[email protected]>
1 parent 785835b commit 7781b7c

6 files changed

Lines changed: 117 additions & 388 deletions

File tree

go.mod

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ require (
88
github.com/buger/goterm v1.0.4
99
github.com/compose-spec/compose-go/v2 v2.0.0-beta.1
1010
github.com/containerd/console v1.0.3
11-
github.com/containerd/containerd v1.7.7
11+
github.com/containerd/containerd v1.7.11
1212
github.com/davecgh/go-spew v1.1.1
1313
github.com/distribution/reference v0.5.0
14-
github.com/docker/buildx v0.12.0
15-
github.com/docker/cli v25.0.0-beta.1+incompatible
14+
github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315
15+
github.com/docker/cli v25.0.0-beta.2.0.20231214140346-70216b662dc4+incompatible
1616
github.com/docker/cli-docs-tool v0.6.0
17-
github.com/docker/docker v25.0.0-beta.1+incompatible
18-
github.com/docker/go-connections v0.4.0
17+
github.com/docker/docker v25.0.0-beta.2+incompatible
18+
github.com/docker/go-connections v0.4.1-0.20231110212414-fa09c952e3ea
1919
github.com/docker/go-units v0.5.0
2020
github.com/fsnotify/fsevents v0.1.1
2121
github.com/google/go-cmp v0.6.0
@@ -24,7 +24,7 @@ require (
2424
github.com/jonboulle/clockwork v0.4.0
2525
github.com/mattn/go-shellwords v1.0.12
2626
github.com/mitchellh/mapstructure v1.5.0
27-
github.com/moby/buildkit v0.13.0-beta1.0.20231023114302-d5c1d785b042
27+
github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991
2828
github.com/moby/patternmatcher v0.6.0
2929
github.com/moby/term v0.5.0
3030
github.com/morikuni/aec v1.0.0
@@ -37,11 +37,11 @@ require (
3737
github.com/stretchr/testify v1.8.4
3838
github.com/theupdateframework/notary v0.7.0
3939
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375
40-
go.opentelemetry.io/otel v1.14.0
41-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
42-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
43-
go.opentelemetry.io/otel/sdk v1.14.0
44-
go.opentelemetry.io/otel/trace v1.14.0
40+
go.opentelemetry.io/otel v1.19.0
41+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
42+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
43+
go.opentelemetry.io/otel/sdk v1.19.0
44+
go.opentelemetry.io/otel/trace v1.19.0
4545
go.uber.org/goleak v1.3.0
4646
go.uber.org/mock v0.3.0
4747
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
@@ -56,7 +56,7 @@ require (
5656
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5757
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5858
github.com/Masterminds/semver/v3 v3.2.1 // indirect
59-
github.com/Microsoft/hcsshim v0.11.1 // indirect
59+
github.com/Microsoft/hcsshim v0.11.4 // indirect
6060
github.com/aws/aws-sdk-go-v2 v1.17.6 // indirect
6161
github.com/aws/aws-sdk-go-v2/config v1.18.16 // indirect
6262
github.com/aws/aws-sdk-go-v2/credentials v1.13.16 // indirect
@@ -70,13 +70,13 @@ require (
7070
github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 // indirect
7171
github.com/aws/smithy-go v1.13.5 // indirect
7272
github.com/beorn7/perks v1.0.1 // indirect
73-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
73+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
7474
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7575
github.com/containerd/continuity v0.4.2 // indirect
7676
github.com/containerd/log v0.1.0 // indirect
7777
github.com/containerd/typeurl/v2 v2.1.1 // indirect
7878
github.com/docker/distribution v2.8.2+incompatible // indirect
79-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
79+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
8080
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
8181
github.com/docker/go-metrics v0.0.1 // indirect
8282
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
@@ -94,9 +94,10 @@ require (
9494
github.com/google/gnostic v0.5.7-v3refs // indirect
9595
github.com/google/gofuzz v1.2.0 // indirect
9696
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
97+
github.com/google/uuid v1.3.1 // indirect
9798
github.com/gorilla/mux v1.8.0 // indirect
9899
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
99-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
100+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
100101
github.com/hashicorp/errwrap v1.1.0 // indirect
101102
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
102103
github.com/imdario/mergo v0.3.16 // indirect
@@ -105,11 +106,11 @@ require (
105106
github.com/josharian/intern v1.0.0 // indirect
106107
github.com/json-iterator/go v1.1.12 // indirect
107108
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
108-
github.com/klauspost/compress v1.16.5 // indirect
109+
github.com/klauspost/compress v1.17.2 // indirect
109110
github.com/mailru/easyjson v0.7.6 // indirect
110111
github.com/mattn/go-colorable v0.1.13 // indirect
111112
github.com/mattn/go-isatty v0.0.17 // indirect
112-
github.com/mattn/go-runewidth v0.0.14 // indirect
113+
github.com/mattn/go-runewidth v0.0.15 // indirect
113114
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
114115
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
115116
github.com/miekg/pkcs11 v1.1.1 // indirect
@@ -126,35 +127,39 @@ require (
126127
github.com/pelletier/go-toml v1.9.5 // indirect
127128
github.com/pkg/errors v0.9.1 // indirect
128129
github.com/pmezard/go-difflib v1.0.0 // indirect
129-
github.com/prometheus/client_golang v1.14.0 // indirect
130-
github.com/prometheus/client_model v0.3.0 // indirect
130+
github.com/prometheus/client_golang v1.16.0 // indirect
131+
github.com/prometheus/client_model v0.4.0 // indirect
131132
github.com/prometheus/common v0.42.0 // indirect
132-
github.com/prometheus/procfs v0.9.0 // indirect
133+
github.com/prometheus/procfs v0.10.1 // indirect
133134
github.com/rivo/uniseg v0.2.0 // indirect
134135
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
135136
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
136137
github.com/shibumi/go-pathspec v1.3.0 // indirect
137-
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
138+
github.com/tonistiigi/fsutil v0.0.0-20230825212630-f09800878302 // indirect
138139
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
139140
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
140141
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
141142
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
142143
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
143-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
144-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0 // indirect
145-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
146-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
147-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
148-
go.opentelemetry.io/otel/metric v0.37.0 // indirect
149-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
144+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
145+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 // indirect
146+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
147+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
148+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect
149+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect
150+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
151+
go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
152+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
153+
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
154+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
150155
golang.org/x/crypto v0.14.0 // indirect
151156
golang.org/x/mod v0.11.0 // indirect
152157
golang.org/x/net v0.17.0 // indirect
153158
golang.org/x/oauth2 v0.11.0 // indirect
154159
golang.org/x/term v0.13.0 // indirect
155160
golang.org/x/text v0.13.0 // indirect
156161
golang.org/x/time v0.3.0 // indirect
157-
golang.org/x/tools v0.7.0 // indirect
162+
golang.org/x/tools v0.10.0 // indirect
158163
google.golang.org/appengine v1.6.7 // indirect
159164
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
160165
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
@@ -165,6 +170,7 @@ require (
165170
gopkg.in/yaml.v3 v3.0.1 // indirect
166171
k8s.io/api v0.26.7 // indirect
167172
k8s.io/apimachinery v0.26.7 // indirect
173+
k8s.io/apiserver v0.26.7 // indirect
168174
k8s.io/client-go v0.26.7 // indirect
169175
k8s.io/klog/v2 v2.90.1 // indirect
170176
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect

0 commit comments

Comments
 (0)