fix: avoid deadlocks when Docker is not available (testcontainers#1645)

mdelapenya · Sep 20, 2023 · 3d5837d · 3d5837d
1 parent fe847d2
commit 3d5837d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/docker_client.go b/docker_client.go
@@ -40,8 +40,6 @@ func (c *DockerClient) Info(ctx context.Context) (types.Info, error) {
 	dockerInfoOnce.Do(func() {
 		dockerInfo, err = c.Client.Info(ctx)
 		if err != nil {
-			// reset the state of the sync.Once so that the next call to Info will try again
-			dockerInfoOnce = sync.Once{}
 			return
 		}
 
@@ -66,6 +64,11 @@ func (c *DockerClient) Info(ctx context.Context) (types.Info, error) {
 		)
 	})
 
+	if err != nil {
+		// reset the state of the sync.Once so that the next call to Info will try again
+		dockerInfoOnce = sync.Once{}
+	}
+
 	return dockerInfo, err
 }