From d693e18c0430637ad07d7279a3df1f588388aae8 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 3 Feb 2025 11:36:52 +0100
Subject: [PATCH] use a consistent alias for the docker client package

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .golangci.yml             | 3 +++
 util/dockerutil/api.go    | 6 +++---
 util/dockerutil/client.go | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 608bbfb2..d0177797 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -43,6 +43,9 @@ linters-settings:
       # buildkit errdefs package (or vice-versa).
       - pkg: "github.com/containerd/errdefs"
         alias: "cerrdefs"
+      # Use a consistent alias to prevent confusion with "github.com/moby/buildkit/client"
+      - pkg: "github.com/docker/docker/client"
+        alias: "dockerclient"
       - pkg: "github.com/opencontainers/image-spec/specs-go/v1"
         alias: "ocispecs"
       - pkg: "github.com/opencontainers/go-digest"
diff --git a/util/dockerutil/api.go b/util/dockerutil/api.go
index 5fd9b652..b71728b1 100644
--- a/util/dockerutil/api.go
+++ b/util/dockerutil/api.go
@@ -3,12 +3,12 @@ package dockerutil
 import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
-	"github.com/docker/docker/client"
+	dockerclient "github.com/docker/docker/client"
 )
 
 // ClientAPI represents an active docker API object.
 type ClientAPI struct {
-	client.APIClient
+	dockerclient.APIClient
 }
 
 func NewClientAPI(cli command.Cli, ep string) (*ClientAPI, error) {
@@ -36,7 +36,7 @@ func NewClientAPI(cli command.Cli, ep string) (*ClientAPI, error) {
 		return nil, err
 	}
 
-	ca.APIClient, err = client.NewClientWithOpts(clientOpts...)
+	ca.APIClient, err = dockerclient.NewClientWithOpts(clientOpts...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/util/dockerutil/client.go b/util/dockerutil/client.go
index ff3f7d7e..c5ec65b2 100644
--- a/util/dockerutil/client.go
+++ b/util/dockerutil/client.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/docker/client"
+	dockerclient "github.com/docker/docker/client"
 )
 
 // Client represents an active docker object.
@@ -24,7 +24,7 @@ func NewClient(cli command.Cli) *Client {
 }
 
 // API returns a new docker API client.
-func (c *Client) API(name string) (client.APIClient, error) {
+func (c *Client) API(name string) (dockerclient.APIClient, error) {
 	if name == "" {
 		name = c.cli.CurrentContext()
 	}