switch to go module

.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

.gitattributes

@@ -1,3 +1 @@
 Dockerfile* linguist-language=Dockerfile
-vendor.mod linguist-language=Go-Module
-vendor.sum linguist-language=Go-Checksums

.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

.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

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)

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

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"
 )
 

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"
 )
 

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"

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"

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"
 )

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"

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"

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

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"

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"
 )
 

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"
 )

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"

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"
 )
 

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"
 )

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"
 )

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"

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"
 )

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"

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"

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"
 )

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"

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"
 )
 

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"