From 454663fdc54e77403adac754e2cc8715e1f789d6 Mon Sep 17 00:00:00 2001 From: SandhyaRavi2403 Date: Tue, 6 Aug 2024 13:19:22 +0530 Subject: [PATCH] fix: update the docker to v26.1.5+incompatible to fix cve (#2507) fix: update the github.com/docker/docker to v26.1.5+incompatible to fix cve --- apptests/go.mod | 3 ++- apptests/go.sum | 6 ++++-- magefiles/go.mod | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apptests/go.mod b/apptests/go.mod index f985400a6..d6a386a96 100644 --- a/apptests/go.mod +++ b/apptests/go.mod @@ -5,7 +5,7 @@ go 1.22.0 require ( github.com/docker/cli v26.1.4+incompatible github.com/docker/distribution v2.8.3+incompatible - github.com/docker/docker v24.0.9+incompatible + github.com/docker/docker v26.1.5+incompatible github.com/drone/envsubst v1.0.3 github.com/fluxcd/cli-utils v0.36.0-flux.7 github.com/fluxcd/flux2/v2 v2.3.0 @@ -123,6 +123,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect github.com/moby/term v0.5.0 // indirect diff --git a/apptests/go.sum b/apptests/go.sum index ed9dfebfb..53c9574a4 100644 --- a/apptests/go.sum +++ b/apptests/go.sum @@ -79,8 +79,8 @@ github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwen github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= +github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -289,6 +289,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mittwald/go-helm-client v0.12.9 h1:tfI5ECgrbfAolA9TnlCeA5F2TEIvdsOxVmoSyW80lCI= github.com/mittwald/go-helm-client v0.12.9/go.mod h1:ukR3Et5zbfBij7bFL1ZnLvPytsbBXCrI2qQYr2yVi9I= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= diff --git a/magefiles/go.mod b/magefiles/go.mod index f5f46169e..5c2ad3ea8 100644 --- a/magefiles/go.mod +++ b/magefiles/go.mod @@ -2,7 +2,7 @@ module github.com/mesosphere/kommander-applications/magefiles go 1.21 -replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220414164044-61404de7df1a+incompatible +replace github.com/docker/docker => github.com/docker/docker v26.1.5+incompatible require github.com/mesosphere/d2iq-daggers v0.7.0