From c4fd2360261fd6199af97e0fbcd83d2eb0ba6a67 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Sat, 6 Feb 2016 05:47:56 -0800 Subject: [PATCH] Updated the docker auth config --- client/driver/docker.go | 2 +- website/source/docs/drivers/docker.html.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index a68b2dff6d13..c50c2b3d8b91 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -442,7 +442,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle } } - if authConfig := d.config.Read("docker.auth_config"); authConfig != "" { + if authConfig := d.config.Read("docker.auth.config"); authConfig != "" { if f, err := os.Open(authConfig); err == nil { defer f.Close() if authConfigurations, err := docker.NewAuthConfigurations(f); err == nil { diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md index dc475e311004..d964a78df23e 100644 --- a/website/source/docs/drivers/docker.html.md +++ b/website/source/docs/drivers/docker.html.md @@ -247,7 +247,7 @@ The `docker` driver has the following host-level configuration options: to customize this if you use a non-standard socket (http or another location). -* `docker.auth_config` - Allows an operator to specify a json file which is in +* `docker.auth.config` - Allows an operator to specify a json file which is in the dockercfg format containing authentication information for private registry. * `docker.tls.cert` - Path to the server's certificate file (`.pem`). Specify