Skip to content

Commit 9551df3

Browse files
committed
Remove docker/cli overwrite
Helm now depends on Oras v1.0.x, which contains a newer version. Signed-off-by: Hidde Beydals <hello@hidde.co>
1 parent 1e894fd commit 9551df3

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

go.mod

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ replace (
3333
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0
3434
)
3535

36-
// Fix CVE-2021-41092
37-
// Due to https://github.com/oras-project/oras-go/blob/v0.4.0/go.mod#L14
38-
// pulled in by Helm.
39-
replace github.com/docker/cli => github.com/docker/cli v20.10.9+incompatible
40-
4136
// Fix CVE-2021-30465
4237
// Fix CVE-2021-43784
4338
// Fix GO-2021-0085

go.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,9 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
258258
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 h1:DBZ2sN7CK6dgvHVpQsQj4sRMCbWTmd17l+5SUCjnQSY=
259259
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684/go.mod h1:UfCu3YXJJCI+IdnqGgYP82dk2+Joxmv+mUTVBES6wac=
260260
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
261-
github.com/docker/cli v20.10.9+incompatible h1:OJ7YkwQA+k2Oi51lmCojpjiygKpi76P7bg91b2eJxYU=
262-
github.com/docker/cli v20.10.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
261+
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
262+
github.com/docker/cli v20.10.11+incompatible h1:tXU1ezXcruZQRrMP8RN2z9N91h+6egZTS1gsPsKantc=
263+
github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
263264
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
264265
github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY=
265266
github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=

0 commit comments

Comments
 (0)