refactor: NewClientWithContext -> New, and use server only

client/client.go

@@ -1,3 +1,4 @@
+// Package client provides Docker client initiatialisation functions.
 package client
 
 import (
@@ -8,35 +9,34 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func NewClientWithContext(contextName string) (*client.Client, error) {
+// New initiates a new Docker client.
+func New(contextName string) (*client.Client, error) {
 	context, err := GetContext(contextName)
 	if err != nil {
 		return nil, err
 	}
+
 	ctxEndpoint, err := GetContextEndpoint(context)
 	if err != nil {
 		return nil, err
 	}
+
 	helper := newConnectionHelper(ctxEndpoint)
 	httpClient := &http.Client{
-		// No tls
-		// No proxy
+		// No tls, no proxy
 		Transport: &http.Transport{
 			DialContext: helper.Dialer,
 		},
 	}
 
 	var clientOpts []client.Opt
-
 	clientOpts = append(clientOpts,
 		client.WithHTTPClient(httpClient),
 		client.WithHost(helper.Host),
 		client.WithDialContext(helper.Dialer),
 	)
 
-	// FIXME: Maybe don't have this variable here and load it beforehand
 	version := os.Getenv("DOCKER_API_VERSION")
-
 	if version != "" {
 		clientOpts = append(clientOpts, client.WithVersion(version))
 	} else {
@@ -44,9 +44,9 @@ func NewClientWithContext(contextName string) (*client.Client, error) {
 	}
 
 	cl, err := client.NewClientWithOpts(clientOpts...)
-
 	if err != nil {
 		logrus.Fatalf("unable to create Docker client: %s", err)
 	}
+
 	return cl, nil
 }