support boot2docker via environment variables

This commit is contained in:
Nate Jones 2015-04-30 21:17:26 -07:00
parent 7aace0ee2a
commit 8c98858fcb

View file

@ -8,6 +8,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path"
"strings" "strings"
) )
@ -53,9 +54,25 @@ func (x *ImagesCommand) Execute(args []string) error {
} else { } else {
// grab directly from docker daemon // grab directly from docker daemon
client, err := docker.NewClient("unix:///var/run/docker.sock") endpoint := os.Getenv("DOCKER_HOST")
if err != nil { if len(endpoint) == 0 {
return err endpoint = "unix:///var/run/docker.sock"
}
var client *docker.Client
if dockerCertPath := os.Getenv("DOCKER_CERT_PATH"); len(dockerCertPath) > 0 {
cert := path.Join(dockerCertPath, "cert.pem")
key := path.Join(dockerCertPath, "key.pem")
ca := path.Join(dockerCertPath, "ca.pem")
client, err = docker.NewTLSClient(endpoint, cert, key, ca)
if err != nil {
return err
}
} else {
client, err = docker.NewClient(endpoint)
if err != nil {
return err
}
} }
clientImages, err := client.ListImages(docker.ListImagesOptions{All: true}) clientImages, err := client.ListImages(docker.ListImagesOptions{All: true})