Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 2ba2ddf

Browse files
Merge component 'cli' from git@github.com:docker/cli 19.03
2 parents ac85f48 + 08513b7 commit 2ba2ddf

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

components/cli/docs/reference/commandline/context_create.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sourced from the file `/home/me/my-kube-config`:
6666
$ docker context create \
6767
--docker host=unix:///var/run/docker.sock \
6868
--kubernetes config-file=/home/me/my-kube-config \
69-
my-context
69+
my-context
7070
```
7171

7272
### Create a context based on an existing context
@@ -76,7 +76,7 @@ an existing context. The example below creates a new context named `my-context`
7676
from the existing context `existing-context`:
7777

7878
```bash
79-
$ docker context create --from existing-context my-context
79+
$ docker context create --from existing-context my-context
8080
```
8181

8282
If the `--from` option is not set, the `context` is created from the current context:

components/cli/docs/reference/commandline/login.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ $ cat ~/my_password.txt | docker login --username foo --password-stdin
5353
`docker login` requires user to use `sudo` or be `root`, except when:
5454

5555
1. connecting to a remote daemon, such as a `docker-machine` provisioned `docker engine`.
56-
2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface) for details.
56+
2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/#docker-daemon-attack-surface) for details.
5757

5858
You can log into any public or private repository for which you have
5959
credentials. When you log in, the command stores credentials in

components/cli/man/src/login.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ do not specify a `SERVER`, the command uses Docker's public registry located at
66
`docker login` requires user to use `sudo` or be `root`, except when:
77

88
1. connecting to a remote daemon, such as a `docker-machine` provisioned `docker engine`.
9-
2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#/docker-daemon-attack-surface) for details.
9+
2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/#docker-daemon-attack-surface) for details.
1010

1111
You can log into any public or private repository for which you have
1212
credentials. When you log in, the command stores encoded credentials in

0 commit comments

Comments
 (0)