diff options
author | Akshay Chhajed <akshaychhajed@users.noreply.github.com> | 2019-07-24 23:01:53 +0530 |
---|---|---|
committer | Akshay Chhajed <akshaychhajed@users.noreply.github.com> | 2019-07-24 23:01:53 +0530 |
commit | 5a623efc991319f53fd8b86f10a01c5a0baffda0 (patch) | |
tree | 1633388c470bc60def79bd8ecbf5433e00a36b7a | |
parent | 41b5504957b95556a12c7a55cbede7acf5537000 (diff) |
fix tls config for docker
-rw-r--r-- | image/docker_image.go | 5 | ||||
-rw-r--r-- | utils/docker.go | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/image/docker_image.go b/image/docker_image.go index 8d9c57e..5cb004f 100644 --- a/image/docker_image.go +++ b/image/docker_image.go @@ -85,6 +85,11 @@ func (image *dockerImageAnalyzer) Fetch() (io.ReadCloser, error) { clientOpts = append(clientOpts, client.WithDialContext(helper.Dialer)) default: + + if os.Getenv("DOCKER_TLS_VERIFY") != "" && os.Getenv("DOCKER_CERT_PATH") == "" { + os.Setenv("DOCKER_CERT_PATH", "~/.docker") + } + clientOpts = append(clientOpts, client.FromEnv) } diff --git a/utils/docker.go b/utils/docker.go index 786a3a4..22bf4c7 100644 --- a/utils/docker.go +++ b/utils/docker.go @@ -12,6 +12,7 @@ func RunDockerCmd(cmdStr string, args ...string) error { allArgs := cleanArgs(append([]string{cmdStr}, args...)) cmd := exec.Command("docker", allArgs...) + cmd.Env = os.Environ() cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr |