Skip to content

Commit dd08d44

Browse files
authored
Merge pull request #4425 from thaJeztah/24.0_backport_credential-store-improvements
[24.0 backport] docs: rephrase section on credential stores for docker login
2 parents 809975d + 1447974 commit dd08d44

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

docs/reference/commandline/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ credential store. When this property is set, `docker login` will attempt to
240240
store credentials in the binary specified by `docker-credential-<value>` which
241241
is visible on `$PATH`. If this property is not set, credentials will be stored
242242
in the `auths` property of the config. For more information, see the
243-
[**Credentials store** section in the `docker login` documentation](login.md#credentials-store)
243+
[**Credential stores** section in the `docker login` documentation](login.md#credential-stores)
244244

245245
The property `credHelpers` specifies a set of credential helpers to use
246246
preferentially over `credsStore` or `auths` when storing and retrieving

docs/reference/commandline/login.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,28 @@ credentials. When you log in, the command stores credentials in
5656
`$HOME/.docker/config.json` on Linux or `%USERPROFILE%/.docker/config.json` on
5757
Windows, via the procedure described below.
5858

59-
### Credentials store
59+
### Credential stores
6060

61-
The Docker Engine can keep user credentials in an external credentials store,
61+
The Docker Engine can keep user credentials in an external credential store,
6262
such as the native keychain of the operating system. Using an external store
6363
is more secure than storing credentials in the Docker configuration file.
6464

65-
To use a credentials store, you need an external helper program to interact
65+
To use a credential store, you need an external helper program to interact
6666
with a specific keychain or external store. Docker requires the helper
6767
program to be in the client's host `$PATH`.
6868

69-
This is the list of currently available credentials helpers and where
70-
you can download them from:
69+
You can download the helpers from the `docker-credential-helpers`
70+
[releases page](https://github.com/docker/docker-credential-helpers/releases).
71+
Helpers are available for the following credential stores:
7172

72-
- D-Bus Secret Service: https://github.com/docker/docker-credential-helpers/releases
73-
- Apple macOS keychain: https://github.com/docker/docker-credential-helpers/releases
74-
- Microsoft Windows Credential Manager: https://github.com/docker/docker-credential-helpers/releases
75-
- [pass](https://www.passwordstore.org/): https://github.com/docker/docker-credential-helpers/releases
73+
- D-Bus Secret Service
74+
- Apple macOS keychain
75+
- Microsoft Windows Credential Manager
76+
- [pass](https://www.passwordstore.org/)
7677

77-
#### Configure the credentials store
78+
#### Configure the credential store
7879

79-
You need to specify the credentials store in `$HOME/.docker/config.json`
80+
You need to specify the credential store in `$HOME/.docker/config.json`
8081
to tell the docker engine to use it. The value of the config property should be
8182
the suffix of the program to use (i.e. everything after `docker-credential-`).
8283
For example, to use `docker-credential-osxkeychain`:

0 commit comments

Comments
 (0)