From 2f6987eb8b5415b3429666afdc3e3fb902c3ad39 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 12 Sep 2026 02:31:15 +0900 Subject: [PATCH] vendor: github.com/docker/cli as a proper go.mod Test docker/cli PR 7299 Signed-off-by: Akihiro Suda --- Makefile | 2 +- cmd/cmdtrace/cmd_span.go | 4 +-- cmd/compose/alpha.go | 2 +- cmd/compose/attach.go | 2 +- cmd/compose/backend.go | 2 +- cmd/compose/bridge.go | 4 +-- cmd/compose/build.go | 4 +-- cmd/compose/commit.go | 4 +-- cmd/compose/completion.go | 2 +- cmd/compose/compose.go | 8 +++--- cmd/compose/compose_progress_test.go | 2 +- cmd/compose/config.go | 2 +- cmd/compose/config_test.go | 2 +- cmd/compose/cp.go | 4 +-- cmd/compose/create.go | 2 +- cmd/compose/down.go | 2 +- cmd/compose/events.go | 2 +- cmd/compose/exec.go | 4 +-- cmd/compose/export.go | 2 +- cmd/compose/generate.go | 2 +- cmd/compose/hooks.go | 4 +-- cmd/compose/hooks_test.go | 2 +- cmd/compose/images.go | 2 +- cmd/compose/kill.go | 2 +- cmd/compose/list.go | 4 +-- cmd/compose/logs.go | 2 +- cmd/compose/options.go | 2 +- cmd/compose/options_test.go | 2 +- cmd/compose/pause.go | 2 +- cmd/compose/port.go | 2 +- cmd/compose/ps.go | 6 ++-- cmd/compose/publish.go | 4 +-- cmd/compose/pull.go | 2 +- cmd/compose/push.go | 2 +- cmd/compose/remove.go | 2 +- cmd/compose/restart.go | 2 +- cmd/compose/run.go | 6 ++-- cmd/compose/scale.go | 2 +- cmd/compose/start.go | 2 +- cmd/compose/stats.go | 4 +-- cmd/compose/stop.go | 2 +- cmd/compose/top.go | 2 +- cmd/compose/up.go | 2 +- cmd/compose/up_test.go | 2 +- cmd/compose/version.go | 2 +- cmd/compose/version_test.go | 2 +- cmd/compose/viz.go | 2 +- cmd/compose/volumes.go | 6 ++-- cmd/compose/wait.go | 4 +-- cmd/compose/watch.go | 2 +- cmd/formatter/colors.go | 2 +- cmd/formatter/container.go | 2 +- cmd/formatter/container_test.go | 2 +- cmd/main.go | 8 +++--- cmd/prompt/prompt.go | 2 +- cmd/prompt/prompt_test.go | 2 +- docs/examples/sdk/main.go | 4 +-- docs/examples/sdk/options.go | 2 +- docs/sdk.md | 4 +-- docs/yaml/main/generate.go | 2 +- go.mod | 22 +++++++------- go.sum | 40 +++++++++++++------------- internal/desktop/client.go | 4 +-- internal/oci/resolver.go | 2 +- internal/oci/resolver_test.go | 2 +- internal/registry/registry.go | 2 +- internal/tracing/docker_context.go | 4 +-- internal/tracing/tracing.go | 2 +- internal/tracing/tracing_test.go | 4 +-- pkg/api/api.go | 2 +- pkg/bridge/convert.go | 4 +-- pkg/bridge/transformers.go | 2 +- pkg/compose/apiSocket.go | 2 +- pkg/compose/attach_service.go | 2 +- pkg/compose/build_bake.go | 8 +++--- pkg/compose/build_bake_test.go | 2 +- pkg/compose/build_classic.go | 4 +-- pkg/compose/compose.go | 8 +++--- pkg/compose/cp.go | 2 +- pkg/compose/docker_cli_providers.go | 2 +- pkg/compose/down_test.go | 2 +- pkg/compose/exec.go | 4 +-- pkg/compose/export.go | 2 +- pkg/compose/hook_test.go | 2 +- pkg/compose/images_test.go | 2 +- pkg/compose/model.go | 2 +- pkg/compose/plugins.go | 4 +-- pkg/compose/publish_test.go | 2 +- pkg/compose/pull.go | 2 +- pkg/compose/pull_test.go | 2 +- pkg/compose/run.go | 4 +-- pkg/compose/service_containers_test.go | 2 +- pkg/compose/shellout.go | 6 ++-- pkg/compose/up.go | 2 +- pkg/compose/watch.go | 2 +- pkg/compose/watch_test.go | 2 +- pkg/dryrun/dryrunclient.go | 4 +-- pkg/mocks/mock_docker_cli.go | 14 ++++----- pkg/remote/git.go | 2 +- pkg/remote/oci.go | 2 +- 100 files changed, 178 insertions(+), 176 deletions(-) diff --git a/Makefile b/Makefile index db04afa0a0a..4cd71842025 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ MOCKGEN = go run go.uber.org/mock/mockgen@v0.4.0 .PHONY: mocks mocks: ## Regenerate pkg/mocks - $(MOCKGEN) -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/cli/command Cli + $(MOCKGEN) -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/v29/cli/command Cli $(MOCKGEN) -destination pkg/mocks/mock_docker_api.go -package mocks github.com/moby/moby/client APIClient $(MOCKGEN) -destination pkg/mocks/mock_docker_compose_api.go -package mocks -source=./pkg/api/api.go diff --git a/cmd/cmdtrace/cmd_span.go b/cmd/cmdtrace/cmd_span.go index a08a158b480..bd88ccf597d 100644 --- a/cmd/cmdtrace/cmd_span.go +++ b/cmd/cmdtrace/cmd_span.go @@ -24,8 +24,8 @@ import ( "strings" "time" - dockercli "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + dockercli "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" flag "github.com/spf13/pflag" diff --git a/cmd/compose/alpha.go b/cmd/compose/alpha.go index 8acc969ca30..2e5777bb8f1 100644 --- a/cmd/compose/alpha.go +++ b/cmd/compose/alpha.go @@ -14,7 +14,7 @@ package compose import ( - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" ) diff --git a/cmd/compose/attach.go b/cmd/compose/attach.go index 20f23fca20f..9a69a26ce7e 100644 --- a/cmd/compose/attach.go +++ b/cmd/compose/attach.go @@ -19,7 +19,7 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/backend.go b/cmd/compose/backend.go index cc7d07ac778..4ee09317a25 100644 --- a/cmd/compose/backend.go +++ b/cmd/compose/backend.go @@ -19,7 +19,7 @@ package compose import ( "time" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/docker/compose/v5/pkg/api" "github.com/docker/compose/v5/pkg/compose" diff --git a/cmd/compose/bridge.go b/cmd/compose/bridge.go index 61c641d843b..4e892f9c9e9 100644 --- a/cmd/compose/bridge.go +++ b/cmd/compose/bridge.go @@ -22,8 +22,8 @@ import ( "io" "github.com/distribution/reference" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/docker/go-units" "github.com/moby/moby/api/types/image" "github.com/moby/moby/client/pkg/stringid" diff --git a/cmd/compose/build.go b/cmd/compose/build.go index 3dc95367759..34f93efca3a 100644 --- a/cmd/compose/build.go +++ b/cmd/compose/build.go @@ -24,8 +24,8 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" - cliopts "github.com/docker/cli/opts" + "github.com/docker/cli/v29/cli/command" + cliopts "github.com/docker/cli/v29/opts" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/display" diff --git a/cmd/compose/commit.go b/cmd/compose/commit.go index 730deb2e561..c258899b73a 100644 --- a/cmd/compose/commit.go +++ b/cmd/compose/commit.go @@ -19,8 +19,8 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/opts" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/completion.go b/cmd/compose/completion.go index 4d39a1982e0..17c2b0c0f32 100644 --- a/cmd/compose/completion.go +++ b/cmd/compose/completion.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/compose-spec/compose-go/v2/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 14757f8dd5d..2fad96fecd4 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -35,10 +35,10 @@ import ( composepaths "github.com/compose-spec/compose-go/v2/paths" "github.com/compose-spec/compose-go/v2/types" composegoutils "github.com/compose-spec/compose-go/v2/utils" - dockercli "github.com/docker/cli/cli" - "github.com/docker/cli/cli-plugins/metadata" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/pkg/kvfile" + dockercli "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli-plugins/metadata" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/pkg/kvfile" "github.com/morikuni/aec" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/compose/compose_progress_test.go b/cmd/compose/compose_progress_test.go index 6f5ede4f4b5..7764ed5cf8d 100644 --- a/cmd/compose/compose_progress_test.go +++ b/cmd/compose/compose_progress_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/creack/pty" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/cmd/compose/config.go b/cmd/compose/config.go index 8c4065f43f8..157f2e5afbe 100644 --- a/cmd/compose/config.go +++ b/cmd/compose/config.go @@ -30,7 +30,7 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/template" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.yaml.in/yaml/v4" diff --git a/cmd/compose/config_test.go b/cmd/compose/config_test.go index 8807850a20d..2e3183f0196 100644 --- a/cmd/compose/config_test.go +++ b/cmd/compose/config_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/moby/moby/api/types/registry" "github.com/moby/moby/client" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/compose/cp.go b/cmd/compose/cp.go index 17f7411309d..e0035c1654e 100644 --- a/cmd/compose/cp.go +++ b/cmd/compose/cp.go @@ -20,8 +20,8 @@ import ( "context" "errors" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/create.go b/cmd/compose/create.go index d8dc01b8173..1e920c584b5 100644 --- a/cmd/compose/create.go +++ b/cmd/compose/create.go @@ -26,7 +26,7 @@ import ( "time" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/compose/down.go b/cmd/compose/down.go index d74c8175292..a46aaa63629 100644 --- a/cmd/compose/down.go +++ b/cmd/compose/down.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/compose/events.go b/cmd/compose/events.go index ff1fb86aa78..7ef6543065e 100644 --- a/cmd/compose/events.go +++ b/cmd/compose/events.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/exec.go b/cmd/compose/exec.go index a8450b4a237..a1f5a0aa29f 100644 --- a/cmd/compose/exec.go +++ b/cmd/compose/exec.go @@ -23,8 +23,8 @@ import ( "strconv" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/compose/export.go b/cmd/compose/export.go index 4c7eaf7ef5d..8372c42ba4e 100644 --- a/cmd/compose/export.go +++ b/cmd/compose/export.go @@ -19,7 +19,7 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/generate.go b/cmd/compose/generate.go index e84b3b11138..132727f2c13 100644 --- a/cmd/compose/generate.go +++ b/cmd/compose/generate.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/hooks.go b/cmd/compose/hooks.go index 1697c8686b1..5c16d8ed66d 100644 --- a/cmd/compose/hooks.go +++ b/cmd/compose/hooks.go @@ -24,8 +24,8 @@ import ( "time" "github.com/compose-spec/compose-go/v2/cli" - "github.com/docker/cli/cli-plugins/hooks" - "github.com/docker/cli/cli-plugins/metadata" + "github.com/docker/cli/v29/cli-plugins/hooks" + "github.com/docker/cli/v29/cli-plugins/metadata" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/formatter" diff --git a/cmd/compose/hooks_test.go b/cmd/compose/hooks_test.go index fc53c75edbb..f83562db950 100644 --- a/cmd/compose/hooks_test.go +++ b/cmd/compose/hooks_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/docker/cli/cli-plugins/hooks" + "github.com/docker/cli/v29/cli-plugins/hooks" "gotest.tools/v3/assert" "github.com/docker/compose/v5/cmd/formatter" diff --git a/cmd/compose/images.go b/cmd/compose/images.go index ead066b17a6..ff0f890fbeb 100644 --- a/cmd/compose/images.go +++ b/cmd/compose/images.go @@ -26,7 +26,7 @@ import ( "time" "github.com/containerd/platforms" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/docker/go-units" "github.com/moby/moby/client/pkg/stringid" "github.com/spf13/cobra" diff --git a/cmd/compose/kill.go b/cmd/compose/kill.go index 1ec83153bc9..ede463fa8df 100644 --- a/cmd/compose/kill.go +++ b/cmd/compose/kill.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/list.go b/cmd/compose/list.go index 4e396f7cade..388267ae35f 100644 --- a/cmd/compose/list.go +++ b/cmd/compose/list.go @@ -24,8 +24,8 @@ import ( "regexp" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/opts" "github.com/moby/moby/client" "github.com/spf13/cobra" diff --git a/cmd/compose/logs.go b/cmd/compose/logs.go index 8f1b2f11862..0f9049ce089 100644 --- a/cmd/compose/logs.go +++ b/cmd/compose/logs.go @@ -21,7 +21,7 @@ import ( "errors" "github.com/docker/cli-docs-tool/annotation" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/formatter" diff --git a/cmd/compose/options.go b/cmd/compose/options.go index 2d31cd4556c..9a2063f98fc 100644 --- a/cmd/compose/options.go +++ b/cmd/compose/options.go @@ -30,7 +30,7 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/template" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/docker/compose/v5/cmd/display" "github.com/docker/compose/v5/cmd/prompt" diff --git a/cmd/compose/options_test.go b/cmd/compose/options_test.go index c015a7a7238..19a8295b524 100644 --- a/cmd/compose/options_test.go +++ b/cmd/compose/options_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/cmd/compose/pause.go b/cmd/compose/pause.go index 8b8fb4a5faa..96f5ed3edb2 100644 --- a/cmd/compose/pause.go +++ b/cmd/compose/pause.go @@ -19,7 +19,7 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/port.go b/cmd/compose/port.go index eed56e58460..09af88db9ec 100644 --- a/cmd/compose/port.go +++ b/cmd/compose/port.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go index 805533ae8af..86e9fa29b1e 100644 --- a/cmd/compose/ps.go +++ b/cmd/compose/ps.go @@ -24,9 +24,9 @@ import ( "sort" "strings" - "github.com/docker/cli/cli/command" - cliformatter "github.com/docker/cli/cli/command/formatter" - cliflags "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli/command" + cliformatter "github.com/docker/cli/v29/cli/command/formatter" + cliflags "github.com/docker/cli/v29/cli/flags" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/formatter" diff --git a/cmd/compose/publish.go b/cmd/compose/publish.go index d58d5518d7a..98e6f7ad1f3 100644 --- a/cmd/compose/publish.go +++ b/cmd/compose/publish.go @@ -20,8 +20,8 @@ import ( "context" "errors" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/compose/pull.go b/cmd/compose/pull.go index 4710d94f1c3..67c474be243 100644 --- a/cmd/compose/pull.go +++ b/cmd/compose/pull.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/morikuni/aec" "github.com/spf13/cobra" diff --git a/cmd/compose/push.go b/cmd/compose/push.go index 178dbab5842..97d30a89664 100644 --- a/cmd/compose/push.go +++ b/cmd/compose/push.go @@ -20,7 +20,7 @@ import ( "context" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/remove.go b/cmd/compose/remove.go index d0765b20a53..171f00beec1 100644 --- a/cmd/compose/remove.go +++ b/cmd/compose/remove.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/restart.go b/cmd/compose/restart.go index a9d97c50263..4e5390d71b2 100644 --- a/cmd/compose/restart.go +++ b/cmd/compose/restart.go @@ -19,7 +19,7 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/run.go b/cmd/compose/run.go index b88f66cf582..4c57a0e0edf 100644 --- a/cmd/compose/run.go +++ b/cmd/compose/run.go @@ -26,9 +26,9 @@ import ( "github.com/compose-spec/compose-go/v2/dotenv" "github.com/compose-spec/compose-go/v2/format" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/opts" "github.com/mattn/go-shellwords" xprogress "github.com/moby/buildkit/util/progress/progressui" "github.com/sirupsen/logrus" diff --git a/cmd/compose/scale.go b/cmd/compose/scale.go index ae474079a6d..b56276a007b 100644 --- a/cmd/compose/scale.go +++ b/cmd/compose/scale.go @@ -26,7 +26,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/start.go b/cmd/compose/start.go index 062efb680d2..8f16e023186 100644 --- a/cmd/compose/start.go +++ b/cmd/compose/start.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/stats.go b/cmd/compose/stats.go index 887da083c2e..869ea6a2707 100644 --- a/cmd/compose/stats.go +++ b/cmd/compose/stats.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/container" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/command/container" "github.com/moby/moby/client" "github.com/spf13/cobra" diff --git a/cmd/compose/stop.go b/cmd/compose/stop.go index be5dec26fc2..79dcfec9b15 100644 --- a/cmd/compose/stop.go +++ b/cmd/compose/stop.go @@ -19,7 +19,7 @@ package compose import ( "context" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/top.go b/cmd/compose/top.go index 0d7f969c841..b2a055d39bf 100644 --- a/cmd/compose/top.go +++ b/cmd/compose/top.go @@ -24,7 +24,7 @@ import ( "strings" "text/tabwriter" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/up.go b/cmd/compose/up.go index 89bb6399126..17ff7e1e2b2 100644 --- a/cmd/compose/up.go +++ b/cmd/compose/up.go @@ -25,7 +25,7 @@ import ( "time" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" xprogress "github.com/moby/buildkit/util/progress/progressui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/compose/up_test.go b/cmd/compose/up_test.go index e6e7fd2224f..bc1ba8944c3 100644 --- a/cmd/compose/up_test.go +++ b/cmd/compose/up_test.go @@ -28,7 +28,7 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/cmd/compose/version.go b/cmd/compose/version.go index 4302c15697b..fe7490871c4 100644 --- a/cmd/compose/version.go +++ b/cmd/compose/version.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/formatter" diff --git a/cmd/compose/version_test.go b/cmd/compose/version_test.go index c9bf9b74eae..9c940c5a9ca 100644 --- a/cmd/compose/version_test.go +++ b/cmd/compose/version_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/cmd/compose/viz.go b/cmd/compose/viz.go index 3e085ad557d..7d39c8b8672 100644 --- a/cmd/compose/viz.go +++ b/cmd/compose/viz.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/volumes.go b/cmd/compose/volumes.go index e0da4f82e3b..1e153884989 100644 --- a/cmd/compose/volumes.go +++ b/cmd/compose/volumes.go @@ -21,9 +21,9 @@ import ( "fmt" "slices" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/command/formatter" + "github.com/docker/cli/v29/cli/flags" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/wait.go b/cmd/compose/wait.go index 9d86fd314cf..cf2260dc6ef 100644 --- a/cmd/compose/wait.go +++ b/cmd/compose/wait.go @@ -20,8 +20,8 @@ import ( "context" "os" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/compose/watch.go b/cmd/compose/watch.go index 3e962171329..bedc6a82a88 100644 --- a/cmd/compose/watch.go +++ b/cmd/compose/watch.go @@ -22,7 +22,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/formatter/colors.go b/cmd/formatter/colors.go index ea0e1a26362..2e8dc28249a 100644 --- a/cmd/formatter/colors.go +++ b/cmd/formatter/colors.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" ) var names = []string{ diff --git a/cmd/formatter/container.go b/cmd/formatter/container.go index 4849f7f09c5..9f3f9ea078e 100644 --- a/cmd/formatter/container.go +++ b/cmd/formatter/container.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v29/cli/command/formatter" "github.com/docker/go-units" "github.com/moby/moby/api/types/container" "github.com/moby/moby/client/pkg/stringid" diff --git a/cmd/formatter/container_test.go b/cmd/formatter/container_test.go index 4996fd85434..b15aef5ff4e 100644 --- a/cmd/formatter/container_test.go +++ b/cmd/formatter/container_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v29/cli/command/formatter" "gotest.tools/v3/assert" "github.com/docker/compose/v5/pkg/api" diff --git a/cmd/main.go b/cmd/main.go index 7d3fab4f5ed..fa05153178a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -19,10 +19,10 @@ package main import ( "os" - dockercli "github.com/docker/cli/cli" - "github.com/docker/cli/cli-plugins/metadata" - "github.com/docker/cli/cli-plugins/plugin" - "github.com/docker/cli/cli/command" + dockercli "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli-plugins/metadata" + "github.com/docker/cli/v29/cli-plugins/plugin" + "github.com/docker/cli/v29/cli/command" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/prompt/prompt.go b/cmd/prompt/prompt.go index e7d75cc7946..d48b087bbfb 100644 --- a/cmd/prompt/prompt.go +++ b/cmd/prompt/prompt.go @@ -24,7 +24,7 @@ import ( "strings" "unicode" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "github.com/docker/compose/v5/pkg/utils" ) diff --git a/cmd/prompt/prompt_test.go b/cmd/prompt/prompt_test.go index 1072d5e9613..4edad8b02e8 100644 --- a/cmd/prompt/prompt_test.go +++ b/cmd/prompt/prompt_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/creack/pty" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "gotest.tools/v3/assert" ) diff --git a/docs/examples/sdk/main.go b/docs/examples/sdk/main.go index 6787bcf2a14..2b22bbbbb23 100644 --- a/docs/examples/sdk/main.go +++ b/docs/examples/sdk/main.go @@ -24,8 +24,8 @@ import ( "context" "log" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/flags" "github.com/docker/compose/v5/pkg/api" "github.com/docker/compose/v5/pkg/compose" diff --git a/docs/examples/sdk/options.go b/docs/examples/sdk/options.go index a132a74aa3c..d68331ed5ab 100644 --- a/docs/examples/sdk/options.go +++ b/docs/examples/sdk/options.go @@ -20,7 +20,7 @@ import ( "bytes" "os" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/docker/compose/v5/pkg/api" "github.com/docker/compose/v5/pkg/compose" diff --git a/docs/sdk.md b/docs/sdk.md index c0c0c39f3ea..4e8693f47b1 100644 --- a/docs/sdk.md +++ b/docs/sdk.md @@ -28,8 +28,8 @@ import ( "context" "log" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/flags" "github.com/docker/compose/v5/pkg/api" "github.com/docker/compose/v5/pkg/compose" diff --git a/docs/yaml/main/generate.go b/docs/yaml/main/generate.go index 335efe9cc3b..d45cdfa8e8b 100644 --- a/docs/yaml/main/generate.go +++ b/docs/yaml/main/generate.go @@ -22,7 +22,7 @@ import ( "path/filepath" clidocstool "github.com/docker/cli-docs-tool" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/spf13/cobra" "github.com/docker/compose/v5/cmd/compose" diff --git a/go.mod b/go.mod index 8d677a8fcfd..398def77961 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/containerd/platforms v1.0.0-rc.5 github.com/creack/pty v1.1.24 github.com/distribution/reference v0.6.0 - github.com/docker/cli v29.7.2+incompatible github.com/docker/cli-docs-tool v0.11.0 + github.com/docker/cli/v29 v29.0.0-20260911163231-842eec8705e2 github.com/docker/go-units v0.5.0 github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 github.com/fsnotify/fsevents v0.2.0 @@ -28,8 +28,8 @@ require ( github.com/mitchellh/go-ps v1.0.0 github.com/moby/buildkit v0.33.0 github.com/moby/go-archive v0.3.3 - github.com/moby/moby/api v1.55.0 - github.com/moby/moby/client v0.5.1 + github.com/moby/moby/api v1.56.0 + github.com/moby/moby/client v0.6.0 github.com/moby/patternmatcher v0.6.1 github.com/moby/sys/atomicwriter v0.1.0 github.com/morikuni/aec v1.1.0 @@ -55,7 +55,7 @@ require ( golang.org/x/sys v0.48.0 google.golang.org/grpc v1.83.2 gotest.tools/v3 v3.5.2 - tags.cncf.io/container-device-interface v1.1.0 + tags.cncf.io/container-device-interface v1.1.1 ) require ( @@ -70,17 +70,15 @@ require ( github.com/containerd/ttrpc v1.2.9 // indirect github.com/containerd/typeurl/v2 v2.3.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect - github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker-credential-helpers v0.9.8 // indirect - github.com/docker/go-connections v0.7.0 // indirect + github.com/docker/docker-credential-helpers v0.9.9 // indirect + github.com/docker/go-connections v0.8.1 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect - github.com/fvbommel/sortorder v1.1.0 // indirect + github.com/fvbommel/sortorder v1.2.0 // indirect github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gofrs/flock v0.13.1 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/gorilla/mux v1.8.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -102,7 +100,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect + github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect github.com/secure-systems-lab/go-securesystemslib v0.11.0 // indirect github.com/shibumi/go-pathspec v1.3.0 // indirect github.com/tonistiigi/fsutil v0.0.0-20260819142231-83cac42c1c52 // indirect @@ -138,3 +136,7 @@ exclude ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 ) + +replace github.com/docker/cli/v29 => github.com/AkihiroSuda/cli/v29 v29.0.0-20260911163231-842eec8705e2 + +replace github.com/moby/buildkit => github.com/AkihiroSuda/buildkit_poc v0.3.2-0.20260911165345-2d5b38ed8baa diff --git a/go.sum b/go.sum index f451dbcaab8..a0fe9ce2425 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/AkihiroSuda/buildkit_poc v0.3.2-0.20260911165345-2d5b38ed8baa h1:awMCe28LTu++AK9zQzqx5HUj2pMcLrRyK71M49wkDkc= +github.com/AkihiroSuda/buildkit_poc v0.3.2-0.20260911165345-2d5b38ed8baa/go.mod h1:ZtjeqOjG3CN3DpL/imK6auD2P/gV/b7g6ab4BuK5Pkk= +github.com/AkihiroSuda/cli/v29 v29.0.0-20260911163231-842eec8705e2 h1:i3XgGDTtvHSDsKN5VaFHpidnWllRYqRet3HOzTjxo0M= +github.com/AkihiroSuda/cli/v29 v29.0.0-20260911163231-842eec8705e2/go.mod h1:/wK2rMxGJ8ThXqtw9C6Lt6HlQFaV0Wa5Yss+oLmP9Pc= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e h1:rd4bOvKmDIx0WeTv9Qz+hghsgyjikFiPrseXHlKepO0= @@ -72,18 +76,16 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/docker/cli v29.7.2+incompatible h1:dlkwallR8XqfeVnA2ELEhdwvb4lsSwuB4IgsG8Q9cLY= -github.com/docker/cli v29.7.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli-docs-tool v0.11.0 h1:7d8QARFb7QEobizqxmEM7fOteZEHwH/zWgHQtHZEcfE= github.com/docker/cli-docs-tool v0.11.0/go.mod h1:ma8BKiisUo8D6W05XEYIh3oa1UbgrZhi1nowyKFJa8Q= 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-credential-helpers v0.9.8 h1:bIREROb7So6PRlq6KTtdS9MPEjC29OQRkFNlvK2OX8Q= -github.com/docker/docker-credential-helpers v0.9.8/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c= -github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c= -github.com/docker/go-connections v0.7.0/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q= -github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/docker-credential-helpers v0.9.9 h1:BkydjIgZ46JnDbqyM2p2fc63KMw6y+KHL3Em/2AGJ7w= +github.com/docker/docker-credential-helpers v0.9.9/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c= +github.com/docker/go-connections v0.8.1 h1:JibmG5hULs5qXSr/cp/w3Pw5fZuStt4MOHMUExb29/M= +github.com/docker/go-connections v0.8.1/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q= +github.com/docker/go-metrics v0.1.0 h1:r76KPNpstz+IvQKSWpYegSkkyzex0V3A1ZGVx6bhGlY= +github.com/docker/go-metrics v0.1.0/go.mod h1:PciI3sONtB051kXALN1JoIlpcu54E1FuPh+4DuqEzyw= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 h1:XBBHcIb256gUJtLmY22n99HaZTz+r2Z51xUPi01m3wg= @@ -92,8 +94,8 @@ github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeO github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE= github.com/fsnotify/fsevents v0.2.0 h1:BRlvlqjvNTfogHfeBOFvSC9N0Ddy+wzQCQukyoD7o/c= github.com/fsnotify/fsevents v0.2.0/go.mod h1:B3eEk39i4hz8y1zaWS/wPrAP4O6wkIl7HQwKBr1qH/w= -github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw= -github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= +github.com/fvbommel/sortorder v1.2.0 h1:TRIiRiGX+djh3Yf4FVxmWmAcYfIr5dH0NbzJWOSAWZk= +github.com/fvbommel/sortorder v1.2.0/go.mod h1:LbhO04ijZIeUuvz9B9BkI/qYrpZZEn1gWhxv4QjUKVs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -144,18 +146,16 @@ github.com/mattn/go-shellwords v1.0.14 h1:yUKzIgsCnosndOASY6/enly1EAuaXeFSQ7cdyA github.com/mattn/go-shellwords v1.0.14/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/moby/buildkit v0.33.0 h1:zBbt1FiMcTB/oFg1iCNcKa83k5Rn8MGcVjXFIcfYhuQ= -github.com/moby/buildkit v0.33.0/go.mod h1:uNKSZnfMk1aSa18JiCR5BT68M/3jIDGo6XuAByUK3ek= 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/go-archive v0.3.3 h1:OxxR9paxsluYi+zDUEXTTaIxtkK3viymW+Ka7vRhhME= github.com/moby/go-archive v0.3.3/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE= 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/moby/api v1.55.0 h1:2/sexvQyqIWS8pRSCFddBfpW2qE7vR7FCL+vN8pxwMc= -github.com/moby/moby/api v1.55.0/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs= -github.com/moby/moby/client v0.5.1 h1:tYNaJno4c0HXz12y5BiqEDy0rVTYkWzI26lGvnTMiJw= -github.com/moby/moby/client v0.5.1/go.mod h1:odLstlZ6uSnfvAgVxMpvgmb8SUdd+siH2T0GBuxVAlM= +github.com/moby/moby/api v1.56.0 h1:GQzua3NA599ASSIICx0iFgiJeO9YkdDARvQsm23ZZuQ= +github.com/moby/moby/api v1.56.0/go.mod h1:sZ+THbVWkjOmBPPfbnzdD/G1LuIexWhqlSHHPTDQ1Uk= +github.com/moby/moby/client v0.6.0 h1:AJjEB21QPbXSXjDsZorFBoDZPhMrfbpaPLgSMAW9Bgs= +github.com/moby/moby/client v0.6.0/go.mod h1:OCo00wNRyA3m4lmJ228W3JbyCN4ZNNYjpOXiJydBdcQ= github.com/moby/patternmatcher v0.6.1 h1:qlhtafmr6kgMIJjKJMDmMWq7WLkKIo23hsrpR3x084U= github.com/moby/patternmatcher v0.6.1/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/policy-helpers v0.0.0-20260901104222-dd6c5499c491 h1:5qXAyBr9AXXAqPoFK/wY85wggaKyYSMCNh8QF/O21Rk= @@ -215,8 +215,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 h1:1EYB5IzjZawrrnELUi78f9fPu57HuXjmddZPjrls/28= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.3/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= github.com/secure-systems-lab/go-securesystemslib v0.11.0 h1:iuCR9kcMFD4QurdKrGvPLoKZLv9YvwPYVr0473BdtFs= github.com/secure-systems-lab/go-securesystemslib v0.11.0/go.mod h1:+PMOTjUGwHj2vcZ+TFKlb1tXRbrdWE1LYDT5i9JC80Q= github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI= @@ -346,5 +346,5 @@ gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk= pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -tags.cncf.io/container-device-interface v1.1.0 h1:RnxNhxF1JOu6CJUVpetTYvrXHdxw9j9jFYgZpI+anSY= -tags.cncf.io/container-device-interface v1.1.0/go.mod h1:76Oj0Yqp9FwTx/pySDc8Bxjpg+VqXfDb50cKAXVJ34Q= +tags.cncf.io/container-device-interface v1.1.1 h1:YPwQz4xg8PlQ0yT/baR0BtLpTQROe4l6M1yuRgAu1vc= +tags.cncf.io/container-device-interface v1.1.1/go.mod h1:S1PSJWYPD4Iom0/39mvr/VVFCfG0Yt14j20d0OYrY2M= diff --git a/internal/desktop/client.go b/internal/desktop/client.go index 136d0c53451..2b65f3fb8fe 100644 --- a/internal/desktop/client.go +++ b/internal/desktop/client.go @@ -26,8 +26,8 @@ import ( "net/url" "strings" - "github.com/docker/cli/cli/command" - cliflags "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli/command" + cliflags "github.com/docker/cli/v29/cli/flags" "github.com/moby/moby/client" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" diff --git a/internal/oci/resolver.go b/internal/oci/resolver.go index 59b7c1fe146..65af93067a1 100644 --- a/internal/oci/resolver.go +++ b/internal/oci/resolver.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/errdefs" "github.com/distribution/reference" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/moby/buildkit/util/contentutil" spec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/internal/oci/resolver_test.go b/internal/oci/resolver_test.go index 2a17891160e..1ca0f6c250b 100644 --- a/internal/oci/resolver_test.go +++ b/internal/oci/resolver_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/distribution/reference" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/opencontainers/go-digest" spec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/internal/registry/registry.go b/internal/registry/registry.go index ea8103c3663..bce9c24f42c 100644 --- a/internal/registry/registry.go +++ b/internal/registry/registry.go @@ -18,7 +18,7 @@ package registry import ( "github.com/distribution/reference" - clitypes "github.com/docker/cli/cli/config/types" + clitypes "github.com/docker/cli/v29/cli/config/types" "github.com/moby/moby/api/pkg/authconfig" registrytypes "github.com/moby/moby/api/types/registry" ) diff --git a/internal/tracing/docker_context.go b/internal/tracing/docker_context.go index 5d5367b0231..665e5921822 100644 --- a/internal/tracing/docker_context.go +++ b/internal/tracing/docker_context.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/context/store" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "google.golang.org/grpc" diff --git a/internal/tracing/tracing.go b/internal/tracing/tracing.go index ffb68ec9746..09f57bfb89f 100644 --- a/internal/tracing/tracing.go +++ b/internal/tracing/tracing.go @@ -23,7 +23,7 @@ import ( "os" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" _ "github.com/moby/buildkit/util/tracing/childprocess" //nolint:blank-imports // initializes BuildKit tracing child process propagation. "github.com/moby/buildkit/util/tracing/detect" "go.opentelemetry.io/otel" diff --git a/internal/tracing/tracing_test.go b/internal/tracing/tracing_test.go index 124c842f2d4..97a6bf00745 100644 --- a/internal/tracing/tracing_test.go +++ b/internal/tracing/tracing_test.go @@ -19,8 +19,8 @@ package tracing_test import ( "testing" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/context/store" "gotest.tools/v3/assert" "github.com/docker/compose/v5/internal/tracing" diff --git a/pkg/api/api.go b/pkg/api/api.go index aec5d9bd396..fdab0f4e287 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -29,7 +29,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/platforms" - "github.com/docker/cli/opts" + "github.com/docker/cli/v29/opts" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/volume" ) diff --git a/pkg/bridge/convert.go b/pkg/bridge/convert.go index 79594dc4fc4..7c516f06e9c 100644 --- a/pkg/bridge/convert.go +++ b/pkg/bridge/convert.go @@ -28,8 +28,8 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" - "github.com/docker/cli/cli/command" - cli "github.com/docker/cli/cli/command/container" + "github.com/docker/cli/v29/cli/command" + cli "github.com/docker/cli/v29/cli/command/container" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/network" diff --git a/pkg/bridge/transformers.go b/pkg/bridge/transformers.go index 9db2a508fb2..5eaccf6b401 100644 --- a/pkg/bridge/transformers.go +++ b/pkg/bridge/transformers.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/moby/go-archive" "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" diff --git a/pkg/compose/apiSocket.go b/pkg/compose/apiSocket.go index ddc7a029030..8bc387db496 100644 --- a/pkg/compose/apiSocket.go +++ b/pkg/compose/apiSocket.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" ) // --use-api-socket is not actually supported by the Docker Engine diff --git a/pkg/compose/attach_service.go b/pkg/compose/attach_service.go index c6209e02244..c94d7b843a3 100644 --- a/pkg/compose/attach_service.go +++ b/pkg/compose/attach_service.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/docker/cli/cli/command/container" + "github.com/docker/cli/v29/cli/command/container" "github.com/docker/compose/v5/pkg/api" ) diff --git a/pkg/compose/build_bake.go b/pkg/compose/build_bake.go index 0530d72ff61..d1168f9312f 100644 --- a/pkg/compose/build_bake.go +++ b/pkg/compose/build_bake.go @@ -36,10 +36,10 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/console" "github.com/containerd/errdefs" - "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image/build" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli-plugins/manager" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/command/image/build" + "github.com/docker/cli/v29/cli/streams" "github.com/google/uuid" "github.com/moby/buildkit/client" gitutil "github.com/moby/buildkit/frontend/dockerfile/dfgitutil" diff --git a/pkg/compose/build_bake_test.go b/pkg/compose/build_bake_test.go index ee814c2362c..61df4d5a9de 100644 --- a/pkg/compose/build_bake_test.go +++ b/pkg/compose/build_bake_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "gotest.tools/v3/assert" ) diff --git a/pkg/compose/build_classic.go b/pkg/compose/build_classic.go index a6e21320292..ddbbe30e3b0 100644 --- a/pkg/compose/build_classic.go +++ b/pkg/compose/build_classic.go @@ -27,8 +27,8 @@ import ( "strings" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command/image/build" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command/image/build" "github.com/moby/go-archive" buildtypes "github.com/moby/moby/api/types/build" "github.com/moby/moby/api/types/container" diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go index ee797274f85..c5ba7ecd9cf 100644 --- a/pkg/compose/compose.go +++ b/pkg/compose/compose.go @@ -26,10 +26,10 @@ import ( "sync" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/flags" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/config/configfile" + "github.com/docker/cli/v29/cli/flags" + "github.com/docker/cli/v29/cli/streams" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" diff --git a/pkg/compose/cp.go b/pkg/compose/cp.go index c76e31e49ee..4082511c8c5 100644 --- a/pkg/compose/cp.go +++ b/pkg/compose/cp.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/moby/go-archive" "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" diff --git a/pkg/compose/docker_cli_providers.go b/pkg/compose/docker_cli_providers.go index 207fa3e37a7..2e4ff68022e 100644 --- a/pkg/compose/docker_cli_providers.go +++ b/pkg/compose/docker_cli_providers.go @@ -17,7 +17,7 @@ package compose import ( - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" ) // dockerCliContextInfo implements api.ContextInfo using Docker CLI diff --git a/pkg/compose/down_test.go b/pkg/compose/down_test.go index cd0aba5348b..b6356dcfff5 100644 --- a/pkg/compose/down_test.go +++ b/pkg/compose/down_test.go @@ -25,7 +25,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/network" diff --git a/pkg/compose/exec.go b/pkg/compose/exec.go index 30a5d080028..7249de459ba 100644 --- a/pkg/compose/exec.go +++ b/pkg/compose/exec.go @@ -21,8 +21,8 @@ import ( "errors" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command/container" + "github.com/docker/cli/v29/cli" + "github.com/docker/cli/v29/cli/command/container" "github.com/docker/compose/v5/pkg/api" ) diff --git a/pkg/compose/export.go b/pkg/compose/export.go index 9b27232ba1d..ba9898b484d 100644 --- a/pkg/compose/export.go +++ b/pkg/compose/export.go @@ -23,7 +23,7 @@ import ( "io" "strings" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" "github.com/moby/moby/client" "github.com/moby/sys/atomicwriter" diff --git a/pkg/compose/hook_test.go b/pkg/compose/hook_test.go index 3f5ef149051..5edf0a7ae7f 100644 --- a/pkg/compose/hook_test.go +++ b/pkg/compose/hook_test.go @@ -33,7 +33,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/creack/pty" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "go.uber.org/mock/gomock" diff --git a/pkg/compose/images_test.go b/pkg/compose/images_test.go index 9775fd14d5c..f900985223a 100644 --- a/pkg/compose/images_test.go +++ b/pkg/compose/images_test.go @@ -25,7 +25,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" "github.com/containerd/platforms" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" diff --git a/pkg/compose/model.go b/pkg/compose/model.go index 928ff718064..4ab6cd14e36 100644 --- a/pkg/compose/model.go +++ b/pkg/compose/model.go @@ -29,7 +29,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" - "github.com/docker/cli/cli-plugins/manager" + "github.com/docker/cli/v29/cli-plugins/manager" "github.com/moby/moby/client/pkg/versions" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" diff --git a/pkg/compose/plugins.go b/pkg/compose/plugins.go index 9142a7a38cc..4d87c97498d 100644 --- a/pkg/compose/plugins.go +++ b/pkg/compose/plugins.go @@ -31,8 +31,8 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" - "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/config" + "github.com/docker/cli/v29/cli-plugins/manager" + "github.com/docker/cli/v29/cli/config" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/pkg/compose/publish_test.go b/pkg/compose/publish_test.go index c78808ac25d..fe6078a8c9d 100644 --- a/pkg/compose/publish_test.go +++ b/pkg/compose/publish_test.go @@ -28,7 +28,7 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/google/go-cmp/cmp" "github.com/moby/moby/api/types/registry" "github.com/moby/moby/client" diff --git a/pkg/compose/pull.go b/pkg/compose/pull.go index 4cfc3fcc3f0..af38ac53520 100644 --- a/pkg/compose/pull.go +++ b/pkg/compose/pull.go @@ -29,7 +29,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/platforms" "github.com/distribution/reference" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/docker/go-units" "github.com/moby/moby/api/types/jsonstream" "github.com/moby/moby/client" diff --git a/pkg/compose/pull_test.go b/pkg/compose/pull_test.go index 606ea175b5b..af0c0ee1066 100644 --- a/pkg/compose/pull_test.go +++ b/pkg/compose/pull_test.go @@ -26,7 +26,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/distribution/reference" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/jsonstream" registrytypes "github.com/moby/moby/api/types/registry" diff --git a/pkg/compose/run.go b/pkg/compose/run.go index 1f233fe32f5..0856744b887 100644 --- a/pkg/compose/run.go +++ b/pkg/compose/run.go @@ -25,8 +25,8 @@ import ( "slices" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli" - cmd "github.com/docker/cli/cli/command/container" + "github.com/docker/cli/v29/cli" + cmd "github.com/docker/cli/v29/cli/command/container" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/events" "github.com/moby/moby/client" diff --git a/pkg/compose/service_containers_test.go b/pkg/compose/service_containers_test.go index d82c8264132..a4e77360657 100644 --- a/pkg/compose/service_containers_test.go +++ b/pkg/compose/service_containers_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/config/configfile" "github.com/google/go-cmp/cmp/cmpopts" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/network" diff --git a/pkg/compose/shellout.go b/pkg/compose/shellout.go index 06f007546a8..aa05fc77589 100644 --- a/pkg/compose/shellout.go +++ b/pkg/compose/shellout.go @@ -23,9 +23,9 @@ import ( "path/filepath" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli-plugins/metadata" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v29/cli-plugins/metadata" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/flags" "github.com/moby/moby/client" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" diff --git a/pkg/compose/up.go b/pkg/compose/up.go index 0beb3637359..b90241370c5 100644 --- a/pkg/compose/up.go +++ b/pkg/compose/up.go @@ -29,7 +29,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" - "github.com/docker/cli/cli" + "github.com/docker/cli/v29/cli" "github.com/eiannone/keyboard" "github.com/moby/moby/client" "github.com/sirupsen/logrus" diff --git a/pkg/compose/watch.go b/pkg/compose/watch.go index 8b6b5bd8f6f..9c2f0ac5bda 100644 --- a/pkg/compose/watch.go +++ b/pkg/compose/watch.go @@ -32,7 +32,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/types" "github.com/compose-spec/compose-go/v2/utils" - ccli "github.com/docker/cli/cli/command/container" + ccli "github.com/docker/cli/v29/cli/command/container" "github.com/go-viper/mapstructure/v2" "github.com/moby/buildkit/util/progress/progressui" "github.com/moby/moby/api/types/container" diff --git a/pkg/compose/watch_test.go b/pkg/compose/watch_test.go index 963b5180b59..9b968bc2dc0 100644 --- a/pkg/compose/watch_test.go +++ b/pkg/compose/watch_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v29/cli/streams" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" diff --git a/pkg/dryrun/dryrunclient.go b/pkg/dryrun/dryrunclient.go index fbcc18cb734..0fd9d4d7b06 100644 --- a/pkg/dryrun/dryrunclient.go +++ b/pkg/dryrun/dryrunclient.go @@ -32,8 +32,8 @@ import ( "sync" "github.com/distribution/reference" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v29/cli/command" + "github.com/docker/cli/v29/cli/config/configfile" containerType "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/jsonstream" diff --git a/pkg/mocks/mock_docker_cli.go b/pkg/mocks/mock_docker_cli.go index b8bd7b4ec15..683747c2771 100644 --- a/pkg/mocks/mock_docker_cli.go +++ b/pkg/mocks/mock_docker_cli.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/docker/cli/cli/command (interfaces: Cli) +// Source: github.com/docker/cli/v29/cli/command (interfaces: Cli) // // Generated by this command: // -// mockgen -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/cli/command Cli +// mockgen -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/v29/cli/command Cli // // Package mocks is a generated GoMock package. @@ -12,11 +12,11 @@ package mocks import ( reflect "reflect" - command "github.com/docker/cli/cli/command" - configfile "github.com/docker/cli/cli/config/configfile" - docker "github.com/docker/cli/cli/context/docker" - store "github.com/docker/cli/cli/context/store" - streams "github.com/docker/cli/cli/streams" + command "github.com/docker/cli/v29/cli/command" + configfile "github.com/docker/cli/v29/cli/config/configfile" + docker "github.com/docker/cli/v29/cli/context/docker" + store "github.com/docker/cli/v29/cli/context/store" + streams "github.com/docker/cli/v29/cli/streams" client "github.com/moby/moby/client" metric "go.opentelemetry.io/otel/metric" resource "go.opentelemetry.io/otel/sdk/resource" diff --git a/pkg/remote/git.go b/pkg/remote/git.go index 689f08dd903..d9c754d86b0 100644 --- a/pkg/remote/git.go +++ b/pkg/remote/git.go @@ -31,7 +31,7 @@ import ( "github.com/compose-spec/compose-go/v2/cli" "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" gitutil "github.com/moby/buildkit/frontend/dockerfile/dfgitutil" "github.com/sirupsen/logrus" diff --git a/pkg/remote/oci.go b/pkg/remote/oci.go index 46df64e40c5..12f4fe6ebf8 100644 --- a/pkg/remote/oci.go +++ b/pkg/remote/oci.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" "github.com/distribution/reference" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v29/cli/command" spec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/docker/compose/v5/internal/desktop"