Update docker client API version negotiation

tests/funnel_utils.go

@@ -409,7 +409,7 @@ func (f *Funnel) StartServerInDocker(containerName, imageName string, extraArgs
 
 func (f *Funnel) findTestServerContainers() []string {
 	res := []string{}
-	containers, err := f.Docker.ContainerList(context.Background(), dockerTypes.ContainerListOptions{})
+	containers, err := f.Docker.ContainerList(context.Background(), container.ListOptions{})
 	if err != nil {
 		panic(err)
 	}

util/dockerutil/docker.go

@@ -2,9 +2,7 @@ package dockerutil
 
 import (
 	"context"
-	"errors"
 	"os"
-	"regexp"
 	"time"
 
 	"github.com/docker/docker/client"
@@ -24,19 +22,8 @@ func NewDockerClient() (*client.Client, error) {
 	if os.Getenv("DOCKER_API_VERSION") == "" {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
-
-		_, err := dclient.ServerVersion(ctx)
-		if err != nil {
-			re := regexp.MustCompile(`([0-9\.]+)`)
-			version := re.FindAllString(err.Error(), -1)
-			if version == nil {
-				return nil, errors.New("Can't connect docker client")
-			}
-			// Error message example:
-			//   Error getting metadata for container: Error response from daemon: client is newer than server (client API version: 1.26, server API version: 1.24)
-			os.Setenv("DOCKER_API_VERSION", version[1])
-			return NewDockerClient()
-		}
+		dclient.NegotiateAPIVersion(ctx)
 	}
+
 	return dclient, nil
 }