Merge pull request #424 from buildtool/fix_push

fix: extract common docker client setup
buildtool · Feb 1, 2023 · 42ebbe6 · 42ebbe6
2 parents 166cdae + 88bd691
commit 42ebbe6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/spf13/cobra v1.6.1
 	github.com/stretchr/testify v1.8.1
-	github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa
+	github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
 	gitlab.com/unboundsoftware/apex-mocks v0.2.0

diff --git a/pkg/build/build.go b/pkg/build/build.go
@@ -39,7 +39,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/containerd/console"
 	"github.com/docker/docker/api/types"
-	dkr "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/stringid"
 	controlapi "github.com/moby/buildkit/api/services/control"
@@ -73,13 +72,7 @@ func DoBuild(dir string, buildArgs Args) error {
 	return build(dkrClient, dir, buildArgs)
 }
 
-var dockerClient = func() (docker.Client, error) {
-	return dkr.NewClientWithOpts(
-		dkr.WithTLSClientConfigFromEnv(),
-		dkr.WithHostFromEnv(),
-		dkr.WithAPIVersionNegotiation(),
-		dkr.WithVersionFromEnv())
-}
+var dockerClient = docker.DefaultClient
 
 var setupSession = provideSession
 

diff --git a/pkg/docker/docker.go b/pkg/docker/docker.go
@@ -105,3 +105,11 @@ func FindStages(content string) []string {
 	}
 	return stages
 }
+
+func DefaultClient() (Client, error) {
+	return client.NewClientWithOpts(
+		client.WithTLSClientConfigFromEnv(),
+		client.WithHostFromEnv(),
+		client.WithAPIVersionNegotiation(),
+		client.WithVersionFromEnv())
+}
diff --git a/pkg/push/push.go b/pkg/push/push.go
@@ -32,8 +32,6 @@ import (
 	"github.com/buildtool/build-tools/pkg/args"
 	"github.com/buildtool/build-tools/pkg/version"
 
-	docker2 "github.com/docker/docker/client"
-
 	"github.com/buildtool/build-tools/pkg/ci"
 	"github.com/buildtool/build-tools/pkg/config"
 	"github.com/buildtool/build-tools/pkg/docker"
@@ -44,6 +42,8 @@ type Args struct {
 	Dockerfile string `name:"file" short:"f" help:"name of the Dockerfile to use." default:"Dockerfile"`
 }
 
+var dockerClient = docker.DefaultClient
+
 func Push(dir string, info version.Info, osArgs ...string) int {
 	var pushArgs Args
 	err := args.ParseArgs(dir, osArgs, info, &pushArgs)
@@ -55,7 +55,7 @@ func Push(dir string, info version.Info, osArgs ...string) int {
 		}
 	}
 
-	client, err := docker2.NewClientWithOpts(docker2.FromEnv)
+	client, err := dockerClient()
 	if err != nil {
 		log.Error(fmt.Sprintf("<red>%s</red>", err.Error()))
 		return -1