Skip to content

Commit 283f7a1

Browse files
committed
Bump buildx to v0.8.0
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 6ce57ea commit 283f7a1

File tree

6 files changed

+145
-146
lines changed

6 files changed

+145
-146
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ e2e-compose: ## Run end to end local tests in plugin mode. Set E2E_TEST=TestName
4949
e2e-compose-standalone: ## Run End to end local tests in standalone mode. Set E2E_TEST=TestName to run a single test
5050
go test $(TEST_FLAGS) -count=1 --tags=standalone ./pkg/e2e
5151

52+
.PHONY: mocks
53+
mocks:
54+
mockgen -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/cli/command Cli
55+
mockgen -destination pkg/mocks/mock_docker_api.go -package mocks github.com/docker/docker/client APIClient
5256

5357
.PHONY: e2e
5458
e2e: e2e-compose e2e-compose-standalone ## Run end to end local tests in both modes. Set E2E_TEST=TestName to run a single test

go.mod

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.6.1
1212
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e
13-
github.com/docker/buildx v0.7.1
13+
github.com/docker/buildx v0.8.0
1414
github.com/docker/cli v20.10.12+incompatible
1515
github.com/docker/cli-docs-tool v0.4.0
1616
github.com/docker/docker v20.10.7+incompatible
@@ -21,7 +21,7 @@ require (
2121
github.com/hashicorp/go-version v1.3.0
2222
github.com/mattn/go-isatty v0.0.14
2323
github.com/mattn/go-shellwords v1.0.12
24-
github.com/moby/buildkit v0.9.1-0.20211019185819-8778943ac3da
24+
github.com/moby/buildkit v0.10.0-rc2.0.20220308185020-fdecd0ae108b
2525
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
2626
github.com/morikuni/aec v1.0.0
2727
github.com/opencontainers/go-digest v1.0.0
@@ -47,6 +47,7 @@ require (
4747
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4848
github.com/cnabio/cnab-go v0.10.0-beta1 // indirect
4949
github.com/containerd/continuity v0.2.2 // indirect
50+
github.com/containerd/ttrpc v1.1.0 // indirect
5051
github.com/containerd/typeurl v1.0.2 // indirect
5152
github.com/davecgh/go-spew v1.1.1 // indirect
5253
github.com/docker/distribution v2.8.0+incompatible // indirect
@@ -58,10 +59,10 @@ require (
5859
github.com/go-logr/logr v1.2.2 // indirect
5960
github.com/go-logr/stdr v1.2.2 // indirect
6061
github.com/gofrs/flock v0.8.0 // indirect
61-
github.com/gogo/googleapis v1.4.0 // indirect
62+
github.com/gogo/googleapis v1.4.1 // indirect
6263
github.com/gogo/protobuf v1.3.2 // indirect
6364
github.com/golang/protobuf v1.5.2 // indirect
64-
github.com/google/go-cmp v0.5.6 // indirect
65+
github.com/google/go-cmp v0.5.7 // indirect
6566
github.com/google/gofuzz v1.2.0 // indirect
6667
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6768
github.com/gorilla/mux v1.8.0 // indirect
@@ -72,73 +73,67 @@ require (
7273
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7374
github.com/json-iterator/go v1.1.12 // indirect
7475
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
75-
github.com/klauspost/compress v1.13.5 // indirect
76+
github.com/klauspost/compress v1.15.0 // indirect
7677
github.com/mattn/go-colorable v0.1.12 // indirect
7778
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7879
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
7980
github.com/miekg/pkcs11 v1.0.3 // indirect
8081
github.com/mitchellh/mapstructure v1.4.3 // indirect
8182
github.com/moby/locker v1.0.1 // indirect
82-
github.com/moby/sys/mount v0.2.0 // indirect
83-
github.com/moby/sys/mountinfo v0.5.0 // indirect
8483
github.com/moby/sys/signal v0.6.0 // indirect
8584
github.com/moby/sys/symlink v0.2.0 // indirect
8685
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8786
github.com/modern-go/reflect2 v1.0.2 // indirect
8887
github.com/opencontainers/runc v1.1.0 // indirect
8988
github.com/pelletier/go-toml v1.9.4 // indirect
9089
github.com/pmezard/go-difflib v1.0.0 // indirect
91-
github.com/prometheus/client_golang v1.11.0 // indirect
90+
github.com/prometheus/client_golang v1.12.1 // indirect
9291
github.com/prometheus/client_model v0.2.0 // indirect
93-
github.com/prometheus/common v0.30.0 // indirect
92+
github.com/prometheus/common v0.32.1 // indirect
9493
github.com/prometheus/procfs v0.7.3 // indirect
9594
github.com/qri-io/jsonpointer v0.1.0 // indirect
9695
github.com/qri-io/jsonschema v0.1.1 // indirect
9796
github.com/sergi/go-diff v1.1.0 // indirect
98-
github.com/tonistiigi/fsutil v0.0.0-20210818161904-4442383b5028 // indirect
97+
github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274 // indirect
9998
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
10099
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
101100
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
102101
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
103102
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
104-
go.opentelemetry.io/contrib v0.21.0 // indirect
105-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
106-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.21.0 // indirect
107-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0 // indirect
108-
go.opentelemetry.io/otel v1.3.0 // indirect
109-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
110-
go.opentelemetry.io/otel/internal/metric v0.21.0 // indirect
111-
go.opentelemetry.io/otel/metric v0.21.0 // indirect
112-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
113-
go.opentelemetry.io/otel/trace v1.3.0 // indirect
114-
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
115-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
106+
go.opentelemetry.io/otel v1.4.1 // indirect
107+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
108+
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
109+
go.opentelemetry.io/otel/metric v0.27.0 // indirect
110+
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
111+
go.opentelemetry.io/otel/trace v1.4.1 // indirect
112+
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
113+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
116114
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
117115
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
118-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
116+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
119117
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
120118
golang.org/x/text v0.3.7 // indirect
121119
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
122120
google.golang.org/appengine v1.6.7 // indirect
123121
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
124-
google.golang.org/grpc v1.43.0 // indirect
122+
google.golang.org/grpc v1.44.0 // indirect
125123
google.golang.org/protobuf v1.27.1 // indirect
126124
gopkg.in/inf.v0 v0.9.1 // indirect
127125
gopkg.in/yaml.v2 v2.4.0 // indirect
128126
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
129-
k8s.io/apimachinery v0.22.5 // indirect
130-
k8s.io/client-go v0.22.5 // indirect
127+
k8s.io/apimachinery v0.23.4 // indirect
128+
k8s.io/client-go v0.23.4 // indirect
131129
k8s.io/klog/v2 v2.30.0 // indirect
132-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
133-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
130+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
131+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
134133
sigs.k8s.io/yaml v1.2.0 // indirect
135134
)
136135

137-
// (for buildx)
138136
replace (
139-
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20210702143511-f782d1355eff+incompatible
140-
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220121014307-40bb9831756f+incompatible
141-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.0.0-20210714055410-d010b05b4939
142-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/httptrace/otelhttptrace v0.0.0-20210714055410-d010b05b4939
143-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/otelhttp v0.0.0-20210714055410-d010b05b4939
137+
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20220309205733-2b52f62e9627+incompatible
138+
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220309172631-83b51522df43+incompatible
144139
)

0 commit comments

Comments
 (0)