From 42fa3ef7d80205a5d688bd5b8f0a90fedc44bedf Mon Sep 17 00:00:00 2001 From: WTFKr0 Date: Tue, 6 Feb 2018 09:27:05 +0100 Subject: [PATCH] Add DOCKER_TLS environment variable Signed-off-by: WTFKr0 --- cli/flags/common.go | 3 ++- docs/reference/commandline/cli.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/flags/common.go b/cli/flags/common.go index e2875563f0..6a9e79078c 100644 --- a/cli/flags/common.go +++ b/cli/flags/common.go @@ -26,6 +26,7 @@ const ( var ( dockerCertPath = os.Getenv("DOCKER_CERT_PATH") dockerTLSVerify = os.Getenv("DOCKER_TLS_VERIFY") != "" + dockerTLS = os.Getenv("DOCKER_TLS") != "" ) // CommonOptions are options common to both the client and the daemon. @@ -52,7 +53,7 @@ func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) { flags.BoolVarP(&commonOpts.Debug, "debug", "D", false, "Enable debug mode") flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", `Set the logging level ("debug"|"info"|"warn"|"error"|"fatal")`) - flags.BoolVar(&commonOpts.TLS, "tls", false, "Use TLS; implied by --tlsverify") + flags.BoolVar(&commonOpts.TLS, "tls", dockerTLS, "Use TLS; implied by --tlsverify") flags.BoolVar(&commonOpts.TLSVerify, FlagTLSVerify, dockerTLSVerify, "Use TLS and verify the remote") flags.StringVar(&commonOpts.Orchestrator, "orchestrator", "", "Which orchestrator to use with the docker cli (swarm|kubernetes) (default swarm) (experimental)") flags.SetAnnotation("orchestrator", "experimentalCLI", nil) diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index a0ac916ca2..f290c53250 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -66,6 +66,7 @@ by the `docker` command line: * `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is unsuitable for Docker. * `DOCKER_RAMDISK` If set this will disable 'pivot_root'. +* `DOCKER_TLS` When set Docker uses TLS. * `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote. * `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images. Equates to `--disable-content-trust=false` for build, create, pull, push, run.