Merge pull request #42 from coveo/dind-fix

Glide up and fix error when used with Docker in Docker
coveooss · Jan 3, 2019 · c7f73b8 · c7f73b8
2 parents 6ceddd3 + c68cd66
commit c7f73b8
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 32 deletions.
diff --git a/docker.go b/docker.go
@@ -331,7 +331,8 @@ func GetActualImageVersion() string {
 
 func getDockerClient() (*client.Client, context.Context) {
 	if dockerClient == nil {
-		dockerClient = must(client.NewClientWithOpts(client.WithVersion(minimumDockerVersion))).(*client.Client)
+		os.Setenv("DOCKER_API_VERSION", minimumDockerVersion)
+		dockerClient = must(client.NewEnvClient()).(*client.Client)
 		dockerContext = context.Background()
 	}
 	return dockerClient, dockerContext

diff --git a/glide.lock b/glide.lock