Skip to content

Commit

Permalink
update import paths to v24
Browse files Browse the repository at this point in the history 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
  • Loading branch information
@crazy-max
crazy-max committed Mar 31, 2023
1 parent cb79ee0 commit 7732a5e
Show file tree
Hide file tree
Showing 427 changed files with 1,072 additions and 1,072 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker CLI

[![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/cli)
[![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/cli/v24)
[![Build Status](https://img.shields.io/github/actions/workflow/status/docker/cli/build.yml?branch=master&label=build&logo=github)](https://github.com/docker/cli/actions?query=workflow%3Abuild)
[![Test Status](https://img.shields.io/github/actions/workflow/status/docker/cli/test.yml?branch=master&label=test&logo=github)](https://github.com/docker/cli/actions?query=workflow%3Atest)
[![Go Report Card](https://goreportcard.com/badge/github.com/docker/cli)](https://goreportcard.com/report/github.com/docker/cli)
Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Assertions should be made using
[gotest.tools/assert](https://godoc.org/gotest.tools/assert).

Fakes, and testing utilities can be found in
[internal/test](https://godoc.org/github.com/docker/cli/internal/test) and
[internal/test](https://pkg.go.dev/github.com/docker/cli/v24/internal/test) and
[gotest.tools](https://godoc.org/gotest.tools).

## End-to-End Test Suite
Expand Down
6 changes: 3 additions & 3 deletions cli-plugins/examples/helloworld/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"os"

"github.com/docker/cli/cli-plugins/manager"
"github.com/docker/cli/cli-plugins/plugin"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/v24/cli-plugins/manager"
"github.com/docker/cli/v24/cli-plugins/plugin"
"github.com/docker/cli/v24/cli/command"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli-plugins/manager/cobra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"sync"

"github.com/docker/cli/cli/command"
"github.com/docker/cli/v24/cli/command"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli-plugins/manager/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sort"
"strings"

"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/config"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/config"
"github.com/fvbommel/sortorder"
"github.com/spf13/cobra"
exec "golang.org/x/sys/execabs"
Expand Down
6 changes: 3 additions & 3 deletions cli-plugins/manager/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"strings"
"testing"

"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/internal/test"
"github.com/docker/cli/v24/cli/config"
"github.com/docker/cli/v24/cli/config/configfile"
"github.com/docker/cli/v24/internal/test"
"github.com/spf13/cobra"
"gotest.tools/v3/assert"
"gotest.tools/v3/fs"
Expand Down
8 changes: 4 additions & 4 deletions cli-plugins/plugin/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os"
"sync"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli-plugins/manager"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/connhelper"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli-plugins/manager"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/connhelper"
"github.com/docker/docker/client"
"github.com/spf13/cobra"
)
Expand Down
8 changes: 4 additions & 4 deletions cli/cobra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"sort"
"strings"

pluginmanager "github.com/docker/cli/cli-plugins/manager"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/config"
cliflags "github.com/docker/cli/cli/flags"
pluginmanager "github.com/docker/cli/v24/cli-plugins/manager"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/config"
cliflags "github.com/docker/cli/v24/cli/flags"
"github.com/docker/docker/pkg/homedir"
"github.com/docker/docker/registry"
"github.com/fvbommel/sortorder"
Expand Down
2 changes: 1 addition & 1 deletion cli/cobra_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cli
import (
"testing"

pluginmanager "github.com/docker/cli/cli-plugins/manager"
pluginmanager "github.com/docker/cli/v24/cli-plugins/manager"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/spf13/cobra"
"gotest.tools/v3/assert"
Expand Down
6 changes: 3 additions & 3 deletions cli/command/builder/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package builder
import (
"github.com/spf13/cobra"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/image"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/image"
)

// NewBuilderCommand returns a cobra command for `builder` subcommands
Expand Down
8 changes: 4 additions & 4 deletions cli/command/builder/prune.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"strings"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/completion"
"github.com/docker/cli/opts"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/completion"
"github.com/docker/cli/v24/opts"
"github.com/docker/docker/api/types"
units "github.com/docker/go-units"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cli/command/checkpoint/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package checkpoint

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

Expand Down
6 changes: 3 additions & 3 deletions cli/command/checkpoint/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/completion"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/completion"
"github.com/docker/docker/api/types"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/checkpoint/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"github.com/docker/cli/internal/test"
"github.com/docker/cli/v24/internal/test"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
Expand Down
2 changes: 1 addition & 1 deletion cli/command/checkpoint/formatter.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package checkpoint

import (
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/docker/api/types"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/command/checkpoint/formatter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/docker/api/types"
"gotest.tools/v3/assert"
)
Expand Down
8 changes: 4 additions & 4 deletions cli/command/checkpoint/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package checkpoint
import (
"context"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/completion"
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/completion"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/docker/api/types"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/checkpoint/list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"
"testing"

"github.com/docker/cli/internal/test"
"github.com/docker/cli/v24/internal/test"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
Expand Down
4 changes: 2 additions & 2 deletions cli/command/checkpoint/remove.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package checkpoint
import (
"context"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/docker/api/types"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/checkpoint/remove_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"
"testing"

"github.com/docker/cli/internal/test"
"github.com/docker/cli/v24/internal/test"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
Expand Down
26 changes: 13 additions & 13 deletions cli/command/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ import (
"sync"
"time"

"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile"
dcontext "github.com/docker/cli/cli/context"
"github.com/docker/cli/cli/context/docker"
"github.com/docker/cli/cli/context/store"
"github.com/docker/cli/cli/debug"
cliflags "github.com/docker/cli/cli/flags"
manifeststore "github.com/docker/cli/cli/manifest/store"
registryclient "github.com/docker/cli/cli/registry/client"
"github.com/docker/cli/cli/streams"
"github.com/docker/cli/cli/trust"
"github.com/docker/cli/cli/version"
dopts "github.com/docker/cli/opts"
"github.com/docker/cli/v24/cli/config"
"github.com/docker/cli/v24/cli/config/configfile"
dcontext "github.com/docker/cli/v24/cli/context"
"github.com/docker/cli/v24/cli/context/docker"
"github.com/docker/cli/v24/cli/context/store"
"github.com/docker/cli/v24/cli/debug"
cliflags "github.com/docker/cli/v24/cli/flags"
manifeststore "github.com/docker/cli/v24/cli/manifest/store"
registryclient "github.com/docker/cli/v24/cli/registry/client"
"github.com/docker/cli/v24/cli/streams"
"github.com/docker/cli/v24/cli/trust"
"github.com/docker/cli/v24/cli/version"
dopts "github.com/docker/cli/v24/opts"
"github.com/docker/docker/api"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/registry"
Expand Down
2 changes: 1 addition & 1 deletion cli/command/cli_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"strconv"

"github.com/docker/cli/cli/streams"
"github.com/docker/cli/v24/cli/streams"
"github.com/docker/docker/client"
"github.com/moby/term"
)
Expand Down
6 changes: 3 additions & 3 deletions cli/command/cli_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"testing"
"time"

"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/cli/flags"
"github.com/docker/cli/v24/cli/config"
"github.com/docker/cli/v24/cli/config/configfile"
"github.com/docker/cli/v24/cli/flags"
"github.com/docker/docker/api"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
Expand Down
38 changes: 19 additions & 19 deletions cli/command/commands/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ package commands
import (
"os"

"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/builder"
"github.com/docker/cli/cli/command/checkpoint"
"github.com/docker/cli/cli/command/config"
"github.com/docker/cli/cli/command/container"
"github.com/docker/cli/cli/command/context"
"github.com/docker/cli/cli/command/image"
"github.com/docker/cli/cli/command/manifest"
"github.com/docker/cli/cli/command/network"
"github.com/docker/cli/cli/command/node"
"github.com/docker/cli/cli/command/plugin"
"github.com/docker/cli/cli/command/registry"
"github.com/docker/cli/cli/command/secret"
"github.com/docker/cli/cli/command/service"
"github.com/docker/cli/cli/command/stack"
"github.com/docker/cli/cli/command/swarm"
"github.com/docker/cli/cli/command/system"
"github.com/docker/cli/cli/command/trust"
"github.com/docker/cli/cli/command/volume"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/builder"
"github.com/docker/cli/v24/cli/command/checkpoint"
"github.com/docker/cli/v24/cli/command/config"
"github.com/docker/cli/v24/cli/command/container"
"github.com/docker/cli/v24/cli/command/context"
"github.com/docker/cli/v24/cli/command/image"
"github.com/docker/cli/v24/cli/command/manifest"
"github.com/docker/cli/v24/cli/command/network"
"github.com/docker/cli/v24/cli/command/node"
"github.com/docker/cli/v24/cli/command/plugin"
"github.com/docker/cli/v24/cli/command/registry"
"github.com/docker/cli/v24/cli/command/secret"
"github.com/docker/cli/v24/cli/command/service"
"github.com/docker/cli/v24/cli/command/stack"
"github.com/docker/cli/v24/cli/command/swarm"
"github.com/docker/cli/v24/cli/command/system"
"github.com/docker/cli/v24/cli/command/trust"
"github.com/docker/cli/v24/cli/command/volume"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/command/completion/functions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package completion
import (
"os"

"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/volume"
"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions cli/command/config/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package config

import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/completion"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/completion"
"github.com/docker/docker/api/types"
"github.com/spf13/cobra"
)
Expand Down
8 changes: 4 additions & 4 deletions cli/command/config/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"io"

"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/completion"
"github.com/docker/cli/opts"
"github.com/docker/cli/v24/cli"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/completion"
"github.com/docker/cli/v24/opts"
"github.com/docker/docker/api/types/swarm"
"github.com/moby/sys/sequential"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion cli/command/config/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/docker/cli/internal/test"
"github.com/docker/cli/v24/internal/test"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors"
Expand Down
6 changes: 3 additions & 3 deletions cli/command/config/formatter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strings"
"time"

"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/cli/command/inspect"
"github.com/docker/cli/v24/cli/command"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/cli/v24/cli/command/inspect"
"github.com/docker/docker/api/types/swarm"
units "github.com/docker/go-units"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/config/formatter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/v24/cli/command/formatter"
"github.com/docker/docker/api/types/swarm"
"gotest.tools/v3/assert"
)
Expand Down
Loading

0 comments on commit 7732a5e

Please sign in to comment.