From 1d50d8f91fc2ab6bcf8e6653658137f9d87bbb3d Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:18:01 +0200 Subject: [PATCH] update docker engine API to apply fix of CVE-2022-39253 Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- e2e/go.mod | 2 +- e2e/go.sum | 4 ++-- go.mod | 8 ++++---- go.sum | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index a7bb13efb18..3b857d20097 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -155,7 +155,7 @@ require ( replace ( github.com/docker/cli => github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible // 22.06 master branch - github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch + github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible // 22.06 branch github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2 // Can be removed on next bump of containerd to > 1.6.4 diff --git a/e2e/go.sum b/e2e/go.sum index 191848d3b02..02be10a2474 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -149,8 +149,8 @@ github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible/go.mod github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM= -github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible h1:P2/T1kERNVwBsoVYRsiOvl9vi56QEtR8aRrVOf+B+0Y= +github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= diff --git a/go.mod b/go.mod index 78c5c9b7697..81cfbce3bc5 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/containerd/containerd v1.6.8 github.com/distribution/distribution/v3 v3.0.0-20220907155224-78b9c98c5c31 github.com/docker/buildx v0.9.1 // when updating, also update the replace rules accordingly - github.com/docker/cli v20.10.19+incompatible + github.com/docker/cli v20.10.19+incompatible // v22.06.x - see "replace" for the actual version github.com/docker/cli-docs-tool v0.5.0 - github.com/docker/docker v20.10.19+incompatible + github.com/docker/docker v20.10.19+incompatible // v22.06.x - see "replace" for the actual version github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 github.com/golang/mock v1.6.0 @@ -21,7 +21,7 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/mattn/go-isatty v0.0.16 github.com/mattn/go-shellwords v1.0.12 - github.com/moby/buildkit v0.10.4 + github.com/moby/buildkit v0.10.4 // v22.06.x - see "replace" for the actual version github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 @@ -149,7 +149,7 @@ require ( replace ( github.com/docker/cli => github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible // 22.06 master branch - github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch + github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible // 22.06 branch github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2 // Can be removed on next bump of containerd to > 1.6.4 diff --git a/go.sum b/go.sum index c47da618b50..ebaaf373b38 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/docker/cli-docs-tool v0.5.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbI github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM= -github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible h1:P2/T1kERNVwBsoVYRsiOvl9vi56QEtR8aRrVOf+B+0Y= +github.com/docker/docker v20.10.3-0.20221021004402-28c34259c755+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=