Skip to content

Commit

Permalink
Merge pull request #2697 from dims/update-to-new-docker-and-container…
Browse files Browse the repository at this point in the history
…d-versions

Update to new docker(v19.03.13) and containerd(1.4.1)
  • Loading branch information
bobbypage authored Oct 29, 2020
2 parents 771d518 + fbcebbb commit 6949602
Show file tree
Hide file tree
Showing 2 changed files with 169 additions and 67 deletions.
33 changes: 13 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,45 @@ module github.com/google/cadvisor
go 1.13

require (
cloud.google.com/go v0.26.0
cloud.google.com/go v0.51.0
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 // indirect
github.com/aws/aws-sdk-go v1.6.10
github.com/blang/semver v3.1.0+incompatible
github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775 // indirect
github.com/containerd/containerd v1.4.0-beta.2
github.com/containerd/ttrpc v1.0.1 // indirect
github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab // indirect
github.com/aws/aws-sdk-go v1.35.5
github.com/blang/semver v3.5.0+incompatible
github.com/containerd/containerd v1.4.1
github.com/containerd/ttrpc v1.0.2 // indirect
github.com/containerd/typeurl v1.0.1
github.com/coreos/go-systemd/v22 v22.1.0 // indirect
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible // indirect
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0
github.com/euank/go-kmsg-parser v2.0.0+incompatible
github.com/go-ini/ini v1.9.0 // indirect
github.com/gogo/protobuf v1.3.1
github.com/google/uuid v1.1.1 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
github.com/karrick/godirwalk v1.7.5
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
github.com/morikuni/aec v1.0.0 // indirect
github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc91
github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2
github.com/opencontainers/selinux v1.5.2 // indirect
github.com/opencontainers/runc v1.0.0-rc92
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.10.0
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/stretchr/testify v1.4.0
github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe // indirect
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20200819035508-9a32b3aa38f5
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a
golang.org/x/text v0.3.3 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/grpc v1.27.0
google.golang.org/grpc v1.27.1
google.golang.org/protobuf v1.24.0 // indirect
gotest.tools v2.2.0+incompatible // indirect
k8s.io/klog/v2 v2.2.0
k8s.io/mount-utils v0.20.0-alpha.1
k8s.io/mount-utils v0.20.0-alpha.3
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
)
Loading

0 comments on commit 6949602

Please sign in to comment.