Skip to content

Commit 981aea6

Browse files
committed
bump buildx to 0.7.1
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 4164984 commit 981aea6

File tree

5 files changed

+812
-342
lines changed

5 files changed

+812
-342
lines changed

docs/yaml/main/generate.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,16 @@ func generateCliYaml(opts *options) error {
3232
disableFlagsInUseLine(cmd)
3333

3434
cmd.DisableAutoGenTag = true
35-
return clidocstool.GenYamlTree(cmd, opts.target)
35+
tool, err := clidocstool.New(clidocstool.Options{
36+
Root: cmd,
37+
SourceDir: opts.source,
38+
TargetDir: opts.target,
39+
Plugin: true,
40+
})
41+
if err != nil {
42+
return err
43+
}
44+
return tool.GenYamlTree(cmd)
3645
}
3746

3847
func disableFlagsInUseLine(cmd *cobra.Command) {

go.mod

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.5.8
1212
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e
13-
github.com/docker/buildx v0.5.2-0.20210422185057-908a856079fc
14-
github.com/docker/cli v20.10.7+incompatible
15-
github.com/docker/cli-docs-tool v0.1.1
13+
github.com/docker/buildx v0.7.1
14+
github.com/docker/cli v20.10.12+incompatible
15+
github.com/docker/cli-docs-tool v0.2.1
1616
github.com/docker/docker v20.10.7+incompatible
1717
github.com/docker/go-connections v0.4.0
1818
github.com/docker/go-units v0.4.0
@@ -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.8.2-0.20210401015549-df49b648c8bf
24+
github.com/moby/buildkit v0.9.1-0.20211019185819-8778943ac3da
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
@@ -40,41 +40,37 @@ require (
4040
require (
4141
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4242
github.com/Masterminds/semver v1.5.0 // indirect
43-
github.com/Microsoft/go-winio v0.4.17 // indirect
44-
github.com/Microsoft/hcsshim v0.8.23 // indirect
43+
github.com/Microsoft/go-winio v0.5.0 // indirect
4544
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
4645
github.com/beorn7/perks v1.0.1 // indirect
4746
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4847
github.com/cnabio/cnab-go v0.10.0-beta1 // indirect
49-
github.com/containerd/cgroups v1.0.1 // indirect
5048
github.com/containerd/continuity v0.1.0 // indirect
5149
github.com/containerd/typeurl v1.0.2 // indirect
5250
github.com/davecgh/go-spew v1.1.1 // indirect
5351
github.com/docker/distribution v2.7.1+incompatible // indirect
54-
github.com/docker/docker-credential-helpers v0.6.4-0.20210125172408-38bea2ce277a // indirect
52+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
5553
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
5654
github.com/docker/go-metrics v0.0.1 // indirect
55+
github.com/felixge/httpsnoop v1.0.2 // indirect
5756
github.com/fvbommel/sortorder v1.0.1 // indirect
5857
github.com/go-logr/logr v0.4.0 // indirect
5958
github.com/gofrs/flock v0.8.0 // indirect
6059
github.com/gogo/googleapis v1.4.0 // indirect
6160
github.com/gogo/protobuf v1.3.2 // indirect
62-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6361
github.com/golang/protobuf v1.5.2 // indirect
6462
github.com/google/go-cmp v0.5.6 // indirect
6563
github.com/google/gofuzz v1.1.0 // indirect
6664
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6765
github.com/gorilla/mux v1.8.0 // indirect
6866
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
69-
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
67+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
7068
github.com/hashicorp/errwrap v1.0.0 // indirect
7169
github.com/imdario/mergo v0.3.12 // indirect
7270
github.com/inconshreveable/mousetrap v1.0.0 // indirect
73-
github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea // indirect
7471
github.com/json-iterator/go v1.1.12 // indirect
7572
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
76-
github.com/klauspost/compress v1.11.13 // indirect
77-
github.com/kr/pty v1.1.8 // indirect
73+
github.com/klauspost/compress v1.13.5 // indirect
7874
github.com/mattn/go-colorable v0.1.12 // indirect
7975
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
8076
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
@@ -83,47 +79,65 @@ require (
8379
github.com/moby/locker v1.0.1 // indirect
8480
github.com/moby/sys/mount v0.2.0 // indirect
8581
github.com/moby/sys/mountinfo v0.4.1 // indirect
82+
github.com/moby/sys/signal v0.5.0 // indirect
8683
github.com/moby/sys/symlink v0.1.0 // indirect
8784
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8885
github.com/modern-go/reflect2 v1.0.2 // indirect
8986
github.com/opencontainers/runc v1.0.2 // indirect
90-
github.com/opentracing/opentracing-go v1.2.0 // indirect
87+
github.com/pelletier/go-toml v1.9.4 // indirect
9188
github.com/pmezard/go-difflib v1.0.0 // indirect
92-
github.com/prometheus/client_golang v1.7.1 // indirect
89+
github.com/prometheus/client_golang v1.11.0 // indirect
9390
github.com/prometheus/client_model v0.2.0 // indirect
94-
github.com/prometheus/common v0.10.0 // indirect
91+
github.com/prometheus/common v0.26.0 // indirect
9592
github.com/prometheus/procfs v0.6.0 // indirect
9693
github.com/qri-io/jsonpointer v0.1.0 // indirect
9794
github.com/qri-io/jsonschema v0.1.1 // indirect
9895
github.com/sergi/go-diff v1.1.0 // indirect
9996
github.com/theupdateframework/notary v0.6.1 // indirect
100-
github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85 // indirect
97+
github.com/tonistiigi/fsutil v0.0.0-20210818161904-4442383b5028 // indirect
10198
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
99+
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
102100
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
103101
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
104102
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
105-
go.opencensus.io v0.23.0 // indirect
103+
go.opentelemetry.io/contrib v0.21.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.21.0 // indirect
106+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0 // indirect
107+
go.opentelemetry.io/otel v1.0.0-RC1 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC1 // indirect
109+
go.opentelemetry.io/otel/internal/metric v0.21.0 // indirect
110+
go.opentelemetry.io/otel/metric v0.21.0 // indirect
111+
go.opentelemetry.io/otel/sdk v1.0.0-RC1 // indirect
112+
go.opentelemetry.io/otel/trace v1.0.0-RC1 // indirect
113+
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
106114
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
107115
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
108116
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
109117
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
110118
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
111119
golang.org/x/text v0.3.7 // indirect
112-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
120+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
113121
google.golang.org/appengine v1.6.7 // indirect
114122
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
115123
google.golang.org/grpc v1.42.0 // indirect
116124
google.golang.org/protobuf v1.27.1 // indirect
117125
gopkg.in/inf.v0 v0.9.1 // indirect
118126
gopkg.in/yaml.v2 v2.4.0 // indirect
119127
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
120-
k8s.io/apimachinery v0.21.0 // indirect
121-
k8s.io/client-go v0.21.0 // indirect
122-
k8s.io/klog/v2 v2.8.0 // indirect
123-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
124-
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
128+
k8s.io/apimachinery v0.22.1 // indirect
129+
k8s.io/client-go v0.22.1 // indirect
130+
k8s.io/klog/v2 v2.9.0 // indirect
131+
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
125133
sigs.k8s.io/yaml v1.2.0 // indirect
126134
)
127135

128136
// (for buildx)
129-
replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
137+
replace (
138+
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20210702143511-f782d1355eff+incompatible
139+
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220121014307-40bb9831756f+incompatible
140+
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
141+
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
142+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/otelhttp v0.0.0-20210714055410-d010b05b4939
143+
)

0 commit comments

Comments
 (0)