From 44b29b0ccc5c9c1708945634d49f67f9a34d7eb0 Mon Sep 17 00:00:00 2001 From: Nate Brennand Date: Fri, 10 Jul 2015 18:49:57 +0000 Subject: [PATCH] update reference to config file `docker login` in 1.7 produces a config file in `~/docker/config.json` instead of a `~/.dockercfg`. Signed-off-by: Nate Brennand Upstream-commit: 6827782bef07afe440acc46676e4850734fcc991 Component: engine --- components/engine/docs/userguide/dockerrepos.md | 2 +- components/engine/man/docker-login.1.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/userguide/dockerrepos.md b/components/engine/docs/userguide/dockerrepos.md index c8f7e55d04..3ee52a45ea 100644 --- a/components/engine/docs/userguide/dockerrepos.md +++ b/components/engine/docs/userguide/dockerrepos.md @@ -43,7 +43,7 @@ e-mail address. It will then automatically log you in. You can now commit and push your own images up to your repos on Docker Hub. > **Note:** -> Your authentication credentials will be stored in the `.dockercfg` +> Your authentication credentials will be stored in the `~/.docker/config.json` > authentication file in your home directory. ## Searching for images diff --git a/components/engine/man/docker-login.1.md b/components/engine/man/docker-login.1.md index 87ad31b703..b87e2c1591 100644 --- a/components/engine/man/docker-login.1.md +++ b/components/engine/man/docker-login.1.md @@ -20,7 +20,7 @@ do not specify a `SERVER`, the command uses Docker's public registry located at You can log into any public or private repository for which you have credentials. When you log in, the command stores encoded credentials in -`$HOME/.dockercfg` on Linux or `%USERPROFILE%/.dockercfg` on Windows. +`$HOME/.docker/config.json` on Linux or `%USERPROFILE%/.docker/config.json` on Windows. # OPTIONS **-e**, **--email**=""