Skip to content

Commit

Permalink
Use default cert dir for oc cluster up client if DOCKER_TLS_VERIFY is…
Browse files Browse the repository at this point in the history
… set
  • Loading branch information
jimmidyson committed Nov 26, 2016
1 parent 6f7e2fd commit 395ea26
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions pkg/bootstrap/docker/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"runtime"

"github.com/blang/semver"
"github.com/docker/docker/pkg/homedir"
dockerclient "github.com/docker/engine-api/client"
docker "github.com/fsouza/go-dockerclient"
"github.com/golang/glog"
Expand Down Expand Up @@ -423,10 +424,19 @@ func getDockerClient(out io.Writer, dockerMachine string, canStartDockerMachine
return dockerClient, engineAPIClient, nil
}

dockerTLSVerify := os.Getenv("DOCKER_TLS_VERIFY")
dockerCertPath := os.Getenv("DOCKER_CERT_PATH")
if len(dockerTLSVerify) > 0 && len(dockerCertPath) == 0 {
home := homedir.Get()
if home == "" {
return nil, nil, errors.NewError("environment variable HOME must be set if DOCKER_CERT_PATH is not set")
}
dockerCertPath = filepath.Join(home, ".docker")
os.Setenv("DOCKER_CERT_PATH", dockerCertPath)
}

if glog.V(4) {
dockerHost := os.Getenv("DOCKER_HOST")
dockerTLSVerify := os.Getenv("DOCKER_TLS_VERIFY")
dockerCertPath := os.Getenv("DOCKER_CERT_PATH")
if len(dockerHost) == 0 && len(dockerTLSVerify) == 0 && len(dockerCertPath) == 0 {
glog.Infof("No Docker environment variables found. Will attempt default socket.")
}
Expand Down

0 comments on commit 395ea26

Please sign in to comment.