From a49de2c46713149053b0ee25313c6f7a39273c25 Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Mon, 4 Aug 2014 17:17:23 -0700 Subject: [PATCH] Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH DOCKER_CONFIG was introduced in #6984. We may use "config" for other purposes (e.g. #7232). Until we have made a design decision around how configuration files will work, DOCKER_CERT_PATH is a much safer name to rely on for future compatibility. Docker-DCO-1.1-Signed-off-by: Ben Firshman (github: bfirsh) --- docker/flags.go | 14 +++++++------- docs/sources/articles/https.md | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/flags.go b/docker/flags.go index 17b23d9391..6740db5ceb 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -10,12 +10,12 @@ import ( ) var ( - dockerConfDir = os.Getenv("DOCKER_CONFIG") + dockerCertPath = os.Getenv("DOCKER_CERT_PATH") ) func init() { - if dockerConfDir == "" { - dockerConfDir = filepath.Join(os.Getenv("HOME"), ".docker") + if dockerCertPath == "" { + dockerCertPath = filepath.Join(os.Getenv("HOME"), ".docker") } } @@ -45,16 +45,16 @@ var ( flTlsVerify = flag.Bool([]string{"-tlsverify"}, false, "Use TLS and verify the remote (daemon: verify client, client: verify daemon)") flSelinuxEnabled = flag.Bool([]string{"-selinux-enabled"}, false, "Enable selinux support. SELinux does not presently support the BTRFS storage driver") - // these are initialized in init() below since their default values depend on dockerConfDir which isn't fully initialized until init() runs + // these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs flCa *string flCert *string flKey *string ) func init() { - flCa = flag.String([]string{"-tlscacert"}, filepath.Join(dockerConfDir, defaultCaFile), "Trust only remotes providing a certificate signed by the CA given here") - flCert = flag.String([]string{"-tlscert"}, filepath.Join(dockerConfDir, defaultCertFile), "Path to TLS certificate file") - flKey = flag.String([]string{"-tlskey"}, filepath.Join(dockerConfDir, defaultKeyFile), "Path to TLS key file") + flCa = flag.String([]string{"-tlscacert"}, filepath.Join(dockerCertPath, defaultCaFile), "Trust only remotes providing a certificate signed by the CA given here") + flCert = flag.String([]string{"-tlscert"}, filepath.Join(dockerCertPath, defaultCertFile), "Path to TLS certificate file") + flKey = flag.String([]string{"-tlskey"}, filepath.Join(dockerCertPath, defaultKeyFile), "Path to TLS key file") flag.Var(&flDns, []string{"#dns", "-dns"}, "Force Docker to use specific DNS servers") flag.Var(&flDnsSearch, []string{"-dns-search"}, "Force Docker to use specific DNS search domains") diff --git a/docs/sources/articles/https.md b/docs/sources/articles/https.md index 9817bfd3ee..a05363be14 100644 --- a/docs/sources/articles/https.md +++ b/docs/sources/articles/https.md @@ -125,7 +125,7 @@ Docker in various other modes by mixing the flags. If found, the client will send its client certificate, so you just need to drop your keys into `~/.docker/.pem`. Alternatively, if you want to store your keys in another location, you can specify that -location using the environment variable `DOCKER_CONFIG`. +location using the environment variable `DOCKER_CERT_PATH`. - $ export DOCKER_CONFIG=${HOME}/.dockers/zone1/ + $ export DOCKER_CERT_PATH=${HOME}/.dockers/zone1/ $ docker --tlsverify ps