diff --git a/.dockerignore b/.dockerignore index 57b2e28bf13b..e122c203bd1d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,7 +8,3 @@ /docs/vendor/ /docs/go.sum profile.out - -# top-level go.mod is not meant to be checked in -/go.mod -/go.sum diff --git a/.gitattributes b/.gitattributes index 4f1544141aec..9dd7ef0727b3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1 @@ Dockerfile* linguist-language=Dockerfile -vendor.mod linguist-language=Go-Module -vendor.sum linguist-language=Go-Checksums diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ad29d508653..0e2b4e939516 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,10 +37,6 @@ jobs: host: runs-on: ${{ matrix.os }} - env: - GOPATH: ${{ github.workspace }} - GOBIN: ${{ github.workspace }}/bin - GO111MODULE: auto strategy: fail-fast: false matrix: @@ -57,8 +53,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - with: - path: ${{ env.GOPATH }}/src/github.com/docker/cli - name: Set up Go uses: actions/setup-go@v4 @@ -69,11 +63,9 @@ jobs: run: | go test -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/') go tool cover -func=/tmp/coverage.txt - working-directory: ${{ env.GOPATH }}/src/github.com/docker/cli shell: bash - name: Send to Codecov uses: codecov/codecov-action@v3 with: file: /tmp/coverage.txt - working-directory: ${{ env.GOPATH }}/src/github.com/docker/cli diff --git a/.gitignore b/.gitignore index a7462428a4e9..ea76bfde5183 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,3 @@ Thumbs.db /cli/winresources/versioninfo.json /cli/winresources/*.syso profile.out - -# top-level go.mod is not meant to be checked in -/go.mod -/go.sum diff --git a/README.md b/README.md index 7e4c7adb3ad1..40d203bd6dd8 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/TESTING.md b/TESTING.md index ab1a09e32db7..71e05c07ba41 100644 --- a/TESTING.md +++ b/TESTING.md @@ -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 diff --git a/cli-plugins/examples/helloworld/main.go b/cli-plugins/examples/helloworld/main.go index ba23f4954ecf..6afeeaa7aabb 100644 --- a/cli-plugins/examples/helloworld/main.go +++ b/cli-plugins/examples/helloworld/main.go @@ -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" ) diff --git a/cli-plugins/manager/cobra.go b/cli-plugins/manager/cobra.go index be3a05820189..a2bb6f92c572 100644 --- a/cli-plugins/manager/cobra.go +++ b/cli-plugins/manager/cobra.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "github.com/spf13/cobra" ) diff --git a/cli-plugins/manager/manager.go b/cli-plugins/manager/manager.go index ff1585987897..18fb1372597a 100644 --- a/cli-plugins/manager/manager.go +++ b/cli-plugins/manager/manager.go @@ -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" diff --git a/cli-plugins/manager/manager_test.go b/cli-plugins/manager/manager_test.go index 228d3099cc59..db34aa7b005c 100644 --- a/cli-plugins/manager/manager_test.go +++ b/cli-plugins/manager/manager_test.go @@ -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" diff --git a/cli-plugins/plugin/plugin.go b/cli-plugins/plugin/plugin.go index bdb5a64875a7..a012eb9ec856 100644 --- a/cli-plugins/plugin/plugin.go +++ b/cli-plugins/plugin/plugin.go @@ -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" ) diff --git a/cli/cobra.go b/cli/cobra.go index 6501197ddd43..e4123257882f 100644 --- a/cli/cobra.go +++ b/cli/cobra.go @@ -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" diff --git a/cli/cobra_test.go b/cli/cobra_test.go index 4e0ea8e3e42e..ea9a28fcf969 100644 --- a/cli/cobra_test.go +++ b/cli/cobra_test.go @@ -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" diff --git a/cli/command/builder/cmd.go b/cli/command/builder/cmd.go index 724f7ca9c984..3ee406c25740 100644 --- a/cli/command/builder/cmd.go +++ b/cli/command/builder/cmd.go @@ -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 diff --git a/cli/command/builder/prune.go b/cli/command/builder/prune.go index 30215601eda2..29a9df2e57fd 100644 --- a/cli/command/builder/prune.go +++ b/cli/command/builder/prune.go @@ -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" diff --git a/cli/command/checkpoint/cmd.go b/cli/command/checkpoint/cmd.go index 2a698e74e5e2..09223cd15c3e 100644 --- a/cli/command/checkpoint/cmd.go +++ b/cli/command/checkpoint/cmd.go @@ -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" ) diff --git a/cli/command/checkpoint/create.go b/cli/command/checkpoint/create.go index c19c8013304b..6f6065c2febf 100644 --- a/cli/command/checkpoint/create.go +++ b/cli/command/checkpoint/create.go @@ -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" ) diff --git a/cli/command/checkpoint/create_test.go b/cli/command/checkpoint/create_test.go index ee2485a6275d..d624a20c54f8 100644 --- a/cli/command/checkpoint/create_test.go +++ b/cli/command/checkpoint/create_test.go @@ -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" diff --git a/cli/command/checkpoint/formatter.go b/cli/command/checkpoint/formatter.go index 1ad3aafddd40..8103366af516 100644 --- a/cli/command/checkpoint/formatter.go +++ b/cli/command/checkpoint/formatter.go @@ -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" ) diff --git a/cli/command/checkpoint/formatter_test.go b/cli/command/checkpoint/formatter_test.go index e94b78f9991c..604f6665a54a 100644 --- a/cli/command/checkpoint/formatter_test.go +++ b/cli/command/checkpoint/formatter_test.go @@ -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" ) diff --git a/cli/command/checkpoint/list.go b/cli/command/checkpoint/list.go index d4e7c46196db..92f75b15c234 100644 --- a/cli/command/checkpoint/list.go +++ b/cli/command/checkpoint/list.go @@ -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" ) diff --git a/cli/command/checkpoint/list_test.go b/cli/command/checkpoint/list_test.go index b3f602e5deb5..c8160be79197 100644 --- a/cli/command/checkpoint/list_test.go +++ b/cli/command/checkpoint/list_test.go @@ -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" diff --git a/cli/command/checkpoint/remove.go b/cli/command/checkpoint/remove.go index 3f894421632d..54288173d882 100644 --- a/cli/command/checkpoint/remove.go +++ b/cli/command/checkpoint/remove.go @@ -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" ) diff --git a/cli/command/checkpoint/remove_test.go b/cli/command/checkpoint/remove_test.go index 309584faa9b2..e1522f23dce6 100644 --- a/cli/command/checkpoint/remove_test.go +++ b/cli/command/checkpoint/remove_test.go @@ -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" diff --git a/cli/command/cli.go b/cli/command/cli.go index 6750ce1c0cda..13e774748f00 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -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" diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go index d714947cb9bd..e4eae503e2cd 100644 --- a/cli/command/cli_options.go +++ b/cli/command/cli_options.go @@ -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" ) diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go index 7a0b4e727e2e..410c34e80d0b 100644 --- a/cli/command/cli_test.go +++ b/cli/command/cli_test.go @@ -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" diff --git a/cli/command/commands/commands.go b/cli/command/commands/commands.go index 23a43568b51f..23161193cdc7 100644 --- a/cli/command/commands/commands.go +++ b/cli/command/commands/commands.go @@ -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" ) diff --git a/cli/command/completion/functions.go b/cli/command/completion/functions.go index 40f0b52632d4..d461089d11e0 100644 --- a/cli/command/completion/functions.go +++ b/cli/command/completion/functions.go @@ -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" diff --git a/cli/command/config/cmd.go b/cli/command/config/cmd.go index 86ad1cc09cde..bf3cb27007ad 100644 --- a/cli/command/config/cmd.go +++ b/cli/command/config/cmd.go @@ -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" ) diff --git a/cli/command/config/create.go b/cli/command/config/create.go index dc79277d4c5d..044068b8abe8 100644 --- a/cli/command/config/create.go +++ b/cli/command/config/create.go @@ -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" diff --git a/cli/command/config/create_test.go b/cli/command/config/create_test.go index a1c5e618990d..a979118c5e54 100644 --- a/cli/command/config/create_test.go +++ b/cli/command/config/create_test.go @@ -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" diff --git a/cli/command/config/formatter.go b/cli/command/config/formatter.go index 4aebdb61ac7e..fceee9017091 100644 --- a/cli/command/config/formatter.go +++ b/cli/command/config/formatter.go @@ -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" ) diff --git a/cli/command/config/formatter_test.go b/cli/command/config/formatter_test.go index 73ab8805773d..856e7aeacd28 100644 --- a/cli/command/config/formatter_test.go +++ b/cli/command/config/formatter_test.go @@ -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" ) diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go index 64773419adde..6d7b4912494b 100644 --- a/cli/command/config/inspect.go +++ b/cli/command/config/inspect.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/config/inspect_test.go b/cli/command/config/inspect_test.go index 111f15bf82be..27e398db6a5c 100644 --- a/cli/command/config/inspect_test.go +++ b/cli/command/config/inspect_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/config/ls.go b/cli/command/config/ls.go index 8fbabd230170..a59f863e87e8 100644 --- a/cli/command/config/ls.go +++ b/cli/command/config/ls.go @@ -4,12 +4,12 @@ import ( "context" "sort" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/config/ls_test.go b/cli/command/config/ls_test.go index d21c2e490560..8d8b47082499 100644 --- a/cli/command/config/ls_test.go +++ b/cli/command/config/ls_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/config/remove.go b/cli/command/config/remove.go index 0818d601c6b8..8e810952584e 100644 --- a/cli/command/config/remove.go +++ b/cli/command/config/remove.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/config/remove_test.go b/cli/command/config/remove_test.go index bbdd0c4317e9..c4555807cb67 100644 --- a/cli/command/config/remove_test.go +++ b/cli/command/config/remove_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/container/attach.go b/cli/command/container/attach.go index bd17696b8032..0ea95e37cbc1 100644 --- a/cli/command/container/attach.go +++ b/cli/command/container/attach.go @@ -5,9 +5,9 @@ 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/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/docker/docker/api/types/container" "github.com/docker/docker/client" diff --git a/cli/command/container/attach_test.go b/cli/command/container/attach_test.go index b0aaea688cb3..b14805da3583 100644 --- a/cli/command/container/attach_test.go +++ b/cli/command/container/attach_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/cli" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/pkg/errors" diff --git a/cli/command/container/cmd.go b/cli/command/container/cmd.go index dcf8116ef1d0..287da1f5752a 100644 --- a/cli/command/container/cmd.go +++ b/cli/command/container/cmd.go @@ -1,8 +1,8 @@ package container 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" ) diff --git a/cli/command/container/commit.go b/cli/command/container/commit.go index 39b8db9a5f41..7379fd9567cc 100644 --- a/cli/command/container/commit.go +++ b/cli/command/container/commit.go @@ -4,10 +4,10 @@ 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/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" "github.com/spf13/cobra" ) diff --git a/cli/command/container/cp.go b/cli/command/container/cp.go index 5ef409ca8809..a8fdf2f3f8c5 100644 --- a/cli/command/container/cp.go +++ b/cli/command/container/cp.go @@ -12,9 +12,9 @@ import ( "sync/atomic" "time" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/streams" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/system" diff --git a/cli/command/container/cp_test.go b/cli/command/container/cp_test.go index 6c9581f8e299..f1afcc2893d3 100644 --- a/cli/command/container/cp_test.go +++ b/cli/command/container/cp_test.go @@ -7,7 +7,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/pkg/archive" "gotest.tools/v3/assert" diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 119a846089d5..49eab9e0d784 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -8,11 +8,11 @@ import ( "regexp" "github.com/containerd/containerd/platforms" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/image" - "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/cli/command/image" + "github.com/docker/cli/v24/opts" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/cli/command/container/create_test.go b/cli/command/container/create_test.go index c74b5d359eec..e187e4e5aa72 100644 --- a/cli/command/container/create_test.go +++ b/cli/command/container/create_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" diff --git a/cli/command/container/diff.go b/cli/command/container/diff.go index c0951b28f534..2f861e19b25e 100644 --- a/cli/command/container/diff.go +++ b/cli/command/container/diff.go @@ -3,10 +3,10 @@ package container 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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go index 3160aaba83c6..b41c67c2e40b 100644 --- a/cli/command/container/exec.go +++ b/cli/command/container/exec.go @@ -6,11 +6,11 @@ import ( "io" "os" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/config/configfile" - "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/cli/config/configfile" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" apiclient "github.com/docker/docker/client" "github.com/pkg/errors" diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go index 7b17d3ebf971..791bd1aae78e 100644 --- a/cli/command/container/exec_test.go +++ b/cli/command/container/exec_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/container/export.go b/cli/command/container/export.go index 1871686d93e3..3b270ab142bc 100644 --- a/cli/command/container/export.go +++ b/cli/command/container/export.go @@ -4,9 +4,9 @@ import ( "context" "io" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/container/export_test.go b/cli/command/container/export_test.go index 891317fff3df..66f1a36a742a 100644 --- a/cli/command/container/export_test.go +++ b/cli/command/container/export_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" "gotest.tools/v3/fs" ) diff --git a/cli/command/container/formatter_diff.go b/cli/command/container/formatter_diff.go index 15e3fc547c7c..06a00db9472f 100644 --- a/cli/command/container/formatter_diff.go +++ b/cli/command/container/formatter_diff.go @@ -1,7 +1,7 @@ package container import ( - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/api/types/container" "github.com/docker/docker/pkg/archive" ) diff --git a/cli/command/container/formatter_diff_test.go b/cli/command/container/formatter_diff_test.go index be4d4b461a1c..b3b32a663da0 100644 --- a/cli/command/container/formatter_diff_test.go +++ b/cli/command/container/formatter_diff_test.go @@ -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/container" "github.com/docker/docker/pkg/archive" "gotest.tools/v3/assert" diff --git a/cli/command/container/formatter_stats.go b/cli/command/container/formatter_stats.go index c079c913ff77..e483885645c3 100644 --- a/cli/command/container/formatter_stats.go +++ b/cli/command/container/formatter_stats.go @@ -4,7 +4,7 @@ import ( "strconv" "sync" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/pkg/stringid" units "github.com/docker/go-units" ) diff --git a/cli/command/container/formatter_stats_test.go b/cli/command/container/formatter_stats_test.go index ad395e6f74a4..0275435d43f7 100644 --- a/cli/command/container/formatter_stats_test.go +++ b/cli/command/container/formatter_stats_test.go @@ -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/pkg/stringid" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/container/hijack.go b/cli/command/container/hijack.go index 7ecf5f505728..99c8cd71bb82 100644 --- a/cli/command/container/hijack.go +++ b/cli/command/container/hijack.go @@ -7,7 +7,7 @@ import ( "runtime" "sync" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/stdcopy" diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go index b9e320b82718..55fcff697357 100644 --- a/cli/command/container/inspect.go +++ b/cli/command/container/inspect.go @@ -3,11 +3,11 @@ package container 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/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "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/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/container/kill.go b/cli/command/container/kill.go index 2483a2243793..1578f64bacad 100644 --- a/cli/command/container/kill.go +++ b/cli/command/container/kill.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/container/list.go b/cli/command/container/list.go index 3571954b5cdb..18a83fcdae5a 100644 --- a/cli/command/container/list.go +++ b/cli/command/container/list.go @@ -4,13 +4,13 @@ import ( "context" "io" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "github.com/docker/cli/opts" - "github.com/docker/cli/templates" + "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" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" + "github.com/docker/cli/v24/templates" "github.com/docker/docker/api/types" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/list_test.go b/cli/command/container/list_test.go index f88aeeb56c83..0fd6336b027f 100644 --- a/cli/command/container/list_test.go +++ b/cli/command/container/list_test.go @@ -5,10 +5,10 @@ import ( "io" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/container/logs.go b/cli/command/container/logs.go index 0fd7cfd0cc6b..8505143629bc 100644 --- a/cli/command/container/logs.go +++ b/cli/command/container/logs.go @@ -4,9 +4,9 @@ import ( "context" "io" - "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/docker/docker/pkg/stdcopy" "github.com/spf13/cobra" diff --git a/cli/command/container/logs_test.go b/cli/command/container/logs_test.go index 14efb0341cbc..f13bb6856213 100644 --- a/cli/command/container/logs_test.go +++ b/cli/command/container/logs_test.go @@ -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/docker/docker/api/types/container" "gotest.tools/v3/assert" diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index e4db20ee3e47..f813225a3a5f 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/docker/cli/cli/compose/loader" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli/compose/loader" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" networktypes "github.com/docker/docker/api/types/network" diff --git a/cli/command/container/pause.go b/cli/command/container/pause.go index aec3c4cb1773..b6f9e97965b9 100644 --- a/cli/command/container/pause.go +++ b/cli/command/container/pause.go @@ -5,9 +5,9 @@ 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/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/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/port.go b/cli/command/container/port.go index e8e39efa2189..7323883c4f8c 100644 --- a/cli/command/container/port.go +++ b/cli/command/container/port.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "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/go-connections/nat" "github.com/fvbommel/sortorder" "github.com/pkg/errors" diff --git a/cli/command/container/port_test.go b/cli/command/container/port_test.go index 66e601c54331..02b82aa29cd6 100644 --- a/cli/command/container/port_test.go +++ b/cli/command/container/port_test.go @@ -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/docker/go-connections/nat" "gotest.tools/v3/assert" diff --git a/cli/command/container/prune.go b/cli/command/container/prune.go index 868560ef711e..ff92b3af5d0d 100644 --- a/cli/command/container/prune.go +++ b/cli/command/container/prune.go @@ -4,10 +4,10 @@ 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/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" units "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cli/command/container/rename.go b/cli/command/container/rename.go index faed72b51aea..d01d0ab9a5dc 100644 --- a/cli/command/container/rename.go +++ b/cli/command/container/rename.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/container/restart.go b/cli/command/container/restart.go index ce22b2c2702b..8d6944e9f8d2 100644 --- a/cli/command/container/restart.go +++ b/cli/command/container/restart.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/docker/docker/api/types/container" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/rm.go b/cli/command/container/rm.go index 70a78e84fb0a..3de8418fa07a 100644 --- a/cli/command/container/rm.go +++ b/cli/command/container/rm.go @@ -5,9 +5,9 @@ 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/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/docker/docker/errdefs" "github.com/pkg/errors" diff --git a/cli/command/container/rm_test.go b/cli/command/container/rm_test.go index 7ab83dd2c907..1a33a706d297 100644 --- a/cli/command/container/rm_test.go +++ b/cli/command/container/rm_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/errdefs" "gotest.tools/v3/assert" diff --git a/cli/command/container/run.go b/cli/command/container/run.go index fd4dccae0bbb..da248a18f59a 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -8,10 +8,10 @@ import ( "strings" "syscall" - "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" "github.com/docker/docker/api/types/container" "github.com/moby/sys/signal" diff --git a/cli/command/container/run_test.go b/cli/command/container/run_test.go index 4f3acfa730d7..ab6f28ce5964 100644 --- a/cli/command/container/run_test.go +++ b/cli/command/container/run_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" specs "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cli/command/container/signals.go b/cli/command/container/signals.go index b8b746df5e56..0c599d5b9efb 100644 --- a/cli/command/container/signals.go +++ b/cli/command/container/signals.go @@ -5,7 +5,7 @@ import ( "os" gosignal "os/signal" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "github.com/moby/sys/signal" "github.com/sirupsen/logrus" ) diff --git a/cli/command/container/signals_test.go b/cli/command/container/signals_test.go index 325fb5d9851e..d0eb7529b1bd 100644 --- a/cli/command/container/signals_test.go +++ b/cli/command/container/signals_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/moby/sys/signal" ) diff --git a/cli/command/container/signals_unix_test.go b/cli/command/container/signals_unix_test.go index 84f7f52be3a7..831ec7befbf8 100644 --- a/cli/command/container/signals_unix_test.go +++ b/cli/command/container/signals_unix_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "golang.org/x/sys/unix" "gotest.tools/v3/assert" ) diff --git a/cli/command/container/start.go b/cli/command/container/start.go index 9a8a083e6b00..ff80aabcf248 100644 --- a/cli/command/container/start.go +++ b/cli/command/container/start.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "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/moby/sys/signal" "github.com/moby/term" diff --git a/cli/command/container/stats.go b/cli/command/container/stats.go index c0c4f0e0e5a9..25377e609afb 100644 --- a/cli/command/container/stats.go +++ b/cli/command/container/stats.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "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" - flagsHelper "github.com/docker/cli/cli/flags" + "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" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/cli/command/container/stop.go b/cli/command/container/stop.go index 1cff0741b806..ecde5f251400 100644 --- a/cli/command/container/stop.go +++ b/cli/command/container/stop.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/docker/docker/api/types/container" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/top.go b/cli/command/container/top.go index 0ba6557cd7b0..4bb998645a6c 100644 --- a/cli/command/container/top.go +++ b/cli/command/container/top.go @@ -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/cli/command/formatter/tabwriter" + "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/tabwriter" "github.com/spf13/cobra" ) diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go index 1d287b0068f0..e3470ae8ecd7 100644 --- a/cli/command/container/tty.go +++ b/cli/command/container/tty.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/moby/sys/signal" diff --git a/cli/command/container/tty_test.go b/cli/command/container/tty_test.go index dc5a5a46deaa..325bb3d187a4 100644 --- a/cli/command/container/tty_test.go +++ b/cli/command/container/tty_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/container/unpause.go b/cli/command/container/unpause.go index 1e155c7c8a0c..a60e0566456c 100644 --- a/cli/command/container/unpause.go +++ b/cli/command/container/unpause.go @@ -5,9 +5,9 @@ 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/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/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/update.go b/cli/command/container/update.go index 0e53ceb9df1b..bc1ef7fd6c46 100644 --- a/cli/command/container/update.go +++ b/cli/command/container/update.go @@ -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" containertypes "github.com/docker/docker/api/types/container" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/container/utils.go b/cli/command/container/utils.go index f32926141710..6092aa007c74 100644 --- a/cli/command/container/utils.go +++ b/cli/command/container/utils.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/cli/command/container/utils_test.go b/cli/command/container/utils_test.go index 295b347882a1..a872c2a60582 100644 --- a/cli/command/container/utils_test.go +++ b/cli/command/container/utils_test.go @@ -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" "github.com/docker/docker/api/types/container" "github.com/pkg/errors" diff --git a/cli/command/container/wait.go b/cli/command/container/wait.go index df782e3a75b1..16574b29cbd9 100644 --- a/cli/command/container/wait.go +++ b/cli/command/container/wait.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/context.go b/cli/command/context.go index 29a2be860fc5..a38bcc8918a1 100644 --- a/cli/command/context.go +++ b/cli/command/context.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/context/store" ) // DockerContext is a typed representation of what we put in Context metadata diff --git a/cli/command/context/cmd.go b/cli/command/context/cmd.go index f8b9e80d9399..85b94a50a1a6 100644 --- a/cli/command/context/cmd.go +++ b/cli/command/context/cmd.go @@ -1,8 +1,8 @@ package context 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" ) diff --git a/cli/command/context/create.go b/cli/command/context/create.go index 757d40adef04..d1e3cc60442e 100644 --- a/cli/command/context/create.go +++ b/cli/command/context/create.go @@ -4,12 +4,12 @@ import ( "bytes" "fmt" - "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/tabwriter" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" + "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/tabwriter" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" "github.com/docker/docker/errdefs" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/context/create_test.go b/cli/command/context/create_test.go index e962f5a680cd..297dac14c96b 100644 --- a/cli/command/context/create_test.go +++ b/cli/command/context/create_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" ) diff --git a/cli/command/context/export-import_test.go b/cli/command/context/export-import_test.go index fc3952c30054..59735c02cc85 100644 --- a/cli/command/context/export-import_test.go +++ b/cli/command/context/export-import_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v24/cli/streams" "gotest.tools/v3/assert" ) diff --git a/cli/command/context/export.go b/cli/command/context/export.go index a8f9220c3e09..2d2d593fe71f 100644 --- a/cli/command/context/export.go +++ b/cli/command/context/export.go @@ -6,9 +6,9 @@ import ( "io" "os" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/store" "github.com/spf13/cobra" ) diff --git a/cli/command/context/import.go b/cli/command/context/import.go index c09f8f89f5b1..fda77ed4248f 100644 --- a/cli/command/context/import.go +++ b/cli/command/context/import.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/store" "github.com/spf13/cobra" ) diff --git a/cli/command/context/inspect.go b/cli/command/context/inspect.go index ddd0f926398d..2698ea0ba41d 100644 --- a/cli/command/context/inspect.go +++ b/cli/command/context/inspect.go @@ -3,10 +3,10 @@ package context import ( "errors" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/inspect" - "github.com/docker/cli/cli/context/store" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/inspect" + "github.com/docker/cli/v24/cli/context/store" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/context/list.go b/cli/command/context/list.go index 7798f131ae90..2e3ad49fae98 100644 --- a/cli/command/context/list.go +++ b/cli/command/context/list.go @@ -5,12 +5,12 @@ import ( "os" "sort" - "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/cli/context/docker" - flagsHelper "github.com/docker/cli/cli/flags" + "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/cli/v24/cli/context/docker" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/client" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/context/list_test.go b/cli/command/context/list_test.go index 98ac2e480c55..953d8d810152 100644 --- a/cli/command/context/list_test.go +++ b/cli/command/context/list_test.go @@ -3,7 +3,7 @@ package context import ( "testing" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli/command" "gotest.tools/v3/assert" "gotest.tools/v3/golden" ) diff --git a/cli/command/context/options.go b/cli/command/context/options.go index 39707fe3e94f..8b03468449ee 100644 --- a/cli/command/context/options.go +++ b/cli/command/context/options.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/command" + "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/docker/client" "github.com/pkg/errors" ) diff --git a/cli/command/context/remove.go b/cli/command/context/remove.go index 9ba405d588e1..42fdcbc92370 100644 --- a/cli/command/context/remove.go +++ b/cli/command/context/remove.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "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/errdefs" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/context/remove_test.go b/cli/command/context/remove_test.go index 35e27781b2e5..3b73979bc39b 100644 --- a/cli/command/context/remove_test.go +++ b/cli/command/context/remove_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/cli/config/configfile" "github.com/docker/docker/errdefs" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/context/show.go b/cli/command/context/show.go index dd33f9e02a84..4477ff4d16cc 100644 --- a/cli/command/context/show.go +++ b/cli/command/context/show.go @@ -3,9 +3,9 @@ package context import ( "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/spf13/cobra" ) diff --git a/cli/command/context/update.go b/cli/command/context/update.go index eefd5d244212..2bbfd4d0dd78 100644 --- a/cli/command/context/update.go +++ b/cli/command/context/update.go @@ -4,11 +4,11 @@ import ( "bytes" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter/tabwriter" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter/tabwriter" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/context/update_test.go b/cli/command/context/update_test.go index 5bad6dec2f79..9dc6fa9da491 100644 --- a/cli/command/context/update_test.go +++ b/cli/command/context/update_test.go @@ -3,8 +3,8 @@ package context import ( "testing" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/docker" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/docker" "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/context/use.go b/cli/command/context/use.go index c24a0c6ecb54..b846483b4a87 100644 --- a/cli/command/context/use.go +++ b/cli/command/context/use.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/store" "github.com/docker/docker/client" "github.com/spf13/cobra" ) diff --git a/cli/command/context/use_test.go b/cli/command/context/use_test.go index d7521abcdb58..0ed3bdfd153e 100644 --- a/cli/command/context/use_test.go +++ b/cli/command/context/use_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/command" - "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/command" + "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/errdefs" "github.com/docker/docker/pkg/homedir" "gotest.tools/v3/assert" diff --git a/cli/command/defaultcontextstore.go b/cli/command/defaultcontextstore.go index 95f89fc6ff0a..b4b265fe47dd 100644 --- a/cli/command/defaultcontextstore.go +++ b/cli/command/defaultcontextstore.go @@ -1,9 +1,9 @@ package command import ( - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" - cliflags "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" + cliflags "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/errdefs" "github.com/pkg/errors" ) diff --git a/cli/command/defaultcontextstore_test.go b/cli/command/defaultcontextstore_test.go index a368135ff7fc..bd957812c358 100644 --- a/cli/command/defaultcontextstore_test.go +++ b/cli/command/defaultcontextstore_test.go @@ -4,10 +4,10 @@ import ( "crypto/rand" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" - cliflags "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" + cliflags "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/errdefs" "github.com/docker/go-connections/tlsconfig" "gotest.tools/v3/assert" diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go index c076d3e4b1c5..9542295be06d 100644 --- a/cli/command/formatter/container_test.go +++ b/cli/command/formatter/container_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go index 715e9ea62b80..c0e4aef6dbb6 100644 --- a/cli/command/formatter/formatter.go +++ b/cli/command/formatter/formatter.go @@ -6,8 +6,8 @@ import ( "strings" "text/template" - "github.com/docker/cli/cli/command/formatter/tabwriter" - "github.com/docker/cli/templates" + "github.com/docker/cli/v24/cli/command/formatter/tabwriter" + "github.com/docker/cli/v24/templates" "github.com/pkg/errors" ) diff --git a/cli/command/formatter/image_test.go b/cli/command/formatter/image_test.go index ab336b4a397e..b81518fca5e0 100644 --- a/cli/command/formatter/image_test.go +++ b/cli/command/formatter/image_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/formatter/volume_test.go b/cli/command/formatter/volume_test.go index 64997a2d8191..2c320cb754c0 100644 --- a/cli/command/formatter/volume_test.go +++ b/cli/command/formatter/volume_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/volume" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/idresolver/idresolver_test.go b/cli/command/idresolver/idresolver_test.go index a7b6fc036314..2b7b1ee0ba30 100644 --- a/cli/command/idresolver/idresolver_test.go +++ b/cli/command/idresolver/idresolver_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 27b6cafd876b..99c20b75bef9 100644 --- a/cli/command/image/build.go +++ b/cli/command/image/build.go @@ -14,10 +14,10 @@ import ( "runtime" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image/build" - "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/image/build" + "github.com/docker/cli/v24/opts" "github.com/docker/distribution/reference" "github.com/docker/docker/api" "github.com/docker/docker/api/types" diff --git a/cli/command/image/build_test.go b/cli/command/image/build_test.go index cb4053f14785..c8eac0fd7cc5 100644 --- a/cli/command/image/build_test.go +++ b/cli/command/image/build_test.go @@ -11,8 +11,8 @@ import ( "sort" "testing" - "github.com/docker/cli/cli/streams" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/streams" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/archive" "github.com/google/go-cmp/cmp" diff --git a/cli/command/image/cmd.go b/cli/command/image/cmd.go index c035da17f05c..185ed5e18804 100644 --- a/cli/command/image/cmd.go +++ b/cli/command/image/cmd.go @@ -1,8 +1,8 @@ package image 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" ) diff --git a/cli/command/image/formatter_history.go b/cli/command/image/formatter_history.go index 4e826cb6412d..dccf28c90f31 100644 --- a/cli/command/image/formatter_history.go +++ b/cli/command/image/formatter_history.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/api/types/image" "github.com/docker/docker/pkg/stringid" units "github.com/docker/go-units" diff --git a/cli/command/image/formatter_history_test.go b/cli/command/image/formatter_history_test.go index 0a8e367a86da..1b7fde684b2e 100644 --- a/cli/command/image/formatter_history_test.go +++ b/cli/command/image/formatter_history_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/image" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/image/history.go b/cli/command/image/history.go index c302e1bd4527..555046823a46 100644 --- a/cli/command/image/history.go +++ b/cli/command/image/history.go @@ -3,10 +3,10 @@ package image import ( "context" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/image/history_test.go b/cli/command/image/history_test.go index 6641b74772c7..05ca0f83287e 100644 --- a/cli/command/image/history_test.go +++ b/cli/command/image/history_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/image" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/image/import.go b/cli/command/image/import.go index 1923eded7a7a..2faa750df954 100644 --- a/cli/command/image/import.go +++ b/cli/command/image/import.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - dockeropts "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + dockeropts "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/jsonmessage" "github.com/spf13/cobra" diff --git a/cli/command/image/import_test.go b/cli/command/image/import_test.go index 4196f4fbbe56..30152667de7f 100644 --- a/cli/command/image/import_test.go +++ b/cli/command/image/import_test.go @@ -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" diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go index 2e3d5bf0862c..bbe0c6840694 100644 --- a/cli/command/image/inspect.go +++ b/cli/command/image/inspect.go @@ -3,10 +3,10 @@ package image import ( "context" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/image/inspect_test.go b/cli/command/image/inspect_test.go index fd0067e022f7..023a7eb98d73 100644 --- a/cli/command/image/inspect_test.go +++ b/cli/command/image/inspect_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/image/list.go b/cli/command/image/list.go index 2dd062da23ff..9150754e5be3 100644 --- a/cli/command/image/list.go +++ b/cli/command/image/list.go @@ -3,11 +3,11 @@ package image import ( "context" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" - "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/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/spf13/cobra" ) diff --git a/cli/command/image/list_test.go b/cli/command/image/list_test.go index fb2227b807ad..f8e3f8efd69b 100644 --- a/cli/command/image/list_test.go +++ b/cli/command/image/list_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/image/load.go b/cli/command/image/load.go index 517610ec0975..67b39055b4db 100644 --- a/cli/command/image/load.go +++ b/cli/command/image/load.go @@ -4,9 +4,9 @@ import ( "context" "io" - "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/pkg/jsonmessage" "github.com/moby/sys/sequential" "github.com/pkg/errors" diff --git a/cli/command/image/load_test.go b/cli/command/image/load_test.go index 8b648b2ec8ee..9b8206936c6c 100644 --- a/cli/command/image/load_test.go +++ b/cli/command/image/load_test.go @@ -6,7 +6,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" diff --git a/cli/command/image/prune.go b/cli/command/image/prune.go index c94c1be5966c..6170f807cb59 100644 --- a/cli/command/image/prune.go +++ b/cli/command/image/prune.go @@ -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" units "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cli/command/image/prune_test.go b/cli/command/image/prune_test.go index 8f501ac317d1..68785c108bf5 100644 --- a/cli/command/image/prune_test.go +++ b/cli/command/image/prune_test.go @@ -5,7 +5,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/docker/docker/api/types/filters" "github.com/pkg/errors" diff --git a/cli/command/image/pull.go b/cli/command/image/pull.go index bfb682f5d190..2c960dd06810 100644 --- a/cli/command/image/pull.go +++ b/cli/command/image/pull.go @@ -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/cli/trust" + "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/trust" "github.com/docker/distribution/reference" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/image/pull_test.go b/cli/command/image/pull_test.go index 3e6c55a5b45b..15c77807d178 100644 --- a/cli/command/image/pull_test.go +++ b/cli/command/image/pull_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/image/push.go b/cli/command/image/push.go index e870432f085c..d7265c8af49d 100644 --- a/cli/command/image/push.go +++ b/cli/command/image/push.go @@ -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/cli/streams" + "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/streams" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/jsonmessage" diff --git a/cli/command/image/push_test.go b/cli/command/image/push_test.go index 30acd9b37355..6c52c910e1c3 100644 --- a/cli/command/image/push_test.go +++ b/cli/command/image/push_test.go @@ -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" diff --git a/cli/command/image/remove.go b/cli/command/image/remove.go index e96195b6d0d4..354c177124cb 100644 --- a/cli/command/image/remove.go +++ b/cli/command/image/remove.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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" apiclient "github.com/docker/docker/client" "github.com/pkg/errors" diff --git a/cli/command/image/remove_test.go b/cli/command/image/remove_test.go index 55de3eb6a62e..a47c3854648f 100644 --- a/cli/command/image/remove_test.go +++ b/cli/command/image/remove_test.go @@ -5,7 +5,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" diff --git a/cli/command/image/save.go b/cli/command/image/save.go index 8063c0e785bd..196fa95cc2f8 100644 --- a/cli/command/image/save.go +++ b/cli/command/image/save.go @@ -4,9 +4,9 @@ import ( "context" "io" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/image/save_test.go b/cli/command/image/save_test.go index 22434c736fd3..7bb37620a96a 100644 --- a/cli/command/image/save_test.go +++ b/cli/command/image/save_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/image/tag.go b/cli/command/image/tag.go index f63b328b5b7e..4d9faa006eb9 100644 --- a/cli/command/image/tag.go +++ b/cli/command/image/tag.go @@ -3,9 +3,9 @@ package image import ( "context" - "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/spf13/cobra" ) diff --git a/cli/command/image/tag_test.go b/cli/command/image/tag_test.go index 87e7aeb1e585..68efbc25dbbd 100644 --- a/cli/command/image/tag_test.go +++ b/cli/command/image/tag_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/image/trust.go b/cli/command/image/trust.go index 9e06c4604b68..00da748d23b9 100644 --- a/cli/command/image/trust.go +++ b/cli/command/image/trust.go @@ -8,9 +8,9 @@ import ( "io" "sort" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/streams" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/streams" + "github.com/docker/cli/v24/cli/trust" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" diff --git a/cli/command/image/trust_test.go b/cli/command/image/trust_test.go index eba38cbb97df..2ef1e0cbaf86 100644 --- a/cli/command/image/trust_test.go +++ b/cli/command/image/trust_test.go @@ -3,7 +3,7 @@ package image import ( "testing" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/trust" registrytypes "github.com/docker/docker/api/types/registry" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go index 4a6f21080740..e6c21316a859 100644 --- a/cli/command/inspect/inspector.go +++ b/cli/command/inspect/inspector.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "github.com/docker/cli/cli" - "github.com/docker/cli/templates" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/templates" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/cli/command/inspect/inspector_test.go b/cli/command/inspect/inspector_test.go index 142d50342ba3..bd0e8bb135b9 100644 --- a/cli/command/inspect/inspector_test.go +++ b/cli/command/inspect/inspector_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/docker/cli/templates" + "github.com/docker/cli/v24/templates" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/manifest/annotate.go b/cli/command/manifest/annotate.go index c12b69d823e9..ba5dae609a31 100644 --- a/cli/command/manifest/annotate.go +++ b/cli/command/manifest/annotate.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/manifest/store" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/manifest/store" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/manifest/annotate_test.go b/cli/command/manifest/annotate_test.go index 1c6a4ace3d08..1fd478069c1d 100644 --- a/cli/command/manifest/annotate_test.go +++ b/cli/command/manifest/annotate_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/cli/manifest/store" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/manifest/store" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/cli/command/manifest/client_test.go b/cli/command/manifest/client_test.go index 07967c29abc1..85ca0a68dba6 100644 --- a/cli/command/manifest/client_test.go +++ b/cli/command/manifest/client_test.go @@ -3,8 +3,8 @@ package manifest import ( "context" - manifesttypes "github.com/docker/cli/cli/manifest/types" - "github.com/docker/cli/cli/registry/client" + manifesttypes "github.com/docker/cli/v24/cli/manifest/types" + "github.com/docker/cli/v24/cli/registry/client" "github.com/docker/distribution" "github.com/docker/distribution/reference" "github.com/opencontainers/go-digest" diff --git a/cli/command/manifest/cmd.go b/cli/command/manifest/cmd.go index a914ef6dbb4b..a53824f85574 100644 --- a/cli/command/manifest/cmd.go +++ b/cli/command/manifest/cmd.go @@ -3,8 +3,8 @@ package manifest import ( "fmt" - "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" ) diff --git a/cli/command/manifest/create_list.go b/cli/command/manifest/create_list.go index f2e54dcff6d9..d7b99a0128f1 100644 --- a/cli/command/manifest/create_list.go +++ b/cli/command/manifest/create_list.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/manifest/store" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/manifest/store" "github.com/docker/docker/registry" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/manifest/create_test.go b/cli/command/manifest/create_test.go index e1092ee3d71e..bf270a7b15b1 100644 --- a/cli/command/manifest/create_test.go +++ b/cli/command/manifest/create_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/manifest/store" - manifesttypes "github.com/docker/cli/cli/manifest/types" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/manifest/store" + manifesttypes "github.com/docker/cli/v24/cli/manifest/types" + "github.com/docker/cli/v24/internal/test" "github.com/docker/distribution/reference" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/manifest/inspect.go b/cli/command/manifest/inspect.go index c270ee53beb7..588ef3950781 100644 --- a/cli/command/manifest/inspect.go +++ b/cli/command/manifest/inspect.go @@ -6,9 +6,9 @@ import ( "encoding/json" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/manifest/types" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/reference" "github.com/docker/docker/registry" diff --git a/cli/command/manifest/inspect_test.go b/cli/command/manifest/inspect_test.go index 9f4139e08cb5..3817db2412d8 100644 --- a/cli/command/manifest/inspect_test.go +++ b/cli/command/manifest/inspect_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/manifest/store" - "github.com/docker/cli/cli/manifest/types" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/manifest/store" + "github.com/docker/cli/v24/cli/manifest/types" + "github.com/docker/cli/v24/internal/test" "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema2" "github.com/docker/distribution/reference" diff --git a/cli/command/manifest/push.go b/cli/command/manifest/push.go index 41ab4941d875..a334a9fd880f 100644 --- a/cli/command/manifest/push.go +++ b/cli/command/manifest/push.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/manifest/types" - registryclient "github.com/docker/cli/cli/registry/client" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/manifest/types" + registryclient "github.com/docker/cli/v24/cli/registry/client" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/ocischema" diff --git a/cli/command/manifest/push_test.go b/cli/command/manifest/push_test.go index a39fa66c5f74..942002163b54 100644 --- a/cli/command/manifest/push_test.go +++ b/cli/command/manifest/push_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/manifest/store" - manifesttypes "github.com/docker/cli/cli/manifest/types" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/manifest/store" + manifesttypes "github.com/docker/cli/v24/cli/manifest/types" + "github.com/docker/cli/v24/internal/test" "github.com/docker/distribution/reference" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/manifest/rm.go b/cli/command/manifest/rm.go index 380dc59c20bc..c5fc476bea07 100644 --- a/cli/command/manifest/rm.go +++ b/cli/command/manifest/rm.go @@ -3,8 +3,8 @@ package manifest import ( "strings" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/manifest/rm_test.go b/cli/command/manifest/rm_test.go index d76f85a507f7..ae8c65f4ac9d 100644 --- a/cli/command/manifest/rm_test.go +++ b/cli/command/manifest/rm_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/cli/manifest/store" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/manifest/store" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" ) diff --git a/cli/command/manifest/util.go b/cli/command/manifest/util.go index 16aba15c7488..42cd06e3bda2 100644 --- a/cli/command/manifest/util.go +++ b/cli/command/manifest/util.go @@ -3,9 +3,9 @@ package manifest import ( "context" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/manifest/store" - "github.com/docker/cli/cli/manifest/types" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/manifest/store" + "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution/reference" ) diff --git a/cli/command/network/cmd.go b/cli/command/network/cmd.go index 3db3088ebe95..da87dbc515da 100644 --- a/cli/command/network/cmd.go +++ b/cli/command/network/cmd.go @@ -1,8 +1,8 @@ package network 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" ) diff --git a/cli/command/network/connect.go b/cli/command/network/connect.go index 75e3c0b4c893..f01ee706b702 100644 --- a/cli/command/network/connect.go +++ b/cli/command/network/connect.go @@ -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/network" "github.com/spf13/cobra" ) diff --git a/cli/command/network/connect_test.go b/cli/command/network/connect_test.go index c245a785433d..8c797327c21e 100644 --- a/cli/command/network/connect_test.go +++ b/cli/command/network/connect_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/network" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/network/create.go b/cli/command/network/create.go index 7e9662746be5..ec91f05f7376 100644 --- a/cli/command/network/create.go +++ b/cli/command/network/create.go @@ -6,10 +6,10 @@ import ( "net" "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" "github.com/docker/docker/api/types/network" "github.com/pkg/errors" diff --git a/cli/command/network/create_test.go b/cli/command/network/create_test.go index 95938df15e18..bc88826c18a5 100644 --- a/cli/command/network/create_test.go +++ b/cli/command/network/create_test.go @@ -6,7 +6,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/network" "github.com/pkg/errors" diff --git a/cli/command/network/disconnect.go b/cli/command/network/disconnect.go index 11f03b9254da..9200f183fd64 100644 --- a/cli/command/network/disconnect.go +++ b/cli/command/network/disconnect.go @@ -3,9 +3,9 @@ package network import ( "context" - "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" ) diff --git a/cli/command/network/disconnect_test.go b/cli/command/network/disconnect_test.go index e60ecd6ac089..73f17ae2584f 100644 --- a/cli/command/network/disconnect_test.go +++ b/cli/command/network/disconnect_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/cli/command/network/formatter.go b/cli/command/network/formatter.go index ed8ac257a057..27ac7cd6215a 100644 --- a/cli/command/network/formatter.go +++ b/cli/command/network/formatter.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" ) diff --git a/cli/command/network/formatter_test.go b/cli/command/network/formatter_test.go index b7807cd53646..03c47bbcbc17 100644 --- a/cli/command/network/formatter_test.go +++ b/cli/command/network/formatter_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go index 33dba10df7c0..c25162409957 100644 --- a/cli/command/network/inspect.go +++ b/cli/command/network/inspect.go @@ -3,11 +3,11 @@ package network 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/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "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/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/api/types" "github.com/spf13/cobra" ) diff --git a/cli/command/network/list.go b/cli/command/network/list.go index 903b561ac9ad..6a579c43835b 100644 --- a/cli/command/network/list.go +++ b/cli/command/network/list.go @@ -4,12 +4,12 @@ import ( "context" "sort" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/network/list_test.go b/cli/command/network/list_test.go index b32c08f85b3f..c1a7a80766f6 100644 --- a/cli/command/network/list_test.go +++ b/cli/command/network/list_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/google/go-cmp/cmp" diff --git a/cli/command/network/prune.go b/cli/command/network/prune.go index 460a5b5646c2..a803c8aaf37f 100644 --- a/cli/command/network/prune.go +++ b/cli/command/network/prune.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/opts" "github.com/spf13/cobra" ) diff --git a/cli/command/network/remove.go b/cli/command/network/remove.go index ee96fd614c63..f9436736cbc1 100644 --- a/cli/command/network/remove.go +++ b/cli/command/network/remove.go @@ -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/docker/docker/errdefs" "github.com/spf13/cobra" diff --git a/cli/command/network/remove_test.go b/cli/command/network/remove_test.go index ed85e5469924..ea9c439b45ca 100644 --- a/cli/command/network/remove_test.go +++ b/cli/command/network/remove_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/errdefs" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/node/cmd.go b/cli/command/node/cmd.go index 0e519ae4405c..641cd7ff6f2d 100644 --- a/cli/command/node/cmd.go +++ b/cli/command/node/cmd.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "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" apiclient "github.com/docker/docker/client" "github.com/spf13/cobra" diff --git a/cli/command/node/demote.go b/cli/command/node/demote.go index 5250dfc0be1f..9a110d647db3 100644 --- a/cli/command/node/demote.go +++ b/cli/command/node/demote.go @@ -3,8 +3,8 @@ package node import ( "fmt" - "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/swarm" "github.com/spf13/cobra" ) diff --git a/cli/command/node/demote_test.go b/cli/command/node/demote_test.go index 8c226a9f9fe9..bf0ea4ad59f8 100644 --- a/cli/command/node/demote_test.go +++ b/cli/command/node/demote_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package functions "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/node/formatter.go b/cli/command/node/formatter.go index 9cd9d015e03d..b40e44d1cae1 100644 --- a/cli/command/node/formatter.go +++ b/cli/command/node/formatter.go @@ -6,9 +6,9 @@ import ( "reflect" "strings" - "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" "github.com/docker/docker/api/types/swarm" units "github.com/docker/go-units" diff --git a/cli/command/node/formatter_test.go b/cli/command/node/formatter_test.go index afa44981ae03..5def8ad15fd9 100644 --- a/cli/command/node/formatter_test.go +++ b/cli/command/node/formatter_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/pkg/stringid" diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go index 96abfd192755..396021f76d6b 100644 --- a/cli/command/node/inspect.go +++ b/cli/command/node/inspect.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/node/inspect_test.go b/cli/command/node/inspect_test.go index 2c2e33bedf2b..312df7a34570 100644 --- a/cli/command/node/inspect_test.go +++ b/cli/command/node/inspect_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package functions "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/node/list.go b/cli/command/node/list.go index 99d0a428fe9d..1795a16cc72c 100644 --- a/cli/command/node/list.go +++ b/cli/command/node/list.go @@ -4,12 +4,12 @@ import ( "context" "sort" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/node/list_test.go b/cli/command/node/list_test.go index 6c176795fc77..c8f7bd0921ee 100644 --- a/cli/command/node/list_test.go +++ b/cli/command/node/list_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/node/opts.go b/cli/command/node/opts.go index e30e5de91005..906a3b82c274 100644 --- a/cli/command/node/opts.go +++ b/cli/command/node/opts.go @@ -1,7 +1,7 @@ package node import ( - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/opts" ) type nodeOptions struct { diff --git a/cli/command/node/promote.go b/cli/command/node/promote.go index 4612cc13ff29..2e4905580e3d 100644 --- a/cli/command/node/promote.go +++ b/cli/command/node/promote.go @@ -3,8 +3,8 @@ package node import ( "fmt" - "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/swarm" "github.com/spf13/cobra" ) diff --git a/cli/command/node/promote_test.go b/cli/command/node/promote_test.go index ebb2890ec2ad..f0f9e906ee70 100644 --- a/cli/command/node/promote_test.go +++ b/cli/command/node/promote_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/node/ps.go b/cli/command/node/ps.go index 28f90a387d0e..7983c1c8262a 100644 --- a/cli/command/node/ps.go +++ b/cli/command/node/ps.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/cli/command/task" - "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/cli/command/idresolver" + "github.com/docker/cli/v24/cli/command/task" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/node/ps_test.go b/cli/command/node/ps_test.go index 870e8eb1871f..1e1fef5a6933 100644 --- a/cli/command/node/ps_test.go +++ b/cli/command/node/ps_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/node/remove.go b/cli/command/node/remove.go index 65e3cdc30ada..c2fe092a7e37 100644 --- a/cli/command/node/remove.go +++ b/cli/command/node/remove.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/node/remove_test.go b/cli/command/node/remove_test.go index db7bbcc7de49..04662aa4ce8a 100644 --- a/cli/command/node/remove_test.go +++ b/cli/command/node/remove_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/cli/command/node/update.go b/cli/command/node/update.go index 235317208064..35743552e6b5 100644 --- a/cli/command/node/update.go +++ b/cli/command/node/update.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/node/update_test.go b/cli/command/node/update_test.go index 797f79f621da..aa9df1285a35 100644 --- a/cli/command/node/update_test.go +++ b/cli/command/node/update_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/plugin/cmd.go b/cli/command/plugin/cmd.go index 2e79ab1d49b5..74a724134c05 100644 --- a/cli/command/plugin/cmd.go +++ b/cli/command/plugin/cmd.go @@ -1,8 +1,8 @@ package plugin 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" ) diff --git a/cli/command/plugin/create.go b/cli/command/plugin/create.go index bab0778cd39a..ae6afb5a23e1 100644 --- a/cli/command/plugin/create.go +++ b/cli/command/plugin/create.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "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/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/archive" diff --git a/cli/command/plugin/create_test.go b/cli/command/plugin/create_test.go index 37ce5e22c4bc..9da57320def7 100644 --- a/cli/command/plugin/create_test.go +++ b/cli/command/plugin/create_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/plugin/disable.go b/cli/command/plugin/disable.go index 014d86b2b89c..fecc85d2328f 100644 --- a/cli/command/plugin/disable.go +++ b/cli/command/plugin/disable.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "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" ) diff --git a/cli/command/plugin/disable_test.go b/cli/command/plugin/disable_test.go index ca2e0d2cbbbe..7336b6936867 100644 --- a/cli/command/plugin/disable_test.go +++ b/cli/command/plugin/disable_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/plugin/enable.go b/cli/command/plugin/enable.go index 19df1e7bd2ad..b30f811ab8e9 100644 --- a/cli/command/plugin/enable.go +++ b/cli/command/plugin/enable.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "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/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/plugin/enable_test.go b/cli/command/plugin/enable_test.go index 1d8840e77c16..9431050a3146 100644 --- a/cli/command/plugin/enable_test.go +++ b/cli/command/plugin/enable_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/plugin/formatter.go b/cli/command/plugin/formatter.go index 438bf95171ea..4d30e76f8325 100644 --- a/cli/command/plugin/formatter.go +++ b/cli/command/plugin/formatter.go @@ -3,7 +3,7 @@ package plugin import ( "strings" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" ) diff --git a/cli/command/plugin/formatter_test.go b/cli/command/plugin/formatter_test.go index a5e1a4b1f7b6..cbc6b6a677a3 100644 --- a/cli/command/plugin/formatter_test.go +++ b/cli/command/plugin/formatter_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" "gotest.tools/v3/assert" diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go index c84711af2bbf..324f8a1481c4 100644 --- a/cli/command/plugin/inspect.go +++ b/cli/command/plugin/inspect.go @@ -3,10 +3,10 @@ package plugin import ( "context" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/plugin/inspect_test.go b/cli/command/plugin/inspect_test.go index 4d3127660a68..2529f39650dc 100644 --- a/cli/command/plugin/inspect_test.go +++ b/cli/command/plugin/inspect_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go index d178f19cfeca..2ab363a0482c 100644 --- a/cli/command/plugin/install.go +++ b/cli/command/plugin/install.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "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" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/jsonmessage" diff --git a/cli/command/plugin/install_test.go b/cli/command/plugin/install_test.go index e49b582f83c8..0aa87150feed 100644 --- a/cli/command/plugin/install_test.go +++ b/cli/command/plugin/install_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" diff --git a/cli/command/plugin/list.go b/cli/command/plugin/list.go index 5f4344f9f622..6ccec36f0e21 100644 --- a/cli/command/plugin/list.go +++ b/cli/command/plugin/list.go @@ -4,12 +4,12 @@ import ( "context" "sort" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" ) diff --git a/cli/command/plugin/list_test.go b/cli/command/plugin/list_test.go index ed30eb1c596f..ec6a8af43182 100644 --- a/cli/command/plugin/list_test.go +++ b/cli/command/plugin/list_test.go @@ -5,7 +5,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/docker/docker/api/types/filters" diff --git a/cli/command/plugin/push.go b/cli/command/plugin/push.go index 8b9dc09ca446..b39317c82e11 100644 --- a/cli/command/plugin/push.go +++ b/cli/command/plugin/push.go @@ -3,9 +3,9 @@ package plugin import ( "context" - "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" "github.com/docker/distribution/reference" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/registry" diff --git a/cli/command/plugin/remove.go b/cli/command/plugin/remove.go index a2092bd76b67..dc42b49fc00e 100644 --- a/cli/command/plugin/remove.go +++ b/cli/command/plugin/remove.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "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" ) diff --git a/cli/command/plugin/remove_test.go b/cli/command/plugin/remove_test.go index 36cfe0ba4508..18f349c90d40 100644 --- a/cli/command/plugin/remove_test.go +++ b/cli/command/plugin/remove_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/plugin/set.go b/cli/command/plugin/set.go index 724fdebfd517..47e30153e2ed 100644 --- a/cli/command/plugin/set.go +++ b/cli/command/plugin/set.go @@ -3,8 +3,8 @@ package plugin 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/spf13/cobra" ) diff --git a/cli/command/plugin/upgrade.go b/cli/command/plugin/upgrade.go index f5afb509d51d..b42f0d9e3508 100644 --- a/cli/command/plugin/upgrade.go +++ b/cli/command/plugin/upgrade.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/distribution/reference" "github.com/docker/docker/pkg/jsonmessage" "github.com/pkg/errors" diff --git a/cli/command/registry.go b/cli/command/registry.go index 7ed01b55f4d8..deeb1dcb1b6c 100644 --- a/cli/command/registry.go +++ b/cli/command/registry.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - configtypes "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/streams" + configtypes "github.com/docker/cli/v24/cli/config/types" + "github.com/docker/cli/v24/cli/streams" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" diff --git a/cli/command/registry/formatter_search.go b/cli/command/registry/formatter_search.go index 8c76d0980ebe..ee6a4521e9d9 100644 --- a/cli/command/registry/formatter_search.go +++ b/cli/command/registry/formatter_search.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" registrytypes "github.com/docker/docker/api/types/registry" ) diff --git a/cli/command/registry/formatter_search_test.go b/cli/command/registry/formatter_search_test.go index bb53e5dbfbf2..648e6797ce67 100644 --- a/cli/command/registry/formatter_search_test.go +++ b/cli/command/registry/formatter_search_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/internal/test" registrytypes "github.com/docker/docker/api/types/registry" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index 7ddfccca204a..5e2177e06850 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - configtypes "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" + configtypes "github.com/docker/cli/v24/cli/config/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" "github.com/docker/docker/errdefs" diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go index 8a1692570555..d0f6bfbeb9b6 100644 --- a/cli/command/registry/login_test.go +++ b/cli/command/registry/login_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - configtypes "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/internal/test" + configtypes "github.com/docker/cli/v24/cli/config/types" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" diff --git a/cli/command/registry/logout.go b/cli/command/registry/logout.go index 1799e5410a01..43273a70a096 100644 --- a/cli/command/registry/logout.go +++ b/cli/command/registry/logout.go @@ -3,8 +3,8 @@ package registry import ( "fmt" - "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/registry" "github.com/spf13/cobra" ) diff --git a/cli/command/registry/search.go b/cli/command/registry/search.go index 9efc1f3d5ac3..9d407151c60a 100644 --- a/cli/command/registry/search.go +++ b/cli/command/registry/search.go @@ -3,10 +3,10 @@ package registry import ( "context" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - "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/formatter" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/registry" "github.com/spf13/cobra" diff --git a/cli/command/registry_test.go b/cli/command/registry_test.go index 6c456149305b..fe2e3880ee89 100644 --- a/cli/command/registry_test.go +++ b/cli/command/registry_test.go @@ -6,9 +6,9 @@ import ( "fmt" "testing" - . "github.com/docker/cli/cli/command" // Prevents a circular import with "github.com/docker/cli/internal/test" - configtypes "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/internal/test" + . "github.com/docker/cli/v24/cli/command" // Prevents a circular import with "github.com/docker/cli/v24/internal/test" + configtypes "github.com/docker/cli/v24/cli/config/types" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" diff --git a/cli/command/secret/cmd.go b/cli/command/secret/cmd.go index ec0643b05440..08902fb42b7e 100644 --- a/cli/command/secret/cmd.go +++ b/cli/command/secret/cmd.go @@ -1,9 +1,9 @@ package secret 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" ) diff --git a/cli/command/secret/create.go b/cli/command/secret/create.go index 3f656ec3ee32..825034cf3128 100644 --- a/cli/command/secret/create.go +++ b/cli/command/secret/create.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/swarm" "github.com/moby/sys/sequential" "github.com/pkg/errors" diff --git a/cli/command/secret/create_test.go b/cli/command/secret/create_test.go index 6af3aa97f4ab..34b58d55bbbd 100644 --- a/cli/command/secret/create_test.go +++ b/cli/command/secret/create_test.go @@ -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" diff --git a/cli/command/secret/formatter.go b/cli/command/secret/formatter.go index 9102f28856b8..4afa6aa7381d 100644 --- a/cli/command/secret/formatter.go +++ b/cli/command/secret/formatter.go @@ -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" ) diff --git a/cli/command/secret/formatter_test.go b/cli/command/secret/formatter_test.go index 3aec4c801c2d..7bf5d53b601a 100644 --- a/cli/command/secret/formatter_test.go +++ b/cli/command/secret/formatter_test.go @@ -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" ) diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go index 2b63ecc4b258..4ab264dc48cb 100644 --- a/cli/command/secret/inspect.go +++ b/cli/command/secret/inspect.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/secret/inspect_test.go b/cli/command/secret/inspect_test.go index 8f0f3e81ec8b..51b7577b6ebc 100644 --- a/cli/command/secret/inspect_test.go +++ b/cli/command/secret/inspect_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/secret/ls.go b/cli/command/secret/ls.go index 6d8693875c6f..3d4cd64fb82c 100644 --- a/cli/command/secret/ls.go +++ b/cli/command/secret/ls.go @@ -4,11 +4,11 @@ import ( "context" "sort" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" - "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/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/secret/ls_test.go b/cli/command/secret/ls_test.go index c5ee26ee99a8..c05bd49c2ec1 100644 --- a/cli/command/secret/ls_test.go +++ b/cli/command/secret/ls_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/secret/remove.go b/cli/command/secret/remove.go index b22dd76d784a..e397962a17bb 100644 --- a/cli/command/secret/remove.go +++ b/cli/command/secret/remove.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/secret/remove_test.go b/cli/command/secret/remove_test.go index 8600a98fd314..4685f6f5f6a0 100644 --- a/cli/command/secret/remove_test.go +++ b/cli/command/secret/remove_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/service/client_test.go b/cli/command/service/client_test.go index d00afe2ca22a..6176d14419d4 100644 --- a/cli/command/service/client_test.go +++ b/cli/command/service/client_test.go @@ -3,7 +3,7 @@ package service import ( "context" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" diff --git a/cli/command/service/cmd.go b/cli/command/service/cmd.go index 2c0b8fca9d15..cbefe7e9e0f4 100644 --- a/cli/command/service/cmd.go +++ b/cli/command/service/cmd.go @@ -1,9 +1,9 @@ package service 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" ) diff --git a/cli/command/service/create.go b/cli/command/service/create.go index 8d4bc76cdd62..0e6e545c3282 100644 --- a/cli/command/service/create.go +++ b/cli/command/service/create.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - cliopts "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" + cliopts "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" diff --git a/cli/command/service/create_test.go b/cli/command/service/create_test.go index 84ee6022ba75..6395d8ef2952 100644 --- a/cli/command/service/create_test.go +++ b/cli/command/service/create_test.go @@ -9,7 +9,7 @@ import ( "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" - cliopts "github.com/docker/cli/opts" + cliopts "github.com/docker/cli/v24/opts" ) // fakeConfigAPIClientList is used to let us pass a closure as a diff --git a/cli/command/service/formatter.go b/cli/command/service/formatter.go index a5e91d2c5913..71af41a582fe 100644 --- a/cli/command/service/formatter.go +++ b/cli/command/service/formatter.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/cli/command/inspect" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/inspect" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/cli/command/service/formatter_test.go b/cli/command/service/formatter_test.go index 574f57e30d9a..52d9fcd780ce 100644 --- a/cli/command/service/formatter_test.go +++ b/cli/command/service/formatter_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "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" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/service/helpers.go b/cli/command/service/helpers.go index a104f19fd3e7..363b798338de 100644 --- a/cli/command/service/helpers.go +++ b/cli/command/service/helpers.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/service/progress" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/service/progress" "github.com/docker/docker/pkg/jsonmessage" ) diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go index 16df0c100318..2074180996c5 100644 --- a/cli/command/service/inspect.go +++ b/cli/command/service/inspect.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/api/types" apiclient "github.com/docker/docker/client" "github.com/pkg/errors" diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go index 15f920927869..2c6a259f578c 100644 --- a/cli/command/service/inspect_test.go +++ b/cli/command/service/inspect_test.go @@ -7,7 +7,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" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/service/list.go b/cli/command/service/list.go index 3bca98b70eef..ff6f0a148fa3 100644 --- a/cli/command/service/list.go +++ b/cli/command/service/list.go @@ -3,12 +3,12 @@ package service 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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/service/list_test.go b/cli/command/service/list_test.go index 576ecc34ee57..85ca72186e5b 100644 --- a/cli/command/service/list_test.go +++ b/cli/command/service/list_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" // Import builders to get the builder function as package function - . "github.com/docker/cli/internal/test/builders" + . "github.com/docker/cli/v24/internal/test/builders" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go index 215bad74d9cd..77b6d5bde9ff 100644 --- a/cli/command/service/logs.go +++ b/cli/command/service/logs.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/service/logs" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/idresolver" + "github.com/docker/cli/v24/service/logs" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index 97201fd432de..ac1b9b4e3f24 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/service/opts_test.go b/cli/command/service/opts_test.go index a51029e1f879..4ebac0d460b3 100644 --- a/cli/command/service/opts_test.go +++ b/cli/command/service/opts_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/service/ps.go b/cli/command/service/ps.go index ce49fce1f510..7dce64e7ecf8 100644 --- a/cli/command/service/ps.go +++ b/cli/command/service/ps.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/cli/command/node" - "github.com/docker/cli/cli/command/task" - "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/idresolver" + "github.com/docker/cli/v24/cli/command/node" + "github.com/docker/cli/v24/cli/command/task" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" diff --git a/cli/command/service/ps_test.go b/cli/command/service/ps_test.go index 40b612bff16f..67168ea9293a 100644 --- a/cli/command/service/ps_test.go +++ b/cli/command/service/ps_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/service/remove.go b/cli/command/service/remove.go index c1b5863fed97..311350311a10 100644 --- a/cli/command/service/remove.go +++ b/cli/command/service/remove.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/service/rollback.go b/cli/command/service/rollback.go index 5b9a863e2007..34c73b656886 100644 --- a/cli/command/service/rollback.go +++ b/cli/command/service/rollback.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "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/docker/docker/api/types/versions" "github.com/spf13/cobra" diff --git a/cli/command/service/rollback_test.go b/cli/command/service/rollback_test.go index e589946b0699..359707473a94 100644 --- a/cli/command/service/rollback_test.go +++ b/cli/command/service/rollback_test.go @@ -7,7 +7,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" "gotest.tools/v3/assert" diff --git a/cli/command/service/scale.go b/cli/command/service/scale.go index f2625445eb8b..a1fce1e2cd79 100644 --- a/cli/command/service/scale.go +++ b/cli/command/service/scale.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "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/docker/docker/api/types/versions" "github.com/pkg/errors" diff --git a/cli/command/service/trust.go b/cli/command/service/trust.go index b7453ccbb945..c22e5cc6a5fe 100644 --- a/cli/command/service/trust.go +++ b/cli/command/service/trust.go @@ -4,8 +4,8 @@ import ( "context" "encoding/hex" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/trust" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/registry" diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 2ef9014cab65..8d6334b4640f 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" diff --git a/cli/command/stack/client_test.go b/cli/command/stack/client_test.go index 6a2d0a900ac9..0e5addaac748 100644 --- a/cli/command/stack/client_test.go +++ b/cli/command/stack/client_test.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/v24/cli/compose/convert" "github.com/docker/docker/api" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/command/stack/cmd.go b/cli/command/stack/cmd.go index ff55262bf3cb..97870aed884e 100644 --- a/cli/command/stack/cmd.go +++ b/cli/command/stack/cmd.go @@ -3,10 +3,10 @@ package stack import ( "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/stack/swarm" + "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/stack/swarm" "github.com/spf13/cobra" ) diff --git a/cli/command/stack/config.go b/cli/command/stack/config.go index 354c35625ae8..83ea8990de1f 100644 --- a/cli/command/stack/config.go +++ b/cli/command/stack/config.go @@ -3,13 +3,13 @@ package stack import ( "fmt" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/stack/loader" - "github.com/docker/cli/cli/command/stack/options" - composeLoader "github.com/docker/cli/cli/compose/loader" - composetypes "github.com/docker/cli/cli/compose/types" + "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/stack/loader" + "github.com/docker/cli/v24/cli/command/stack/options" + composeLoader "github.com/docker/cli/v24/cli/compose/loader" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" ) diff --git a/cli/command/stack/config_test.go b/cli/command/stack/config_test.go index b4f50160fd22..56c5f3217e0e 100644 --- a/cli/command/stack/config_test.go +++ b/cli/command/stack/config_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/compose/loader" - composetypes "github.com/docker/cli/cli/compose/types" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/compose/loader" + composetypes "github.com/docker/cli/v24/cli/compose/types" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" ) diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go index 8b977ad0a1ce..2409e3ed140b 100644 --- a/cli/command/stack/deploy.go +++ b/cli/command/stack/deploy.go @@ -1,12 +1,12 @@ package stack import ( - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/loader" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/stack/swarm" - composetypes "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/loader" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command/stack/swarm" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/command/stack/deploy_test.go b/cli/command/stack/deploy_test.go index 86215bdc32e1..87114ef4748d 100644 --- a/cli/command/stack/deploy_test.go +++ b/cli/command/stack/deploy_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" ) diff --git a/cli/command/stack/formatter/formatter.go b/cli/command/stack/formatter/formatter.go index 07b322f0616a..0550aa3f2c1c 100644 --- a/cli/command/stack/formatter/formatter.go +++ b/cli/command/stack/formatter/formatter.go @@ -3,7 +3,7 @@ package formatter import ( "strconv" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" ) const ( diff --git a/cli/command/stack/formatter/formatter_test.go b/cli/command/stack/formatter/formatter_test.go index ec9ef83adaf1..b276282fd742 100644 --- a/cli/command/stack/formatter/formatter_test.go +++ b/cli/command/stack/formatter/formatter_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "gotest.tools/v3/assert" ) diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go index fc5b03d6510c..7a0a290d7e2e 100644 --- a/cli/command/stack/list.go +++ b/cli/command/stack/list.go @@ -3,13 +3,13 @@ package stack import ( "sort" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/stack/formatter" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/stack/swarm" - flagsHelper "github.com/docker/cli/cli/flags" + "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/stack/formatter" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command/stack/swarm" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" ) diff --git a/cli/command/stack/list_test.go b/cli/command/stack/list_test.go index 3d18f894d907..3f2fda9d5962 100644 --- a/cli/command/stack/list_test.go +++ b/cli/command/stack/list_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/stack/loader/loader.go b/cli/command/stack/loader/loader.go index 39810d883285..913bc19989d9 100644 --- a/cli/command/stack/loader/loader.go +++ b/cli/command/stack/loader/loader.go @@ -9,11 +9,11 @@ import ( "sort" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/compose/loader" - "github.com/docker/cli/cli/compose/schema" - composetypes "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/compose/loader" + "github.com/docker/cli/v24/cli/compose/schema" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/pkg/errors" ) diff --git a/cli/command/stack/options/opts.go b/cli/command/stack/options/opts.go index 9c0cece153db..4e8f0c68e725 100644 --- a/cli/command/stack/options/opts.go +++ b/cli/command/stack/options/opts.go @@ -1,6 +1,6 @@ package options -import "github.com/docker/cli/opts" +import "github.com/docker/cli/v24/opts" // Deploy holds docker stack deploy options type Deploy struct { diff --git a/cli/command/stack/ps.go b/cli/command/stack/ps.go index f962b895a7f2..5e243b431816 100644 --- a/cli/command/stack/ps.go +++ b/cli/command/stack/ps.go @@ -1,12 +1,12 @@ package stack import ( - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/stack/swarm" - flagsHelper "github.com/docker/cli/cli/flags" - cliopts "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/stack/options" + "github.com/docker/cli/v24/cli/command/stack/swarm" + flagsHelper "github.com/docker/cli/v24/cli/flags" + cliopts "github.com/docker/cli/v24/opts" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/command/stack/ps_test.go b/cli/command/stack/ps_test.go index 674ab9018db6..d24ed42b6c58 100644 --- a/cli/command/stack/ps_test.go +++ b/cli/command/stack/ps_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/stack/remove.go b/cli/command/stack/remove.go index 34827666d09d..73bfb43cc054 100644 --- a/cli/command/stack/remove.go +++ b/cli/command/stack/remove.go @@ -1,10 +1,10 @@ package stack import ( - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/stack/swarm" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command/stack/swarm" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/command/stack/remove_test.go b/cli/command/stack/remove_test.go index 0c4bd2a8e34a..3c928e7d2f16 100644 --- a/cli/command/stack/remove_test.go +++ b/cli/command/stack/remove_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/stack/services.go b/cli/command/stack/services.go index ef1947614a96..c50b3c228fa7 100644 --- a/cli/command/stack/services.go +++ b/cli/command/stack/services.go @@ -4,14 +4,14 @@ import ( "fmt" "sort" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/service" - "github.com/docker/cli/cli/command/stack/formatter" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/stack/swarm" - flagsHelper "github.com/docker/cli/cli/flags" - cliopts "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/service" + "github.com/docker/cli/v24/cli/command/stack/formatter" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command/stack/swarm" + flagsHelper "github.com/docker/cli/v24/cli/flags" + cliopts "github.com/docker/cli/v24/opts" swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/stack/services_test.go b/cli/command/stack/services_test.go index f48ee2b11ce3..366f9451ee7e 100644 --- a/cli/command/stack/services_test.go +++ b/cli/command/stack/services_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/stack/swarm/client_test.go b/cli/command/stack/swarm/client_test.go index c0fd6a83d08a..26d1c0c28183 100644 --- a/cli/command/stack/swarm/client_test.go +++ b/cli/command/stack/swarm/client_test.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/v24/cli/compose/convert" "github.com/docker/docker/api" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/command/stack/swarm/common.go b/cli/command/stack/swarm/common.go index 12731c0d8826..7d5bf2cfb85e 100644 --- a/cli/command/stack/swarm/common.go +++ b/cli/command/stack/swarm/common.go @@ -3,8 +3,8 @@ package swarm import ( "context" - "github.com/docker/cli/cli/compose/convert" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli/compose/convert" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/stack/swarm/deploy.go b/cli/command/stack/swarm/deploy.go index df5f300026b3..6269584097fd 100644 --- a/cli/command/stack/swarm/deploy.go +++ b/cli/command/stack/swarm/deploy.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/compose/convert" - composetypes "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/compose/convert" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" "github.com/pkg/errors" diff --git a/cli/command/stack/swarm/deploy_composefile.go b/cli/command/stack/swarm/deploy_composefile.go index d574125d2c19..0715635f8c08 100644 --- a/cli/command/stack/swarm/deploy_composefile.go +++ b/cli/command/stack/swarm/deploy_composefile.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/compose/convert" - composetypes "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/compose/convert" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/stack/swarm/deploy_composefile_test.go b/cli/command/stack/swarm/deploy_composefile_test.go index 86a5e09abd53..557fa2c25f9a 100644 --- a/cli/command/stack/swarm/deploy_composefile_test.go +++ b/cli/command/stack/swarm/deploy_composefile_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/docker/cli/internal/test/network" + "github.com/docker/cli/v24/internal/test/network" "github.com/docker/docker/api/types" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/stack/swarm/deploy_test.go b/cli/command/stack/swarm/deploy_test.go index cf0bcba65148..bd2464704747 100644 --- a/cli/command/stack/swarm/deploy_test.go +++ b/cli/command/stack/swarm/deploy_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/docker/cli/cli/compose/convert" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/compose/convert" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "gotest.tools/v3/assert" diff --git a/cli/command/stack/swarm/list.go b/cli/command/stack/swarm/list.go index 271cffdd0075..5bc8111e72f5 100644 --- a/cli/command/stack/swarm/list.go +++ b/cli/command/stack/swarm/list.go @@ -3,9 +3,9 @@ package swarm import ( "context" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/formatter" - "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/formatter" + "github.com/docker/cli/v24/cli/compose/convert" "github.com/docker/docker/api/types" "github.com/pkg/errors" ) diff --git a/cli/command/stack/swarm/ps.go b/cli/command/stack/swarm/ps.go index 5b28a39e73c5..223de5696b81 100644 --- a/cli/command/stack/swarm/ps.go +++ b/cli/command/stack/swarm/ps.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/cli/command/stack/options" - "github.com/docker/cli/cli/command/task" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/idresolver" + "github.com/docker/cli/v24/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command/task" "github.com/docker/docker/api/types" ) diff --git a/cli/command/stack/swarm/remove.go b/cli/command/stack/swarm/remove.go index 4dedef12f356..17b8d0cc55f1 100644 --- a/cli/command/stack/swarm/remove.go +++ b/cli/command/stack/swarm/remove.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/stack/options" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" diff --git a/cli/command/stack/swarm/services.go b/cli/command/stack/swarm/services.go index 3c24bf72dd01..211200a91190 100644 --- a/cli/command/stack/swarm/services.go +++ b/cli/command/stack/swarm/services.go @@ -3,9 +3,9 @@ package swarm import ( "context" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/service" - "github.com/docker/cli/cli/command/stack/options" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/service" + "github.com/docker/cli/v24/cli/command/stack/options" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" ) diff --git a/cli/command/streams.go b/cli/command/streams.go index fa435e1643f2..4ee196fa86ba 100644 --- a/cli/command/streams.go +++ b/cli/command/streams.go @@ -1,23 +1,23 @@ package command import ( - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v24/cli/streams" ) // InStream is an input stream used by the DockerCli to read user input -// Deprecated: Use github.com/docker/cli/cli/streams.In instead +// Deprecated: Use github.com/docker/cli/v24/cli/streams.In instead type InStream = streams.In // OutStream is an output stream used by the DockerCli to write normal program // output. -// Deprecated: Use github.com/docker/cli/cli/streams.Out instead +// Deprecated: Use github.com/docker/cli/v24/cli/streams.Out instead type OutStream = streams.Out var ( // NewInStream returns a new InStream object from a ReadCloser - // Deprecated: Use github.com/docker/cli/cli/streams.NewIn instead + // Deprecated: Use github.com/docker/cli/v24/cli/streams.NewIn instead NewInStream = streams.NewIn // NewOutStream returns a new OutStream object from a Writer - // Deprecated: Use github.com/docker/cli/cli/streams.NewOut instead + // Deprecated: Use github.com/docker/cli/v24/cli/streams.NewOut instead NewOutStream = streams.NewOut ) diff --git a/cli/command/swarm/ca.go b/cli/command/swarm/ca.go index 8793a1c9beb7..5234d4d78197 100644 --- a/cli/command/swarm/ca.go +++ b/cli/command/swarm/ca.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/swarm/progress" + "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/swarm/progress" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/pkg/jsonmessage" "github.com/pkg/errors" diff --git a/cli/command/swarm/ca_test.go b/cli/command/swarm/ca_test.go index 29d2cd359ad4..364860400b52 100644 --- a/cli/command/swarm/ca_test.go +++ b/cli/command/swarm/ca_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/swarm" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/swarm/cmd.go b/cli/command/swarm/cmd.go index e78e33d003ec..658c219bf590 100644 --- a/cli/command/swarm/cmd.go +++ b/cli/command/swarm/cmd.go @@ -3,8 +3,8 @@ package swarm import ( "github.com/spf13/cobra" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" ) // NewSwarmCommand returns a cobra command for `swarm` subcommands diff --git a/cli/command/swarm/init.go b/cli/command/swarm/init.go index 443e9055d736..99606a0873aa 100644 --- a/cli/command/swarm/init.go +++ b/cli/command/swarm/init.go @@ -6,9 +6,9 @@ import ( "net" "strings" - "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/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/init_test.go b/cli/command/swarm/init_test.go index e2153040e998..b0764b3a4906 100644 --- a/cli/command/swarm/init_test.go +++ b/cli/command/swarm/init_test.go @@ -5,7 +5,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/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/swarm/join.go b/cli/command/swarm/join.go index d36efbdb7619..ab1c11e5e7f9 100644 --- a/cli/command/swarm/join.go +++ b/cli/command/swarm/join.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/join_test.go b/cli/command/swarm/join_test.go index e8204f391335..97b166ab33bd 100644 --- a/cli/command/swarm/join_test.go +++ b/cli/command/swarm/join_test.go @@ -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/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/swarm/join_token.go b/cli/command/swarm/join_token.go index afd64d55abda..a19d8ca2d77e 100644 --- a/cli/command/swarm/join_token.go +++ b/cli/command/swarm/join_token.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "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/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/join_token_test.go b/cli/command/swarm/join_token_test.go index 082b54852a2e..f4345ee21396 100644 --- a/cli/command/swarm/join_token_test.go +++ b/cli/command/swarm/join_token_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/swarm/leave.go b/cli/command/swarm/leave.go index 586e59aa9420..fa44a1565159 100644 --- a/cli/command/swarm/leave.go +++ b/cli/command/swarm/leave.go @@ -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/spf13/cobra" ) diff --git a/cli/command/swarm/leave_test.go b/cli/command/swarm/leave_test.go index e1005828d067..bbad29ef6046 100644 --- a/cli/command/swarm/leave_test.go +++ b/cli/command/swarm/leave_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/swarm/opts.go b/cli/command/swarm/opts.go index acbadf9d0e8f..18b2e30fc0f6 100644 --- a/cli/command/swarm/opts.go +++ b/cli/command/swarm/opts.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "github.com/spf13/pflag" diff --git a/cli/command/swarm/unlock.go b/cli/command/swarm/unlock.go index 12db5d884bbd..ad091e7bc287 100644 --- a/cli/command/swarm/unlock.go +++ b/cli/command/swarm/unlock.go @@ -7,10 +7,10 @@ import ( "io" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/streams" + "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/streams" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/unlock_key.go b/cli/command/swarm/unlock_key.go index b3e051a18aed..57f360373ebf 100644 --- a/cli/command/swarm/unlock_key.go +++ b/cli/command/swarm/unlock_key.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/unlock_key_test.go b/cli/command/swarm/unlock_key_test.go index 24ca164aa6cb..74356a2176e9 100644 --- a/cli/command/swarm/unlock_key_test.go +++ b/cli/command/swarm/unlock_key_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/swarm/unlock_test.go b/cli/command/swarm/unlock_test.go index c7e463a32a42..a560dacf13c2 100644 --- a/cli/command/swarm/unlock_test.go +++ b/cli/command/swarm/unlock_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/streams" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/streams" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/swarm/update.go b/cli/command/swarm/update.go index dc72fc744eb7..21adb239388e 100644 --- a/cli/command/swarm/update.go +++ b/cli/command/swarm/update.go @@ -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/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/swarm/update_test.go b/cli/command/swarm/update_test.go index 14605c033a6c..6401941594a5 100644 --- a/cli/command/swarm/update_test.go +++ b/cli/command/swarm/update_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" diff --git a/cli/command/system/cmd.go b/cli/command/system/cmd.go index 6accb98f0c4e..58d9464f8021 100644 --- a/cli/command/system/cmd.go +++ b/cli/command/system/cmd.go @@ -1,8 +1,8 @@ package system 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" ) diff --git a/cli/command/system/df.go b/cli/command/system/df.go index 150e0d0e0bd4..c3e2131faf88 100644 --- a/cli/command/system/df.go +++ b/cli/command/system/df.go @@ -3,11 +3,11 @@ package system 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" - flagsHelper "github.com/docker/cli/cli/flags" + "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" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/api/types" "github.com/spf13/cobra" ) diff --git a/cli/command/system/dial_stdio.go b/cli/command/system/dial_stdio.go index 6bfef787a67e..b8eed320f3c1 100644 --- a/cli/command/system/dial_stdio.go +++ b/cli/command/system/dial_stdio.go @@ -5,9 +5,9 @@ import ( "io" "os" - "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/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cli/command/system/events.go b/cli/command/system/events.go index ddac0fa0a076..31e5055e67b2 100644 --- a/cli/command/system/events.go +++ b/cli/command/system/events.go @@ -9,11 +9,11 @@ import ( "text/template" "time" - "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/templates" + "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/cli/v24/templates" "github.com/docker/docker/api/types" eventtypes "github.com/docker/docker/api/types/events" "github.com/spf13/cobra" diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 4bd3e0356540..66dccb62fee3 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -8,12 +8,12 @@ import ( "sort" "strings" - "github.com/docker/cli/cli" - pluginmanager "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/debug" - "github.com/docker/cli/templates" + "github.com/docker/cli/v24/cli" + pluginmanager "github.com/docker/cli/v24/cli-plugins/manager" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" + "github.com/docker/cli/v24/cli/debug" + "github.com/docker/cli/v24/templates" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" diff --git a/cli/command/system/info_test.go b/cli/command/system/info_test.go index 199c93721da8..9dd7ee91e41b 100644 --- a/cli/command/system/info_test.go +++ b/cli/command/system/info_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - pluginmanager "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/internal/test" + pluginmanager "github.com/docker/cli/v24/cli-plugins/manager" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index bccc7dde44a5..12d6f7ad4952 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/docker/docker/api/types" apiclient "github.com/docker/docker/client" "github.com/pkg/errors" diff --git a/cli/command/system/prune.go b/cli/command/system/prune.go index 51773cce3a38..1c17c9f0b5a5 100644 --- a/cli/command/system/prune.go +++ b/cli/command/system/prune.go @@ -6,15 +6,15 @@ import ( "sort" "text/template" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/builder" - "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/command/container" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/command/network" - "github.com/docker/cli/cli/command/volume" - "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/builder" + "github.com/docker/cli/v24/cli/command/completion" + "github.com/docker/cli/v24/cli/command/container" + "github.com/docker/cli/v24/cli/command/image" + "github.com/docker/cli/v24/cli/command/network" + "github.com/docker/cli/v24/cli/command/volume" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/versions" "github.com/docker/go-units" "github.com/fvbommel/sortorder" diff --git a/cli/command/system/prune_test.go b/cli/command/system/prune_test.go index 65ceacbee538..aa78e425ca93 100644 --- a/cli/command/system/prune_test.go +++ b/cli/command/system/prune_test.go @@ -3,8 +3,8 @@ package system import ( "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/system/version.go b/cli/command/system/version.go index 3ead03215c19..07ad3c1ab446 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.go @@ -8,12 +8,12 @@ import ( "text/template" "time" - "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/tabwriter" - "github.com/docker/cli/cli/version" - "github.com/docker/cli/templates" + "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/tabwriter" + "github.com/docker/cli/v24/cli/version" + "github.com/docker/cli/v24/templates" "github.com/docker/docker/api/types" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/system/version_test.go b/cli/command/system/version_test.go index 3ddf643290b2..b1dcb8380bc8 100644 --- a/cli/command/system/version_test.go +++ b/cli/command/system/version_test.go @@ -10,7 +10,7 @@ import ( is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" ) diff --git a/cli/command/task/formatter.go b/cli/command/task/formatter.go index a7d71115ac0b..17ec6378b2d7 100644 --- a/cli/command/task/formatter.go +++ b/cli/command/task/formatter.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "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/distribution/reference" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/pkg/stringid" diff --git a/cli/command/task/formatter_test.go b/cli/command/task/formatter_test.go index 4a7ed7fb2f9f..4a6d74a749e6 100644 --- a/cli/command/task/formatter_test.go +++ b/cli/command/task/formatter_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "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" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/task/print.go b/cli/command/task/print.go index da9645b72cf4..0c0336b2ce4e 100644 --- a/cli/command/task/print.go +++ b/cli/command/task/print.go @@ -5,10 +5,10 @@ import ( "fmt" "sort" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/idresolver" + "github.com/docker/cli/v24/cli/config/configfile" "github.com/docker/docker/api/types/swarm" "github.com/fvbommel/sortorder" ) diff --git a/cli/command/task/print_test.go b/cli/command/task/print_test.go index d3452dbf4c82..9fb3883775d0 100644 --- a/cli/command/task/print_test.go +++ b/cli/command/task/print_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/docker/cli/cli/command/formatter" - "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/idresolver" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "gotest.tools/v3/assert" diff --git a/cli/command/trust/cmd.go b/cli/command/trust/cmd.go index bb6ceace042b..e5e02fd3cd91 100644 --- a/cli/command/trust/cmd.go +++ b/cli/command/trust/cmd.go @@ -1,8 +1,8 @@ package trust 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" ) diff --git a/cli/command/trust/common.go b/cli/command/trust/common.go index a62852297bc2..c284603b5644 100644 --- a/cli/command/trust/common.go +++ b/cli/command/trust/common.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/image" + "github.com/docker/cli/v24/cli/trust" "github.com/fvbommel/sortorder" "github.com/sirupsen/logrus" "github.com/theupdateframework/notary" diff --git a/cli/command/trust/common_test.go b/cli/command/trust/common_test.go index 11a0bc86c31b..1961a7edaef1 100644 --- a/cli/command/trust/common_test.go +++ b/cli/command/trust/common_test.go @@ -3,7 +3,7 @@ package trust import ( "testing" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/trust" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" "gotest.tools/v3/assert" diff --git a/cli/command/trust/formatter.go b/cli/command/trust/formatter.go index 5cf9e9d3357f..ecdf589ecf7f 100644 --- a/cli/command/trust/formatter.go +++ b/cli/command/trust/formatter.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/v24/cli/command/formatter" "github.com/docker/docker/pkg/stringid" ) diff --git a/cli/command/trust/formatter_test.go b/cli/command/trust/formatter_test.go index 2b3af092ca6d..d1134d41e0cc 100644 --- a/cli/command/trust/formatter_test.go +++ b/cli/command/trust/formatter_test.go @@ -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/pkg/stringid" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/trust/helpers.go b/cli/command/trust/helpers.go index 3d2ba4acc3e5..6d121ef6d1c5 100644 --- a/cli/command/trust/helpers.go +++ b/cli/command/trust/helpers.go @@ -3,7 +3,7 @@ package trust import ( "strings" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/trust" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" ) diff --git a/cli/command/trust/inspect.go b/cli/command/trust/inspect.go index d7370bd09dcb..5e7907f9c5ba 100644 --- a/cli/command/trust/inspect.go +++ b/cli/command/trust/inspect.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/inspect" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/inspect" "github.com/spf13/cobra" "github.com/theupdateframework/notary/tuf/data" ) diff --git a/cli/command/trust/inspect_pretty.go b/cli/command/trust/inspect_pretty.go index 0407549b44c7..135ace2144cb 100644 --- a/cli/command/trust/inspect_pretty.go +++ b/cli/command/trust/inspect_pretty.go @@ -5,8 +5,8 @@ import ( "io" "sort" - "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/fvbommel/sortorder" "github.com/theupdateframework/notary/client" ) diff --git a/cli/command/trust/inspect_pretty_test.go b/cli/command/trust/inspect_pretty_test.go index 2ccfd927d882..fe9563e5549e 100644 --- a/cli/command/trust/inspect_pretty_test.go +++ b/cli/command/trust/inspect_pretty_test.go @@ -7,9 +7,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/trust" - "github.com/docker/cli/internal/test" - notaryfake "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli/trust" + "github.com/docker/cli/v24/internal/test" + notaryfake "github.com/docker/cli/v24/internal/test/notary" "github.com/docker/docker/api/types" apiclient "github.com/docker/docker/client" "github.com/theupdateframework/notary" diff --git a/cli/command/trust/inspect_test.go b/cli/command/trust/inspect_test.go index 692c5a6737df..0eafdf89d97f 100644 --- a/cli/command/trust/inspect_test.go +++ b/cli/command/trust/inspect_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/trust" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli/trust" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/theupdateframework/notary/client" "gotest.tools/v3/assert" "gotest.tools/v3/golden" diff --git a/cli/command/trust/key.go b/cli/command/trust/key.go index f57b44c771bb..624abd78841c 100644 --- a/cli/command/trust/key.go +++ b/cli/command/trust/key.go @@ -1,8 +1,8 @@ package trust 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" ) diff --git a/cli/command/trust/key_generate.go b/cli/command/trust/key_generate.go index 39eb0cb1b998..43809cf0c325 100644 --- a/cli/command/trust/key_generate.go +++ b/cli/command/trust/key_generate.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/trust" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/theupdateframework/notary" diff --git a/cli/command/trust/key_generate_test.go b/cli/command/trust/key_generate_test.go index 4645c9ae3334..89d690ad88fe 100644 --- a/cli/command/trust/key_generate_test.go +++ b/cli/command/trust/key_generate_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/internal/test" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustmanager" diff --git a/cli/command/trust/key_load.go b/cli/command/trust/key_load.go index bbb19e733e39..0f2b9b62b2b5 100644 --- a/cli/command/trust/key_load.go +++ b/cli/command/trust/key_load.go @@ -8,9 +8,9 @@ import ( "os" "runtime" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/trust" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/theupdateframework/notary" diff --git a/cli/command/trust/key_load_test.go b/cli/command/trust/key_load_test.go index fd791a9bb6a8..02e87f253836 100644 --- a/cli/command/trust/key_load_test.go +++ b/cli/command/trust/key_load_test.go @@ -9,8 +9,8 @@ import ( "runtime" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/internal/test" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/storage" diff --git a/cli/command/trust/revoke.go b/cli/command/trust/revoke.go index df2a22aa4dbd..b8028aa496d7 100644 --- a/cli/command/trust/revoke.go +++ b/cli/command/trust/revoke.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/image" + "github.com/docker/cli/v24/cli/trust" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/theupdateframework/notary/client" diff --git a/cli/command/trust/revoke_test.go b/cli/command/trust/revoke_test.go index ca20189adb45..e51e56bd223d 100644 --- a/cli/command/trust/revoke_test.go +++ b/cli/command/trust/revoke_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/trust" - "github.com/docker/cli/internal/test" - "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli/trust" + "github.com/docker/cli/v24/internal/test" + "github.com/docker/cli/v24/internal/test/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning" diff --git a/cli/command/trust/sign.go b/cli/command/trust/sign.go index e5d7f6b7cda4..866c6abb5f21 100644 --- a/cli/command/trust/sign.go +++ b/cli/command/trust/sign.go @@ -8,10 +8,10 @@ import ( "sort" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/image" + "github.com/docker/cli/v24/cli/trust" "github.com/docker/docker/api/types" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/trust/sign_test.go b/cli/command/trust/sign_test.go index 83863de95396..953f6b5945aa 100644 --- a/cli/command/trust/sign_test.go +++ b/cli/command/trust/sign_test.go @@ -7,10 +7,10 @@ import ( "runtime" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/cli/trust" - "github.com/docker/cli/internal/test" - notaryfake "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/cli/trust" + "github.com/docker/cli/v24/internal/test" + notaryfake "github.com/docker/cli/v24/internal/test/notary" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/client/changelist" diff --git a/cli/command/trust/signer.go b/cli/command/trust/signer.go index 807ad6c955dd..2cf3e558cf45 100644 --- a/cli/command/trust/signer.go +++ b/cli/command/trust/signer.go @@ -1,8 +1,8 @@ package trust 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" ) diff --git a/cli/command/trust/signer_add.go b/cli/command/trust/signer_add.go index ec4b61a4a234..4eadaf865854 100644 --- a/cli/command/trust/signer_add.go +++ b/cli/command/trust/signer_add.go @@ -9,11 +9,11 @@ import ( "regexp" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/trust" - "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/image" + "github.com/docker/cli/v24/cli/trust" + "github.com/docker/cli/v24/opts" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/theupdateframework/notary/client" diff --git a/cli/command/trust/signer_add_test.go b/cli/command/trust/signer_add_test.go index 5452ecb5a930..523783d10f60 100644 --- a/cli/command/trust/signer_add_test.go +++ b/cli/command/trust/signer_add_test.go @@ -8,9 +8,9 @@ import ( "runtime" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/internal/test" - notaryfake "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/internal/test" + notaryfake "github.com/docker/cli/v24/internal/test/notary" "github.com/theupdateframework/notary" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/command/trust/signer_remove.go b/cli/command/trust/signer_remove.go index 300a8c23c386..5d26bde38704 100644 --- a/cli/command/trust/signer_remove.go +++ b/cli/command/trust/signer_remove.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/image" + "github.com/docker/cli/v24/cli/trust" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/theupdateframework/notary/client" diff --git a/cli/command/trust/signer_remove_test.go b/cli/command/trust/signer_remove_test.go index 204c115c21c3..fe5edccf14a5 100644 --- a/cli/command/trust/signer_remove_test.go +++ b/cli/command/trust/signer_remove_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - notaryfake "github.com/docker/cli/internal/test/notary" + "github.com/docker/cli/v24/internal/test" + notaryfake "github.com/docker/cli/v24/internal/test/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" "gotest.tools/v3/assert" diff --git a/cli/command/utils.go b/cli/command/utils.go index 753f428aa089..2efb987a8469 100644 --- a/cli/command/utils.go +++ b/cli/command/utils.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/docker/cli/cli/streams" + "github.com/docker/cli/v24/cli/streams" "github.com/docker/docker/api/types/filters" "github.com/moby/sys/sequential" "github.com/pkg/errors" diff --git a/cli/command/volume/cmd.go b/cli/command/volume/cmd.go index 386352791e2f..0decae9d2a6c 100644 --- a/cli/command/volume/cmd.go +++ b/cli/command/volume/cmd.go @@ -1,8 +1,8 @@ package volume 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" ) diff --git a/cli/command/volume/create.go b/cli/command/volume/create.go index 1884949c6960..11ea4acf3241 100644 --- a/cli/command/volume/create.go +++ b/cli/command/volume/create.go @@ -6,10 +6,10 @@ import ( "sort" "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/volume" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/volume/create_test.go b/cli/command/volume/create_test.go index a37f9655b1d0..02b516f4f7b9 100644 --- a/cli/command/volume/create_test.go +++ b/cli/command/volume/create_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types/volume" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go index 4bf35b26b84f..e79607fbcc95 100644 --- a/cli/command/volume/inspect.go +++ b/cli/command/volume/inspect.go @@ -3,11 +3,11 @@ package volume 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/inspect" - flagsHelper "github.com/docker/cli/cli/flags" + "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/inspect" + flagsHelper "github.com/docker/cli/v24/cli/flags" "github.com/spf13/cobra" ) diff --git a/cli/command/volume/inspect_test.go b/cli/command/volume/inspect_test.go index 62c9c00aa83c..9db4ece3968a 100644 --- a/cli/command/volume/inspect_test.go +++ b/cli/command/volume/inspect_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/volume" "github.com/pkg/errors" diff --git a/cli/command/volume/list.go b/cli/command/volume/list.go index fa1c1ceb978a..24e57db97282 100644 --- a/cli/command/volume/list.go +++ b/cli/command/volume/list.go @@ -4,12 +4,12 @@ import ( "context" "sort" - "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" - flagsHelper "github.com/docker/cli/cli/flags" - "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/cli/command/formatter" + flagsHelper "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/volume" "github.com/fvbommel/sortorder" "github.com/spf13/cobra" diff --git a/cli/command/volume/list_test.go b/cli/command/volume/list_test.go index 45bbc955e471..fe26cda24460 100644 --- a/cli/command/volume/list_test.go +++ b/cli/command/volume/list_test.go @@ -4,9 +4,9 @@ import ( "io" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/internal/test" - . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/internal/test" + . "github.com/docker/cli/v24/internal/test/builders" // Import builders to get the builder function as package function "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" "github.com/pkg/errors" diff --git a/cli/command/volume/prune.go b/cli/command/volume/prune.go index d2d249cdb3b8..49debd95e1c7 100644 --- a/cli/command/volume/prune.go +++ b/cli/command/volume/prune.go @@ -4,10 +4,10 @@ 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/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" units "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cli/command/volume/prune_test.go b/cli/command/volume/prune_test.go index bf7043961eeb..4131846a7751 100644 --- a/cli/command/volume/prune_test.go +++ b/cli/command/volume/prune_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/streams" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/cli/streams" + "github.com/docker/cli/v24/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/pkg/errors" diff --git a/cli/command/volume/remove.go b/cli/command/volume/remove.go index a2abb5947c53..c99d497c84cd 100644 --- a/cli/command/volume/remove.go +++ b/cli/command/volume/remove.go @@ -5,9 +5,9 @@ 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/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/completion" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/volume/remove_test.go b/cli/command/volume/remove_test.go index 61ac03578bca..2f87d36dfaee 100644 --- a/cli/command/volume/remove_test.go +++ b/cli/command/volume/remove_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/docker/cli/internal/test" + "github.com/docker/cli/v24/internal/test" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/cli/command/volume/update.go b/cli/command/volume/update.go index 26e0e4ba2f01..68b5d98557a4 100644 --- a/cli/command/volume/update.go +++ b/cli/command/volume/update.go @@ -3,9 +3,9 @@ package volume import ( "context" - "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/volume" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/compose/convert/compose.go b/cli/compose/convert/compose.go index 98cd92989b8f..c4cc43bcfb75 100644 --- a/cli/compose/convert/compose.go +++ b/cli/compose/convert/compose.go @@ -4,7 +4,7 @@ import ( "os" "strings" - composetypes "github.com/docker/cli/cli/compose/types" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types" networktypes "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/swarm" diff --git a/cli/compose/convert/compose_test.go b/cli/compose/convert/compose_test.go index 0dfac14e156b..80835c918080 100644 --- a/cli/compose/convert/compose_test.go +++ b/cli/compose/convert/compose_test.go @@ -3,7 +3,7 @@ package convert import ( "testing" - composetypes "github.com/docker/cli/cli/compose/types" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" "gotest.tools/v3/assert" diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go index 7e0b8cfc9975..7dc64a50fa82 100644 --- a/cli/compose/convert/service.go +++ b/cli/compose/convert/service.go @@ -7,9 +7,9 @@ import ( "strings" "time" - servicecli "github.com/docker/cli/cli/command/service" - composetypes "github.com/docker/cli/cli/compose/types" - "github.com/docker/cli/opts" + servicecli "github.com/docker/cli/v24/cli/command/service" + composetypes "github.com/docker/cli/v24/cli/compose/types" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go index 7a23548e9e30..8c4e07b28696 100644 --- a/cli/compose/convert/service_test.go +++ b/cli/compose/convert/service_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - composetypes "github.com/docker/cli/cli/compose/types" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go index 257ddcd98d9d..4bbcf7f03b5e 100644 --- a/cli/compose/convert/volume.go +++ b/cli/compose/convert/volume.go @@ -3,7 +3,7 @@ package convert import ( "strings" - composetypes "github.com/docker/cli/cli/compose/types" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types/mount" "github.com/pkg/errors" ) diff --git a/cli/compose/convert/volume_test.go b/cli/compose/convert/volume_test.go index 6ab2056a3bc3..873ced51b7cb 100644 --- a/cli/compose/convert/volume_test.go +++ b/cli/compose/convert/volume_test.go @@ -3,7 +3,7 @@ package convert import ( "testing" - composetypes "github.com/docker/cli/cli/compose/types" + composetypes "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types/mount" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go index e84756dba68a..1c88f8c3d25f 100644 --- a/cli/compose/interpolation/interpolation.go +++ b/cli/compose/interpolation/interpolation.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/docker/cli/cli/compose/template" + "github.com/docker/cli/v24/cli/compose/template" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go index 17536816df89..423cb923b1de 100644 --- a/cli/compose/loader/full-struct_test.go +++ b/cli/compose/loader/full-struct_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" ) func fullExampleConfig(workingDir, homeDir string) *types.Config { diff --git a/cli/compose/loader/interpolate.go b/cli/compose/loader/interpolate.go index d25936be869d..ab78d4fb489d 100644 --- a/cli/compose/loader/interpolate.go +++ b/cli/compose/loader/interpolate.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - interp "github.com/docker/cli/cli/compose/interpolation" + interp "github.com/docker/cli/v24/cli/compose/interpolation" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go index a9b8f1f1f9cf..7c6e5ca5a47f 100644 --- a/cli/compose/loader/loader.go +++ b/cli/compose/loader/loader.go @@ -9,11 +9,11 @@ import ( "strings" "time" - interp "github.com/docker/cli/cli/compose/interpolation" - "github.com/docker/cli/cli/compose/schema" - "github.com/docker/cli/cli/compose/template" - "github.com/docker/cli/cli/compose/types" - "github.com/docker/cli/opts" + interp "github.com/docker/cli/v24/cli/compose/interpolation" + "github.com/docker/cli/v24/cli/compose/schema" + "github.com/docker/cli/v24/cli/compose/template" + "github.com/docker/cli/v24/cli/compose/types" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/api/types/versions" "github.com/docker/go-connections/nat" units "github.com/docker/go-units" diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index 1acd16bc2ef2..78b1b154e2c5 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" "github.com/google/go-cmp/cmp/cmpopts" "github.com/sirupsen/logrus" "gotest.tools/v3/assert" diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go index 57bc2296b7c7..fdc799cc0319 100644 --- a/cli/compose/loader/merge.go +++ b/cli/compose/loader/merge.go @@ -4,7 +4,7 @@ import ( "reflect" "sort" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" "github.com/imdario/mergo" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go index e5aa3eab1387..628f8593703c 100644 --- a/cli/compose/loader/merge_test.go +++ b/cli/compose/loader/merge_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" "github.com/imdario/mergo" "gotest.tools/v3/assert" ) diff --git a/cli/compose/loader/volume.go b/cli/compose/loader/volume.go index f043f4aa57ff..87966132019d 100644 --- a/cli/compose/loader/volume.go +++ b/cli/compose/loader/volume.go @@ -5,7 +5,7 @@ import ( "unicode" "unicode/utf8" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" "github.com/docker/docker/api/types/mount" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/volume_test.go b/cli/compose/loader/volume_test.go index b42be1fc5209..bca7bb7f8293 100644 --- a/cli/compose/loader/volume_test.go +++ b/cli/compose/loader/volume_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/v24/cli/compose/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/config/config.go b/cli/config/config.go index b7c05c3f860f..2401dc7a81c2 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -8,9 +8,9 @@ import ( "strings" "sync" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/cli/config/credentials" + "github.com/docker/cli/v24/cli/config/types" "github.com/docker/docker/pkg/homedir" "github.com/pkg/errors" ) diff --git a/cli/config/config_test.go b/cli/config/config_test.go index c98017bd593e..1bf0ff4350e5 100644 --- a/cli/config/config_test.go +++ b/cli/config/config_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/cli/config/credentials" + "github.com/docker/cli/v24/cli/config/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/env" diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go index 609a88c27885..60ecb91bd73c 100644 --- a/cli/config/configfile/file.go +++ b/cli/config/configfile/file.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/credentials" + "github.com/docker/cli/v24/cli/config/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/cli/config/configfile/file_test.go b/cli/config/configfile/file_test.go index 74a0317d5efb..ab2344c27f16 100644 --- a/cli/config/configfile/file_test.go +++ b/cli/config/configfile/file_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/credentials" + "github.com/docker/cli/v24/cli/config/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/cli/config/credentials/credentials.go b/cli/config/credentials/credentials.go index 28d58ec48d7d..53692d6b3ee5 100644 --- a/cli/config/credentials/credentials.go +++ b/cli/config/credentials/credentials.go @@ -1,7 +1,7 @@ package credentials import ( - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/types" ) // Store is the interface that any credentials store must implement. diff --git a/cli/config/credentials/file_store.go b/cli/config/credentials/file_store.go index de1c676e50ea..05992717fad3 100644 --- a/cli/config/credentials/file_store.go +++ b/cli/config/credentials/file_store.go @@ -3,7 +3,7 @@ package credentials import ( "strings" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/types" ) type store interface { diff --git a/cli/config/credentials/file_store_test.go b/cli/config/credentials/file_store_test.go index f04fe22e1ca0..7433d196e9dc 100644 --- a/cli/config/credentials/file_store_test.go +++ b/cli/config/credentials/file_store_test.go @@ -3,7 +3,7 @@ package credentials import ( "testing" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/config/credentials/native_store.go b/cli/config/credentials/native_store.go index f9619b0381c8..73b9b4d3e29d 100644 --- a/cli/config/credentials/native_store.go +++ b/cli/config/credentials/native_store.go @@ -1,7 +1,7 @@ package credentials import ( - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/types" "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" ) diff --git a/cli/config/credentials/native_store_test.go b/cli/config/credentials/native_store_test.go index 2c6f230f681d..af3dd9ae249c 100644 --- a/cli/config/credentials/native_store_test.go +++ b/cli/config/credentials/native_store_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/types" "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "github.com/pkg/errors" diff --git a/cli/connhelper/connhelper.go b/cli/connhelper/connhelper.go index 9ac9d6744d45..e2803929fcc7 100644 --- a/cli/connhelper/connhelper.go +++ b/cli/connhelper/connhelper.go @@ -6,8 +6,8 @@ import ( "net" "net/url" - "github.com/docker/cli/cli/connhelper/commandconn" - "github.com/docker/cli/cli/connhelper/ssh" + "github.com/docker/cli/v24/cli/connhelper/commandconn" + "github.com/docker/cli/v24/cli/connhelper/ssh" "github.com/pkg/errors" ) diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go index 09ec40505ae1..1b10f025d058 100644 --- a/cli/context/docker/load.go +++ b/cli/context/docker/load.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/docker/cli/cli/connhelper" - "github.com/docker/cli/cli/context" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/connhelper" + "github.com/docker/cli/v24/cli/context" + "github.com/docker/cli/v24/cli/context/store" "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" "github.com/pkg/errors" diff --git a/cli/context/tlsdata.go b/cli/context/tlsdata.go index c758612a1dc0..0ac6a507bef6 100644 --- a/cli/context/tlsdata.go +++ b/cli/context/tlsdata.go @@ -3,7 +3,7 @@ package context import ( "os" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/context/store" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/cli/flags/options.go b/cli/flags/options.go index cea0faf770b8..97a44fbab712 100644 --- a/cli/flags/options.go +++ b/cli/flags/options.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/opts" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/opts" "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" "github.com/sirupsen/logrus" diff --git a/cli/flags/options_test.go b/cli/flags/options_test.go index 1fef741757be..91a938c080ab 100644 --- a/cli/flags/options_test.go +++ b/cli/flags/options_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/config" + "github.com/docker/cli/v24/cli/config" "github.com/spf13/pflag" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cli/manifest/store/store.go b/cli/manifest/store/store.go index 39e576f6b2db..cdbda5638d50 100644 --- a/cli/manifest/store/store.go +++ b/cli/manifest/store/store.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/docker/cli/cli/manifest/types" + "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/reference" "github.com/opencontainers/go-digest" diff --git a/cli/manifest/store/store_test.go b/cli/manifest/store/store_test.go index cea0005f2f17..b84013f0be8a 100644 --- a/cli/manifest/store/store_test.go +++ b/cli/manifest/store/store_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/docker/cli/cli/manifest/types" + "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution/reference" "github.com/google/go-cmp/cmp" "gotest.tools/v3/assert" diff --git a/cli/registry/client/client.go b/cli/registry/client/client.go index 86fc775684ca..7218d8c4a75e 100644 --- a/cli/registry/client/client.go +++ b/cli/registry/client/client.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - manifesttypes "github.com/docker/cli/cli/manifest/types" + manifesttypes "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution" "github.com/docker/distribution/reference" distributionclient "github.com/docker/distribution/registry/client" diff --git a/cli/registry/client/fetcher.go b/cli/registry/client/fetcher.go index acae274a4431..0124398c54da 100644 --- a/cli/registry/client/fetcher.go +++ b/cli/registry/client/fetcher.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/docker/cli/cli/manifest/types" + "github.com/docker/cli/v24/cli/manifest/types" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/ocischema" diff --git a/cli/trust/trust.go b/cli/trust/trust.go index 5a862e7f0bfd..ea588de6c438 100644 --- a/cli/trust/trust.go +++ b/cli/trust/trust.go @@ -12,7 +12,7 @@ import ( "path/filepath" "time" - "github.com/docker/cli/cli/config" + "github.com/docker/cli/v24/cli/config" "github.com/docker/distribution/reference" "github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth/challenge" diff --git a/cmd/docker/aliases.go b/cmd/docker/aliases.go index 0a288843d0b9..3f2234d5878d 100644 --- a/cmd/docker/aliases.go +++ b/cmd/docker/aliases.go @@ -4,8 +4,8 @@ import ( "os" "strings" - pluginmanager "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/command" + pluginmanager "github.com/docker/cli/v24/cli-plugins/manager" + "github.com/docker/cli/v24/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/docker/builder.go b/cmd/docker/builder.go index 71fe979b382c..dd645ccc8883 100644 --- a/cmd/docker/builder.go +++ b/cmd/docker/builder.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - pluginmanager "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/command" + pluginmanager "github.com/docker/cli/v24/cli-plugins/manager" + "github.com/docker/cli/v24/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/docker/builder_test.go b/cmd/docker/builder_test.go index 0ef79a65dde6..c848dbde2cfb 100644 --- a/cmd/docker/builder_test.go +++ b/cmd/docker/builder_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" - "github.com/docker/cli/cli/flags" - "github.com/docker/cli/internal/test/output" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/store" + "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/internal/test/output" "github.com/docker/docker/api/types" "github.com/docker/docker/client" "gotest.tools/v3/assert" diff --git a/cmd/docker/completions.go b/cmd/docker/completions.go index 15e078f8def2..34b940ba6511 100644 --- a/cmd/docker/completions.go +++ b/cmd/docker/completions.go @@ -1,8 +1,8 @@ package main import ( - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/context/store" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/context/store" "github.com/spf13/cobra" ) diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index d18125a634e8..baad7311852f 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -7,12 +7,12 @@ import ( "strings" "syscall" - "github.com/docker/cli/cli" - pluginmanager "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/commands" - cliflags "github.com/docker/cli/cli/flags" - "github.com/docker/cli/cli/version" + "github.com/docker/cli/v24/cli" + pluginmanager "github.com/docker/cli/v24/cli-plugins/manager" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/commands" + cliflags "github.com/docker/cli/v24/cli/flags" + "github.com/docker/cli/v24/cli/version" "github.com/docker/docker/api/types/versions" "github.com/moby/buildkit/util/appcontext" "github.com/pkg/errors" diff --git a/cmd/docker/docker_test.go b/cmd/docker/docker_test.go index 084626252ed2..4f90426c45c0 100644 --- a/cmd/docker/docker_test.go +++ b/cmd/docker/docker_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/debug" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/debug" "github.com/sirupsen/logrus" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/cmd/docker/docker_windows_386.go b/cmd/docker/docker_windows_386.go index 76a948aa2eef..c3bc4bce4219 100644 --- a/cmd/docker/docker_windows_386.go +++ b/cmd/docker/docker_windows_386.go @@ -5,4 +5,4 @@ package main -import _ "github.com/docker/cli/cli/winresources" +import _ "github.com/docker/cli/v24/cli/winresources" diff --git a/cmd/docker/docker_windows_amd64.go b/cmd/docker/docker_windows_amd64.go index 514abc56f9d5..86b0e9e5a8b3 100644 --- a/cmd/docker/docker_windows_amd64.go +++ b/cmd/docker/docker_windows_amd64.go @@ -5,4 +5,4 @@ package main -import _ "github.com/docker/cli/cli/winresources" +import _ "github.com/docker/cli/v24/cli/winresources" diff --git a/cmd/docker/docker_windows_arm.go b/cmd/docker/docker_windows_arm.go index 378fe8361634..2f5798cba73d 100644 --- a/cmd/docker/docker_windows_arm.go +++ b/cmd/docker/docker_windows_arm.go @@ -5,4 +5,4 @@ package main -import _ "github.com/docker/cli/cli/winresources" +import _ "github.com/docker/cli/v24/cli/winresources" diff --git a/cmd/docker/docker_windows_arm64.go b/cmd/docker/docker_windows_arm64.go index a4dba5a8f921..0626b9c135f6 100644 --- a/cmd/docker/docker_windows_arm64.go +++ b/cmd/docker/docker_windows_arm64.go @@ -5,4 +5,4 @@ package main -import _ "github.com/docker/cli/cli/winresources" +import _ "github.com/docker/cli/v24/cli/winresources" diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor index 968c6f70d71b..e93fe30df654 100644 --- a/dockerfiles/Dockerfile.vendor +++ b/dockerfiles/Dockerfile.vendor @@ -17,7 +17,7 @@ set -e rsync -a /context/. . ./scripts/vendor update mkdir /out -cp -r vendor.mod vendor.sum vendor /out +cp -r go.mod go.sum vendor /out EOT FROM scratch AS update diff --git a/docs/generate/generate.go b/docs/generate/generate.go index c9187c2c0d7a..bf265c46ae72 100644 --- a/docs/generate/generate.go +++ b/docs/generate/generate.go @@ -10,9 +10,9 @@ import ( "os" clidocstool "github.com/docker/cli-docs-tool" - "github.com/docker/cli/cli" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/commands" + "github.com/docker/cli/v24/cli" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/commands" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/e2e/cli-plugins/config_test.go b/e2e/cli-plugins/config_test.go index a9d55e3d8716..a39cea02ca9a 100644 --- a/e2e/cli-plugins/config_test.go +++ b/e2e/cli-plugins/config_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli/config" + "github.com/docker/cli/v24/cli/config" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/e2e/cli-plugins/dial_test.go b/e2e/cli-plugins/dial_test.go index 0be5ec3d4c95..fc6a10155365 100644 --- a/e2e/cli-plugins/dial_test.go +++ b/e2e/cli-plugins/dial_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/cli-plugins/manager" + "github.com/docker/cli/v24/cli-plugins/manager" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/e2e/cli-plugins/main_test.go b/e2e/cli-plugins/main_test.go index 911a5c065e8c..0e65e87cf85a 100644 --- a/e2e/cli-plugins/main_test.go +++ b/e2e/cli-plugins/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/cli-plugins/plugins/badmeta/main.go b/e2e/cli-plugins/plugins/badmeta/main.go index 10bd0eff7263..4d5d645cf1be 100644 --- a/e2e/cli-plugins/plugins/badmeta/main.go +++ b/e2e/cli-plugins/plugins/badmeta/main.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/docker/cli/cli-plugins/manager" + "github.com/docker/cli/v24/cli-plugins/manager" ) func main() { diff --git a/e2e/cli-plugins/plugins/nopersistentprerun/main.go b/e2e/cli-plugins/plugins/nopersistentprerun/main.go index 375d26bc68b2..eab5f4a050c6 100644 --- a/e2e/cli-plugins/plugins/nopersistentprerun/main.go +++ b/e2e/cli-plugins/plugins/nopersistentprerun/main.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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" ) diff --git a/e2e/cli-plugins/util_test.go b/e2e/cli-plugins/util_test.go index c2a4406a4664..ec191b67587e 100644 --- a/e2e/cli-plugins/util_test.go +++ b/e2e/cli-plugins/util_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/docker/cli/cli/config" - "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/v24/cli/config" + "github.com/docker/cli/v24/cli/config/configfile" "gotest.tools/v3/assert" "gotest.tools/v3/fs" "gotest.tools/v3/icmd" diff --git a/e2e/container/attach_test.go b/e2e/container/attach_test.go index 68517b361312..b66a0abbacdc 100644 --- a/e2e/container/attach_test.go +++ b/e2e/container/attach_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/docker/cli/e2e/internal/fixtures" + "github.com/docker/cli/v24/e2e/internal/fixtures" "gotest.tools/v3/icmd" ) diff --git a/e2e/container/create_test.go b/e2e/container/create_test.go index 3c519df12e8f..d6dc5bf3ba8a 100644 --- a/e2e/container/create_test.go +++ b/e2e/container/create_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/icmd" "gotest.tools/v3/skip" ) diff --git a/e2e/container/kill_test.go b/e2e/container/kill_test.go index 2f3a35784fd5..75af7e9090ac 100644 --- a/e2e/container/kill_test.go +++ b/e2e/container/kill_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/docker/cli/e2e/internal/fixtures" + "github.com/docker/cli/v24/e2e/internal/fixtures" "gotest.tools/v3/icmd" "gotest.tools/v3/poll" ) diff --git a/e2e/container/main_test.go b/e2e/container/main_test.go index 4363c438884b..3752149bc524 100644 --- a/e2e/container/main_test.go +++ b/e2e/container/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/container/proxy_signal_test.go b/e2e/container/proxy_signal_test.go index acdd9a9e3849..8ba68aba532e 100644 --- a/e2e/container/proxy_signal_test.go +++ b/e2e/container/proxy_signal_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/creack/pty" - "github.com/docker/cli/e2e/internal/fixtures" + "github.com/docker/cli/v24/e2e/internal/fixtures" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" "gotest.tools/v3/poll" diff --git a/e2e/container/run_test.go b/e2e/container/run_test.go index dbc005c9f5b3..f75f8a656ffe 100644 --- a/e2e/container/run_test.go +++ b/e2e/container/run_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/e2e/context/main_test.go b/e2e/context/main_test.go index a3b1c530163d..631ff2d7ffcd 100644 --- a/e2e/context/main_test.go +++ b/e2e/context/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/global/cli_test.go b/e2e/global/cli_test.go index 863079b1c32c..5e7c9998c242 100644 --- a/e2e/global/cli_test.go +++ b/e2e/global/cli_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" "gotest.tools/v3/skip" diff --git a/e2e/global/main_test.go b/e2e/global/main_test.go index 626ae1b8dc33..908315a98897 100644 --- a/e2e/global/main_test.go +++ b/e2e/global/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/image/build_test.go b/e2e/image/build_test.go index ee2252be7866..8dbbfb1c2916 100644 --- a/e2e/image/build_test.go +++ b/e2e/image/build_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" - "github.com/docker/cli/internal/test/output" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" + "github.com/docker/cli/v24/internal/test/output" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/e2e/image/main_test.go b/e2e/image/main_test.go index 4638467a013c..aafb72075096 100644 --- a/e2e/image/main_test.go +++ b/e2e/image/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/image/pull_test.go b/e2e/image/pull_test.go index 0d12fe68fa57..4b36aab85a91 100644 --- a/e2e/image/pull_test.go +++ b/e2e/image/pull_test.go @@ -3,8 +3,8 @@ package image import ( "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/e2e/image/push_test.go b/e2e/image/push_test.go index 9695c99aa8cf..bf6ec45b84e5 100644 --- a/e2e/image/push_test.go +++ b/e2e/image/push_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" - "github.com/docker/cli/internal/test/output" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" + "github.com/docker/cli/v24/internal/test/output" "gotest.tools/v3/assert" "gotest.tools/v3/fs" "gotest.tools/v3/golden" diff --git a/e2e/plugin/main_test.go b/e2e/plugin/main_test.go index 8cb31a23e54c..df95ccbcc1af 100644 --- a/e2e/plugin/main_test.go +++ b/e2e/plugin/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/plugin/trust_test.go b/e2e/plugin/trust_test.go index b89bdfb99aea..c89c6d6432f5 100644 --- a/e2e/plugin/trust_test.go +++ b/e2e/plugin/trust_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "github.com/docker/docker/api/types" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/e2e/stack/main_test.go b/e2e/stack/main_test.go index 0d36e45bd466..ed2b2ca59a0b 100644 --- a/e2e/stack/main_test.go +++ b/e2e/stack/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/stack/remove_test.go b/e2e/stack/remove_test.go index 329c6ad25418..70ae3384871c 100644 --- a/e2e/stack/remove_test.go +++ b/e2e/stack/remove_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/golden" "gotest.tools/v3/icmd" "gotest.tools/v3/poll" diff --git a/e2e/system/main_test.go b/e2e/system/main_test.go index b154d1a19114..4fd6716227c0 100644 --- a/e2e/system/main_test.go +++ b/e2e/system/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/trust/main_test.go b/e2e/trust/main_test.go index 5881adcdac8a..ada38dcabf35 100644 --- a/e2e/trust/main_test.go +++ b/e2e/trust/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/internal/test/environment" ) func TestMain(m *testing.M) { diff --git a/e2e/trust/revoke_test.go b/e2e/trust/revoke_test.go index fe0f44de0424..6547637dd6a9 100644 --- a/e2e/trust/revoke_test.go +++ b/e2e/trust/revoke_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/e2e/trust/sign_test.go b/e2e/trust/sign_test.go index 9f953b4adb8c..17b3af77d53e 100644 --- a/e2e/trust/sign_test.go +++ b/e2e/trust/sign_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/docker/cli/e2e/internal/fixtures" - "github.com/docker/cli/internal/test/environment" + "github.com/docker/cli/v24/e2e/internal/fixtures" + "github.com/docker/cli/v24/internal/test/environment" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/vendor.mod b/go.mod similarity index 92% rename from vendor.mod rename to go.mod index 2e81c213ceb2..c28c8dd66be2 100644 --- a/vendor.mod +++ b/go.mod @@ -1,8 +1,4 @@ -module github.com/docker/cli - -// 'vendor.mod' enables use of 'go mod vendor' to managed 'vendor/' directory. -// There is no 'go.mod' file, as that would imply opting in for all the rules -// around SemVer, which this repo cannot abide by as it uses CalVer. +module github.com/docker/cli/v24 go 1.18 diff --git a/vendor.sum b/go.sum similarity index 100% rename from vendor.sum rename to go.sum diff --git a/internal/test/cli.go b/internal/test/cli.go index 11d674d85744..8fda7cc0c88e 100644 --- a/internal/test/cli.go +++ b/internal/test/cli.go @@ -6,14 +6,14 @@ import ( "io" "strings" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/config/configfile" - "github.com/docker/cli/cli/context/docker" - "github.com/docker/cli/cli/context/store" - 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/v24/cli/command" + "github.com/docker/cli/v24/cli/config/configfile" + "github.com/docker/cli/v24/cli/context/docker" + "github.com/docker/cli/v24/cli/context/store" + 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/docker/client" notaryclient "github.com/theupdateframework/notary/client" ) diff --git a/internal/test/doc.go b/internal/test/doc.go index 401f02facfec..d609eb361be1 100644 --- a/internal/test/doc.go +++ b/internal/test/doc.go @@ -1,4 +1,4 @@ // Package test is a test-only package that can be used by other cli package to write unit test. // -// It as an internal package and cannot be used outside of github.com/docker/cli package. +// It as an internal package and cannot be used outside of github.com/docker/cli/v24 package. package test diff --git a/internal/test/notary/client.go b/internal/test/notary/client.go index b6c6db0e58a0..d5eac95a4619 100644 --- a/internal/test/notary/client.go +++ b/internal/test/notary/client.go @@ -1,7 +1,7 @@ package notary import ( - "github.com/docker/cli/cli/trust" + "github.com/docker/cli/v24/cli/trust" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/client/changelist" "github.com/theupdateframework/notary/cryptoservice" diff --git a/internal/test/store.go b/internal/test/store.go index 802ea6a026a6..6c5adc6b5c1e 100644 --- a/internal/test/store.go +++ b/internal/test/store.go @@ -1,8 +1,8 @@ package test import ( - "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/config/types" + "github.com/docker/cli/v24/cli/config/credentials" + "github.com/docker/cli/v24/cli/config/types" ) // FakeStore implements a credentials.Store that only acts as an in memory map diff --git a/man/generate.go b/man/generate.go index 6a0d065db5bf..53d7e369c293 100644 --- a/man/generate.go +++ b/man/generate.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/command/commands" + "github.com/docker/cli/v24/cli/command" + "github.com/docker/cli/v24/cli/command/commands" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" "github.com/spf13/pflag" diff --git a/scripts/build/.variables b/scripts/build/.variables index e0147655b491..dcf07af648b8 100755 --- a/scripts/build/.variables +++ b/scripts/build/.variables @@ -72,11 +72,11 @@ fi export GO_BUILDMODE GO_LDFLAGS="${GO_LDFLAGS:-}" -GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}\"" -GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}\"" -GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/cli/version.Version=${VERSION}\"" +GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/v24/cli/version.GitCommit=${GITCOMMIT}\"" +GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/v24/cli/version.BuildTime=${BUILDTIME}\"" +GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/v24/cli/version.Version=${VERSION}\"" if test -n "${PLATFORM}"; then - GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/cli/version.PlatformName=${PLATFORM}\"" + GO_LDFLAGS="$GO_LDFLAGS -X \"github.com/docker/cli/v24/cli/version.PlatformName=${PLATFORM}\"" fi if [ "$CGO_ENABLED" = "1" ] && [ "$GO_LINKMODE" = "static" ] && [ "$(go env GOOS)" = "linux" ]; then GO_LDFLAGS="$GO_LDFLAGS -extldflags -static" @@ -96,4 +96,4 @@ if [ -n "$GO_STRIP" ]; then fi export GO_LDFLAGS="$GO_LDFLAGS" # https://github.com/koalaman/shellcheck/issues/2064 -export SOURCE="github.com/docker/cli/cmd/docker" +export SOURCE="github.com/docker/cli/v24/cmd/docker" diff --git a/scripts/build/plugins b/scripts/build/plugins index fa78b9536bd1..a245d1842311 100755 --- a/scripts/build/plugins +++ b/scripts/build/plugins @@ -15,5 +15,5 @@ for p in cli-plugins/examples/* "$@" ; do mkdir -p "$(dirname "${TARGET_PLUGIN}")" echo "Building $GO_LINKMODE $(basename "${TARGET_PLUGIN}")" - (set -x ; CGO_ENABLED=0 GO111MODULE=auto go build -o "${TARGET_PLUGIN}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "github.com/docker/cli/${p}") + (set -x ; CGO_ENABLED=0 GO111MODULE=auto go build -o "${TARGET_PLUGIN}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "github.com/docker/cli/v24/${p}") done diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh index 6afed3fa8708..7fd63ae4b4cb 100755 --- a/scripts/docs/generate-man.sh +++ b/scripts/docs/generate-man.sh @@ -17,18 +17,16 @@ trap clean EXIT set -x cp -r . "$buildir/" cd "$buildir" - # init dummy go.mod - ./scripts/vendor init # install go-md2man and copy man/tools.go in root folder # to be able to fetch the required dependencies - go mod edit -modfile=vendor.mod -require=github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION} + go mod edit -require=github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION} cp man/tools.go . # update vendor ./scripts/vendor update # build gen-manpages - go build -mod=vendor -modfile=vendor.mod -tags manpages -o /tmp/gen-manpages ./man/generate.go + go build -mod=vendor -tags manpages -o /tmp/gen-manpages ./man/generate.go # build go-md2man - go build -mod=vendor -modfile=vendor.mod -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2 + go build -mod=vendor -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2 ) mkdir -p man/man1 diff --git a/scripts/docs/generate-md.sh b/scripts/docs/generate-md.sh index 1d155a1cef77..16a5238481f9 100755 --- a/scripts/docs/generate-md.sh +++ b/scripts/docs/generate-md.sh @@ -20,16 +20,14 @@ trap clean EXIT set -x cp -r . "$buildir/" cd "$buildir" - # init dummy go.mod - ./scripts/vendor init # install cli-docs-tool and copy docs/tools.go in root folder # to be able to fetch the required depedencies - go mod edit -modfile=vendor.mod -require=github.com/docker/cli-docs-tool@${CLI_DOCS_TOOL_VERSION} + go mod edit -require=github.com/docker/cli-docs-tool@${CLI_DOCS_TOOL_VERSION} cp docs/tools.go . # update vendor ./scripts/vendor update # build docsgen - go build -mod=vendor -modfile=vendor.mod -tags docsgen -o /tmp/docsgen ./docs/generate.go + go build -mod=vendor -tags docsgen -o /tmp/docsgen ./docs/generate.go ) # yaml generation on docs repo needs the cli.md file: https://github.com/docker/cli/pull/3924#discussion_r1059986605 diff --git a/scripts/docs/generate-yaml.sh b/scripts/docs/generate-yaml.sh index 4d0006e43e79..20833b91ca98 100755 --- a/scripts/docs/generate-yaml.sh +++ b/scripts/docs/generate-yaml.sh @@ -17,16 +17,14 @@ trap clean EXIT set -x cp -r . "$buildir/" cd "$buildir" - # init dummy go.mod - ./scripts/vendor init # install cli-docs-tool and copy docs/tools.go in root folder # to be able to fetch the required depedencies - go mod edit -modfile=vendor.mod -require=github.com/docker/cli-docs-tool@${CLI_DOCS_TOOL_VERSION} + go mod edit -require=github.com/docker/cli-docs-tool@${CLI_DOCS_TOOL_VERSION} cp docs/generate/tools.go . # update vendor ./scripts/vendor update # build docsgen - go build -mod=vendor -modfile=vendor.mod -tags docsgen -o /tmp/docsgen ./docs/generate/generate.go + go build -mod=vendor -tags docsgen -o /tmp/docsgen ./docs/generate/generate.go ) mkdir -p docs/yaml diff --git a/scripts/vendor b/scripts/vendor index 687e57cb0531..5e27e5043998 100755 --- a/scripts/vendor +++ b/scripts/vendor @@ -5,7 +5,7 @@ set -eu TYP=$1 usage() { - echo "usage: ./scripts/vendor " + echo "usage: ./scripts/vendor " exit 1 } @@ -13,21 +13,16 @@ if [ -z "$TYP" ]; then usage fi -init() { - # create dummy go.mod, see comment in vendor.mod - cat > go.mod <&2 'ERROR: Vendor result differs. Please vendor your package with "make -f docker.Makefile vendor"' echo "$diff" @@ -40,24 +35,21 @@ outdated() { echo "go-mod-outdated not found. Install with 'go install github.com/psampaz/go-mod-outdated@v0.8.0'" exit 1 fi - (set -x ; go list -mod=vendor -mod=readonly -modfile=vendor.mod -u -m -json all | go-mod-outdated -update -direct) + ( + set -x + go list -mod=vendor -mod=readonly -u -m -json all | go-mod-outdated -update -direct + ) } case $TYP in - "init") - init - ;; "update") - init update ;; "validate") - init update validate ;; "outdated") - init outdated ;; *)