fix: cache Docker client instead of creating a new one all the time, fixes #5861

pkg/ddevapp/config_test.go

@@ -460,8 +460,8 @@ func TestReadConfigCRLF(t *testing.T) {
 
 // TestConfigValidate tests validation of configuration values.
 func TestConfigValidate(t *testing.T) {
-	if nodeps.IsAppleSilicon() {
-		t.Skip("Skipping on mac M1 to ignore problems with 'connection reset by peer'")
+	if nodeps.IsAppleSilicon() || dockerutil.IsColima() {
+		t.Skip("Skipping on Mac M1 and Colima, lots of network connections failed")
 	}
 
 	assert := asrt.New(t)

pkg/dockerutil/dockerutils.go

@@ -139,6 +139,8 @@ func RemoveNetworkDuplicates(ctx context.Context, client *dockerClient.Client, n
 
 var DockerHost string
 var DockerContext string
+var DockerCtx context.Context
+var DockerClient *dockerClient.Client
 
 // GetDockerClient returns a Docker client respecting the current Docker context
 // but DOCKER_HOST gets priority
@@ -159,14 +161,17 @@ func GetDockerClient() (context.Context, *dockerClient.Client) {
 		util.Debug("GetDockerClient: Setting DOCKER_HOST to '%s'", DockerHost)
 		_ = os.Setenv("DOCKER_HOST", DockerHost)
 	}
-	ctx := context.Background()
-	client, err := dockerClient.NewClientWithOpts(dockerClient.FromEnv, dockerClient.WithAPIVersionNegotiation())
-	if err != nil {
-		output.UserOut.Warnf("Could not get Docker client. Is Docker running? Error: %v", err)
-		// Use os.Exit instead of util.Failed() to avoid import cycle with util.
-		os.Exit(100)
+	if DockerClient == nil {
+		DockerCtx = context.Background()
+		DockerClient, err = dockerClient.NewClientWithOpts(dockerClient.FromEnv, dockerClient.WithAPIVersionNegotiation())
+		if err != nil {
+			output.UserOut.Warnf("Could not get Docker client. Is Docker running? Error: %v", err)
+			// Use os.Exit instead of util.Failed() to avoid import cycle with util.
+			os.Exit(100)
+		}
+		defer DockerClient.Close()
 	}
-	return ctx, client
+	return DockerCtx, DockerClient
 }
 
 // GetDockerContext returns the currently set Docker context, host, and error
@@ -1718,49 +1723,49 @@ func CopyFromContainer(containerName string, containerPath string, hostPath stri
 // for examples defining version constraints.
 // REMEMBER TO CHANGE docs/ddev-installation.md if you touch this!
 // The constraint MUST HAVE a -pre of some kind on it for successful comparison.
-// See https://github.com/ddev/ddev/pull/738.. and regression https://github.com/ddev/ddev/issues/1431
+// See https://github.com/ddev/ddev/pull/738 and regression https://github.com/ddev/ddev/issues/1431
 var DockerVersionConstraint = ">= 20.10.0-alpha1"
 
-// DockerVersion is cached version of Docker engine
+// DockerVersion is cached version of Docker provider engine
 var DockerVersion = ""
 
-// GetDockerVersion gets the cached or API-sourced version of Docker engine
+// GetDockerVersion gets the cached or API-sourced version of Docker provider engine
 func GetDockerVersion() (string, error) {
 	if DockerVersion != "" {
 		return DockerVersion, nil
 	}
 	ctx, client := GetDockerClient()
 	if client == nil {
-		return "", fmt.Errorf("unable to get Docker version: Docker client is nil")
+		return "", fmt.Errorf("unable to get Docker provider engine version: Docker client is nil")
 	}
 
 	serverVersion, err := client.ServerVersion(ctx)
 	if err != nil {
-		return "", fmt.Errorf("unable to get Docker version: %v", err)
+		return "", fmt.Errorf("unable to get Docker provider engine version: %v", err)
 	}
 
 	DockerVersion = serverVersion.Version
 
 	return DockerVersion, nil
 }
 
-// DockerAPIVersion is cached API version of Docker engine
+// DockerAPIVersion is cached API version of Docker provider engine
 // See https://docs.docker.com/engine/api/#api-version-matrix
 var DockerAPIVersion = ""
 
-// GetDockerAPIVersion gets the cached or API-sourced API version of Docker engine
+// GetDockerAPIVersion gets the cached or API-sourced API version of Docker provider engine
 func GetDockerAPIVersion() (string, error) {
 	if DockerAPIVersion != "" {
 		return DockerAPIVersion, nil
 	}
 	ctx, client := GetDockerClient()
 	if client == nil {
-		return "", fmt.Errorf("unable to get Docker API version: Docker client is nil")
+		return "", fmt.Errorf("unable to get Docker provider engine API version: Docker client is nil")
 	}
 
 	serverVersion, err := client.ServerVersion(ctx)
 	if err != nil {
-		return "", fmt.Errorf("unable to get Docker API version: %v", err)
+		return "", fmt.Errorf("unable to get Docker provider engine API version: %v", err)
 	}
 
 	DockerAPIVersion = serverVersion.APIVersion
@@ -1771,7 +1776,7 @@ func GetDockerAPIVersion() (string, error) {
 // DockerComposeVersionConstraint is the versions allowed for ddev
 // REMEMBER TO CHANGE docs/ddev-installation.md if you touch this!
 // The constraint MUST HAVE a -pre of some kind on it for successful comparison.
-// See https://github.com/ddev/ddev/pull/738.. and regression https://github.com/ddev/ddev/issues/1431
+// See https://github.com/ddev/ddev/pull/738 and regression https://github.com/ddev/ddev/issues/1431
 var DockerComposeVersionConstraint = ">= 2.5.1"
 
 // GetDockerComposeVersion runs docker-compose -v to get the current version