Use HTTP when connecting over TCP socket

clareliguori · clareliguori · commit 90056a8f4e9a · 2019-01-24T15:30:00.000-08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.2
+0.0.3
diff --git a/img2lambda/extract/repack_image.go b/img2lambda/extract/repack_image.go
@@ -37,7 +37,7 @@ func RepackImage(imageName string, layerOutputDir string) (layers []types.Lambda
 	// Support communicating with Docker for Windows over local plain-text TCP socket
 	dockerHost := os.Getenv("DOCKER_HOST")
 	if dockerHost == "tcp://localhost:2375" || dockerHost == "tcp://127.0.0.1:2375" {
-		sys.DockerDaemonHost = dockerHost
+		sys.DockerDaemonHost = strings.Replace(dockerHost, "tcp://", "http://", -1)
 	}
 
 	ctx := context.Background()

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func RepackImage(imageName string, layerOutputDir string) (layers []types.Lambda`
`37`	`37`	`// Support communicating with Docker for Windows over local plain-text TCP socket`
`38`	`38`	`dockerHost := os.Getenv("DOCKER_HOST")`
`39`	`39`	`if dockerHost == "tcp://localhost:2375" \|\| dockerHost == "tcp://127.0.0.1:2375" {`
`40`		`- sys.DockerDaemonHost = dockerHost`
	`40`	`+ sys.DockerDaemonHost = strings.Replace(dockerHost, "tcp://", "http://", -1)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`ctx := context.Background()`