From 3022f6f421aa9e3280958dcc38c4e46c466eb439 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 20 Dec 2022 16:51:43 +0100 Subject: [PATCH] bump CLI toward v23.0.0-beta Signed-off-by: Nicolas De Loof --- go.mod | 6 +++--- go.sum | 8 ++++---- pkg/mocks/mock_docker_cli.go | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 2e801be5ccc..f8093155476 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/containerd/containerd v1.6.14 github.com/distribution/distribution/v3 v3.0.0-20221201083218-92d136e113cf github.com/docker/buildx v0.9.1 // when updating, also update the replace rules accordingly - github.com/docker/cli v20.10.20+incompatible // replaced; see replace rule for actual version + github.com/docker/cli v23.0.0-beta.1.0.20221209132446-990674901b4f+incompatible // replaced; see replace rule for actual version github.com/docker/cli-docs-tool v0.5.0 github.com/docker/docker v20.10.20+incompatible // replaced; see replace rule for actual version github.com/docker/go-connections v0.4.0 @@ -156,8 +156,8 @@ replace ( // Override for e2e tests github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7 - 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.20221021173910-5aac513617f0+incompatible // 22.06 branch + github.com/docker/cli => github.com/docker/cli v23.0.0-beta.1.0.20221209132446-990674901b4f+incompatible // 23.x master branch + github.com/docker/docker => github.com/docker/docker v23.0.0-beta.1+incompatible // 23.x master branch github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx // For k8s dependencies, we use a replace directive, to prevent them being diff --git a/go.sum b/go.sum index 5e2b4e75db2..518ede777aa 100644 --- a/go.sum +++ b/go.sum @@ -159,15 +159,15 @@ github.com/distribution/distribution/v3 v3.0.0-20221201083218-92d136e113cf h1:q0 github.com/distribution/distribution/v3 v3.0.0-20221201083218-92d136e113cf/go.mod h1:4x0IxAMsdeCSTr9UopCvp6MnryD2nyRLycsOrgvveAs= github.com/docker/buildx v0.9.1 h1:VLyyJ1s4seWHmBY+oNc0J4+jHluRHLyv8KHOYYdSu3U= github.com/docker/buildx v0.9.1/go.mod h1:zHiKsXO4H8cgUQFaNCqitRroVta3Kj9TVzhMhe5GLlk= -github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible h1:je9pK1shVhf561ujVYyn8ycOEfbgXFXryWxNqkYqsxg= -github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v23.0.0-beta.1.0.20221209132446-990674901b4f+incompatible h1:XgqB6qYCYJqkoS1zPqMi+9VTvP2Vt7qmbQipTaF67xQ= +github.com/docker/cli v23.0.0-beta.1.0.20221209132446-990674901b4f+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli-docs-tool v0.5.0 h1:EjGwI6EyB7YemHCC7R8mwXszJTbuq0T0pFuDC5bMhcE= github.com/docker/cli-docs-tool v0.5.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o= 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.20221021173910-5aac513617f0+incompatible h1:s5C/kGjAucPHfx9nwIKZOCNvKOEiRUgJxQpwSmr2+RU= -github.com/docker/docker v20.10.3-0.20221021173910-5aac513617f0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v23.0.0-beta.1+incompatible h1:0Xv+AFPWxTbmohdLK57pYRPmefCKthtfRF/qQwXHolg= +github.com/docker/docker v23.0.0-beta.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= diff --git a/pkg/mocks/mock_docker_cli.go b/pkg/mocks/mock_docker_cli.go index e783c055b78..54e480d1093 100644 --- a/pkg/mocks/mock_docker_cli.go +++ b/pkg/mocks/mock_docker_cli.go @@ -147,6 +147,20 @@ func (mr *MockCliMockRecorder) CurrentContext() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CurrentContext", reflect.TypeOf((*MockCli)(nil).CurrentContext)) } +// CurrentVersion mocks base method. +func (m *MockCli) CurrentVersion() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CurrentVersion") + ret0, _ := ret[0].(string) + return ret0 +} + +// CurrentVersion indicates an expected call of CurrentVersion. +func (mr *MockCliMockRecorder) CurrentVersion() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CurrentVersion", reflect.TypeOf((*MockCli)(nil).CurrentVersion)) +} + // DefaultVersion mocks base method. func (m *MockCli) DefaultVersion() string { m.ctrl.T.Helper()