Skip to content

vendor: github.com/docker/cli as a proper go.mod #14216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AkihiroSuda wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

vendor: github.com/docker/cli as a proper go.mod #14216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions cmd/cmdtrace/cmd_span.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/alpha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package compose

import (
"github.com/docker/cli/cli/command"
"github.com/docker/cli/v29/cli/command"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/attach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions cmd/compose/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/compose_progress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/kill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/pause.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/compose/ps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/compose/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/compose/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading